Merge lp:~xnox/ubuntu/lucid/distribute/sync-to-sid-2 into lp:~xnox/ubuntu/lucid/distribute/lucid-snapshot

[Dimitri John Ledkov]

Unmerged revisions

11. By Barry Warsaw on 2010-01-19

* Merge from Debian Unstable. Remaining Ubuntu changes:
  - Build only for Python 2.6, since 2.5 and earlier is not supported on
    Lucid.
  - Remove old setuptools.egg-info directories so that we can transition
    to symlinks.
  - When writing the debian/python-setuptools.substvars, only include
    variable substitutions for building Python 2.6.

10. By Barry Warsaw on 2010-01-18

Remove another reference to Python 2.5

9. By Barry Warsaw on 2010-01-18

Stop building for Python 2.5 as per discussion with ScottK.

8. By Barry Warsaw on 2010-01-14

changelog

7. By Barry Warsaw on 2010-01-14

* Merge with sid's new upstream version.

=== modified file 'debian/changelog'
--- debian/changelog	2010-01-20 10:35:24 +0000
+++ debian/changelog	2010-01-20 10:35:24 +0000
@@ -1,4 +1,22 @@
-<<<<<<< TREE
+distribute (0.6.10-1ubuntu1) lucid; urgency=low
+
+  * Merge from Debian Unstable.  Remaining Ubuntu changes:
+    - Build only for Python 2.6, since 2.5 and earlier is not supported on
+      Lucid.
+    - Remove old setuptools.egg-info directories so that we can transition
+      to symlinks.
+    - When writing the debian/python-setuptools.substvars, only include
+      variable substitutions for building Python 2.6.
+
+ -- Barry Warsaw <[e-mail]>  Thu, 14 Jan 2010 16:55:50 -0500
+
+distribute (0.6.10-1) unstable; urgency=low
+
+  * New upstream version.
+  * Stop building for python2.4. Closes: #557000.
+
+ -- Matthias Klose <[e-mail]>  Mon, 28 Dec 2009 23:52:40 +0100
+
 distribute (0.6.8-1ubuntu2) lucid; urgency=low
 
   * python-setuptools.preinst (lp: #490731):
@@ -12,15 +30,6 @@
 
  -- Matthias Klose <[e-mail]>  Thu, 12 Nov 2009 02:17:43 +0100
 
-=======
-distribute (0.6.10-1) unstable; urgency=low
-
-  * New upstream version.
-  * Stop building for python2.4. Closes: #557000.
-
- -- Matthias Klose <[e-mail]>  Mon, 28 Dec 2009 23:52:40 +0100
-
->>>>>>> MERGE-SOURCE
 distribute (0.6.8-1) unstable; urgency=low
 
   * New upstream version.
 
=== modified file 'debian/control'
--- debian/control	2010-01-20 10:35:24 +0000
+++ debian/control	2010-01-20 10:35:24 +0000
@@ -4,9 +4,9 @@
 Maintainer: Ubuntu Developers <[e-mail]>
 XSBC-Original-Maintainer: Matthias Klose <[e-mail]>
 #Build-Depends-Indep: python-all-dev, python2.5-dev, python2.6-dev, python3-all-dev, python-central (>= 0.6.11), python-sphinx
-Build-Depends-Indep: python2.5-dev, python-all-dev, python-central (>= 0.6.11), python-sphinx
+Build-Depends-Indep: python-all-dev, python-central (>= 0.6.11), python-sphinx
 Build-Depends: debhelper (>= 5.0.37.1)
-XS-Python-Version: 2.5, 2.6
+XS-Python-Version: 2.6
 Standards-Version: 3.8.3
 Homepage: http://packages.python.org/distribute
 
 
=== modified file 'debian/python-distribute.substvars'
--- debian/python-distribute.substvars	2010-01-20 10:35:24 +0000
+++ debian/python-distribute.substvars	2010-01-20 10:35:24 +0000
@@ -1,6 +1,2 @@
-<<<<<<< TREE
-python:Versions=2.4, 2.4, 2.5, 2.6, 2.5, 2.6
-=======
 python:Versions=2.4, 2.5, 2.5, 2.6, 2.6
->>>>>>> MERGE-SOURCE
 python:Provides=python2.4-distribute, python2.5-distribute
 
=== modified file 'debian/rules'
--- debian/rules	2010-01-20 10:35:24 +0000
+++ debian/rules	2010-01-20 10:35:24 +0000
@@ -19,15 +19,8 @@
 # setuptools doesn't handle translated messages
 export LC_ALL=C
 
-PYVERS	:= 2.3 2.5 $(shell pyversions -vr debian/control)
-<<<<<<< TREE
-XPYVERS	:= 2.6 2.5
-PYVERS	:= 2.4 2.5
-PYVERS	:= 2.6
-=======
-XPYVERS	:= 2.6 2.5
-PYVERS	:= 2.5
->>>>>>> MERGE-SOURCE
+PYVERS	:= $(shell pyversions -vr debian/control)
+XPYVERS	:= 2.6
 PYVER   := $(shell python -c 'import sys; print sys.version[:3]')
 SETUPTOOLSVER=0.6c11
 export XPYVERS
@@ -166,9 +159,9 @@
 
 	cat $(d_setp).substvars
 	( \
-	  echo 'python:Versions=2.5, 2.6'; \
-	  echo 'python:Provides=python2.5-setuptools, python2.6-setuptools'; \
-	  echo 'python:Depends=python (>= 2.5), python (<< 2.7), python-central (>= 0.6.11)'; \
+	  echo 'python:Versions=2.6'; \
+	  echo 'python:Provides=python2.6-setuptools'; \
+	  echo 'python:Depends=python (>= 2.6), python (<< 2.7), python-central (>= 0.6.11)'; \
 	) > $(d_setp).substvars
 	cat $(d_setp).substvars
 #	cp $(d_setp).substvars $(d_dist).substvars