* 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

@@ -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:

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.

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.