From d5e4fc7aed55ac19ab080a800b51e189c04782c0 Mon Sep 17 00:00:00 2001
From: Matthias Klose <doko@timbuktu>
Date: Mon, 17 May 2010 13:00:23 +0200
Subject: [PATCH] package version python-defaults-2.5.4-8
---
debian/changelog | 7 +++++++
debian/control | 10 +++++-----
debian/rules | 2 +-
3 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 6f35d7e..8e6f7ed 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+python-defaults (2.5.4-8) experimental; urgency=low
+
+ * Correct definition of PVER in debian/rules so python is installable in
+ experimental again
+
+ -- Scott Kitterman <scott@kitterman.com> Tue, 15 Dec 2009 16:57:40 -0500
+
python-defaults (2.5.4-7) experimental; urgency=low
* Add 2.6 as a supported version, remove 2.4 as a supported version.
diff --git a/debian/control b/debian/control
index 74b1c5d..e0a8ee8 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Standards-Version: 3.8.3
Package: python
Architecture: all
Priority: standard
-Depends: python2.5-1 (>= 2.5.4), python-minimal (>= ${binary:Version})
+Depends: python2.5 (>= 2.5.4), python-minimal (>= ${binary:Version})
Conflicts: python2.3 (<< 2.3.5-14), python2.1 (<= 2.1.2), python-xmlbase, python-csv, python-bz2, python-base, python-central (<< 0.5.5)
Replaces: python2.3 (<= 2.3.2-6), python-xmlbase, python-base
Provides: python-email, python-xmlbase, python-plistlib, python-ctypes, python-wsgiref
@@ -26,7 +26,7 @@ Description: An interactive high-level object-oriented language (default version
Package: python-minimal
Architecture: all
Priority: standard
-Depends: python2.5-1-minimal (>= 2.5.4), dpkg (>= 1.13.20)
+Depends: python2.5-minimal (>= 2.5.4), dpkg (>= 1.13.20)
Conflicts: python (<= 2.4-1), python-central (<< 0.5.5)
Replaces: python (<= 2.4-1)
Recommends: python
@@ -38,7 +38,7 @@ Description: A minimal subset of the Python language (default version)
Package: python-examples
Architecture: all
-Depends: python (>= ${binary:Version}), python2.5-1-examples (>= 2.5.4)
+Depends: python (>= ${binary:Version}), python2.5-examples (>= 2.5.4)
Description: Examples for the Python language (default version)
Examples, Demos and Tools for Python. These are files included in
the upstream Python distribution.
@@ -48,7 +48,7 @@ Description: Examples for the Python language (default version)
Package: python-dev
Architecture: all
-Depends: python (>= ${binary:Version}), python2.5-1-dev (>= 2.5.4)
+Depends: python (>= ${binary:Version}), python2.5-dev (>= 2.5.4)
Description: Header files and a static library for Python (default)
Header files, a static library and development tools for building
Python modules, extending the Python interpreter or embedding Python
@@ -62,7 +62,7 @@ Description: Header files and a static library for Python (default)
Package: idle
Architecture: all
-Depends: python (>= ${binary:Version}), python-tk (>= 2.4.3-3), idle-python2.5-1
+Depends: python (>= ${binary:Version}), python-tk (>= 2.4.3-3), idle-python2.5
Enhances: python
Description: An IDE for Python using Tkinter (default version)
IDLE is an Integrated Development Environment for Python.
diff --git a/debian/rules b/debian/rules
index bcd89d1..3752fe3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,7 +17,7 @@ distribution := $(shell lsb_release -is)
export VER=2.5
export NVER=2.6
-export PVER=python2.5-1
+export PVER=python2.5
PREVVER := $(shell awk '/^python/ && NR > 1 {print substr($$2,2,length($$2)-2); exit}' debian/changelog)
PREVVER := 2.5.4
--
GitLab