diff --git a/debian/changelog b/debian/changelog index 57340502c729b74ea75dc6caad12c6f27235c4af..05adfd22d4592c071fc9abdcf045fc3a8b2fde91 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 eca89af0a22e19f5913a293cd068cf5d07d3e1ba..5ad34cc5dd8e32f8fc81b8afab95f82dfccdc7b1 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 bbd098118b75740b0fdb66c5e1de638b0a14b3d8..8a34d9a374925328ef09acf81eb50f066562b662 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.