From 29414bd66e40779c436f962c2ed3b4a7bc1ba94c Mon Sep 17 00:00:00 2001
From: Matthias Klose <doko@debian.org>
Date: Wed, 16 Jun 2010 09:21:12 +0200
Subject: [PATCH] * Depend on python2.6 version including the fix for issue
#8223.
---
debian/changelog | 5 ++++-
debian/control | 12 ++++++------
debian/rules | 2 +-
dh_python2 | 2 +-
4 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 35000de..9c0a51e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -24,7 +24,10 @@ python-defaults (2.6.5-2) UNRELEASED; urgency=low
for XS/XB-Python-Version (Closes: #567941)
- Thanks to Loïc Minier for the patch
- -- Matthias Klose <doko@debian.org> Tue, 08 Jun 2010 18:59:57 -0400
+ [ Matthias Klose ]
+ * Depend on python2.6 version including the fix for issue #8223.
+
+ -- Matthias Klose <doko@debian.org> Wed, 16 Jun 2010 09:19:55 +0200
python-defaults (2.6.5-1) experimental; urgency=low
diff --git a/debian/control b/debian/control
index 227abf2..bc81a7b 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Vcs-Bzr: https://alioth.debian.org/anonscm/bzr/pkg-python/python-defaults-debian
Package: python
Architecture: all
Priority: standard
-Depends: python2.6 (>= 2.6.5-2), python-minimal (>= ${binary:Version})
+Depends: python2.6 (>= 2.6.5+20100616-1~), 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
@@ -27,7 +27,7 @@ Description: An interactive high-level object-oriented language (default version
Package: python-minimal
Architecture: all
Priority: standard
-Depends: python2.6-minimal (>= 2.6.5-2), dpkg (>= 1.13.20)
+Depends: python2.6-minimal (>= 2.6.5+20100616-1~), dpkg (>= 1.13.20)
Conflicts: python (<= 2.4-1), python-central (<< 0.5.5)
Replaces: python (<= 2.4-1)
Recommends: python
@@ -40,7 +40,7 @@ Description: A minimal subset of the Python language (default version)
Package: python-examples
Architecture: all
-Depends: python (>= ${binary:Version}), python2.6-examples (>= 2.6.5-2)
+Depends: python (>= ${binary:Version}), python2.6-examples (>= 2.6.5+20100616-1~)
Description: Examples for the Python language (default version)
Examples, Demos and Tools for Python. These are files included in
the upstream Python distribution.
@@ -50,7 +50,7 @@ Description: Examples for the Python language (default version)
Package: python-dev
Architecture: all
-Depends: python (>= ${binary:Version}), python2.6-dev (>= 2.6.5-2)
+Depends: python (>= ${binary:Version}), python2.6-dev (>= 2.6.5+20100616-1~)
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
@@ -76,7 +76,7 @@ Description: An IDE for Python using Tkinter (default version)
Package: python-doc
Section: doc
Architecture: all
-Depends: python2.6-doc (>= 2.6.5-2)
+Depends: python2.6-doc (>= 2.6.5+20100616-1~)
Suggests: python (>= ${binary:Version})
Conflicts: python-doc-info, python (<< 2.3.5)
Replaces: python-doc-info, python (<< 2.3.5)
@@ -102,7 +102,7 @@ Package: python-dbg
Architecture: all
Section: debug
Priority: extra
-Depends: python (>= ${binary:Version}), python2.6-dbg (>= 2.6.5-2)
+Depends: python (>= ${binary:Version}), python2.6-dbg (>= 2.6.5+20100616-1~)
Provides: python-gdbm-dbg, python-tk-dbg
Description: Debug Build of the Python Interpreter (version 2.6)
Python interpreter configured with --pydebug. Dynamically loaded modules are
diff --git a/debian/rules b/debian/rules
index e4d24d6..6861a55 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,7 +20,7 @@ export NVER=2.7
export PVER=python2.6
PREVVER := $(shell awk '/^python/ && NR > 1 {print substr($$2,2,length($$2)-2); exit}' debian/changelog)
-PREVVER := 2.6.5-2
+PREVVER := 2.6.5+20100616-1~
PWD := $(shell pwd)
diff --git a/dh_python2 b/dh_python2
index c6a430b..98803e5 100755
--- a/dh_python2
+++ b/dh_python2
@@ -395,7 +395,7 @@ def dependencies(package, stats, options):
# make sure pycompile binary is available
if stats['compile']:
- depends.append("python (>= 2.6.5-1~)")
+ depends.append("python (>= 2.6.5-2~)")
for interpreter, version in stats['shebangs']:
if interpreter not in depends:
--
GitLab