Merge lp:~21-vingtetun/ubuntu/lucid/python-pip/python-setuptools-dependancy into lp:ubuntu/lucid/python-pip

[21-vingtetun]

debian/control: Added python-setuptools as a dependancy. Closes: #556189.

The change add python-setuptools as a dependancy and remove python-pkg-resources from the dependancy list since this packet python-setuptools already depends on it.

http://packages.ubuntu.com/lucid/python-setuptools
http://packages.ubuntu.com/lucid/python-pkg-resources

[Evan Broder (broder)]

I'm going to go ahead and mark this merge proposal as "merged" to get it off of the sponsorship queue.

mvo uploaded this fix to lucid-proposed yesterday, so now it's just awaiting review by the SRU team.

[21-vingtetun (21-vingtetun)]

Cool, thanks for the quick reaction.

=== modified file 'debian/changelog'
--- debian/changelog	2009-10-11 17:05:43 +0000
+++ debian/changelog	2011-01-26 00:57:55 +0000
@@ -1,3 +1,9 @@
+python-pip (0.3.1-1ubuntu3) lucid; urgency=low
+
+  * debian/control: Added python-setuptools as a dependancy. Closes: #556189.
+
+ --  Vivien Nicolas <[e-mail]>  Wed, 26 Jan 2011 01:42:10 +0100
+
 python-pip (0.3.1-1ubuntu2) karmic; urgency=low
 
   * ZipCommand.list: Treat `dist-packges' the same as `site-packages'.

=== modified file 'debian/control'
--- debian/control	2009-05-25 15:10:16 +0000
+++ debian/control	2011-01-26 00:57:55 +0000
@@ -14,7 +14,7 @@
 Package: python-pip
 Architecture: all
 Section: python
-Depends: ${python:Depends}, python-pkg-resources | python-setuptools (<< 0.6c8-1)
+Depends: ${python:Depends}, python-setuptools (>= 0.6c1)
 XB-Python-Version: ${python:Versions}
 Description: Alternative Python package installer
  pip installs packages.  Python packages.  An easy_install replacement.