From b2b2a614250f5f9b2622d1a2d7cd26b3a37dc38d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20O=C5=BCarowski?= <piotr@debian.org>
Date: Sun, 11 Jul 2010 17:06:42 +0200
Subject: [PATCH] * python package doesn't conflict with python2.1 and
python2.3 anymore (2.1 and 2.3 are no longer in Debian) * revision 103
reverted (python dependency is needed for the docs symlink)
---
debian/changelog | 3 ++-
debian/control | 6 +++---
debian/control.in | 6 +++---
3 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 5734050..05adfd2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,8 +14,9 @@ python-defaults (2.6.5-6) unstable; urgency=low
(closes: 583392)
* debian/rules: do not ignore errors (two more `set -e`s added, closes:
397499)
- * python-examples package no longer depends on python (closes: 585780)
* python-doc now suggests python-examples (closes: #585774)
+ * python package doesn't conflict with python2.1 and python2.3 anymore (2.1
+ and 2.3 are no longer in Debian)
[ Scott Kitterman ]
* Merge changes back from Ubuntu package:
diff --git a/debian/control b/debian/control
index eca89af..5ad34cc 100644
--- a/debian/control
+++ b/debian/control
@@ -13,8 +13,8 @@ Package: python
Architecture: all
Priority: standard
Depends: ${misc: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, python-dev (<< 2.6.5-2)
+Conflicts: python-xmlbase, python-csv, python-bz2, python-base, python-central (<< 0.5.5)
+Replaces: python-xmlbase, python-base, python-dev (<< 2.6.5-2)
Provides: python-email, python-xmlbase, python-plistlib, python-ctypes, python-wsgiref
Suggests: python-doc (= ${binary:Version}), python-tk (= ${binary:Version}), python-profiler (= ${binary:Version})
Description: An interactive high-level object-oriented language (default version)
@@ -41,7 +41,7 @@ Description: A minimal subset of the Python language (default version)
Package: python-examples
Architecture: all
-Depends: ${misc:Depends}, python2.6-examples (>= 2.6.5+20100616-1~)
+Depends: ${misc: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.
diff --git a/debian/control.in b/debian/control.in
index bbd0981..8a34d9a 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -13,8 +13,8 @@ Package: python
Architecture: all
Priority: standard
Depends: ${misc:Depends}, @PVER@ (>= @PREVVER@), 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, python-dev (<< 2.6.5-2)
+Conflicts: python-xmlbase, python-csv, python-bz2, python-base, python-central (<< 0.5.5)
+Replaces: python-xmlbase, python-base, python-dev (<< 2.6.5-2)
Provides: python-email, python-xmlbase, python-plistlib, python-ctypes, python-wsgiref
Suggests: python-doc (= ${binary:Version}), python-tk (= ${binary:Version}), python-profiler (= ${binary:Version})
Description: An interactive high-level object-oriented language (default version)
@@ -41,7 +41,7 @@ Description: A minimal subset of the Python language (default version)
Package: python-examples
Architecture: all
-Depends: ${misc:Depends}, @PVER@-examples (>= @PREVVER@)
+Depends: ${misc:Depends}, python (= ${binary:Version}), @PVER@-examples (>= @PREVVER@)
Description: Examples for the Python language (default version)
Examples, Demos and Tools for Python. These are files included in
the upstream Python distribution.
--
GitLab