[Python-modules-commits] r14434 - in packages/python-pip/trunk/debian (7 files)

[chaica-guest at users.alioth.debian.org]

    Date: Wednesday, September 15, 2010 @ 00:10:25
  Author: chaica-guest
Revision: 14434

  * New upstream version
  * Added debian/patches/
  * Added debian/patches/series
  * Added debian/patches/format_egg_string
  * debian/patches/format_egg_string
    - use the same egg string format than Debian python-setuptools
      Closes: #562544
  * debian/control
    - bump Standards-Version to 3.9.1. No changes needed.
    - added python-setuptools to Build-Depends-Indep
    - switched XS-Python-Version to >= 2.5
  * debian/rules
    - added export DH_ALWAYS_EXCLUDE=pip-2.5:pip-2.6
      to remove unwanted generated files
    - removing overrides

Added:
  packages/python-pip/trunk/debian/patches/
  packages/python-pip/trunk/debian/patches/format_egg_string
  packages/python-pip/trunk/debian/patches/series
Modified:
  packages/python-pip/trunk/debian/changelog
  packages/python-pip/trunk/debian/control
  packages/python-pip/trunk/debian/rules
Deleted:
  packages/python-pip/trunk/debian/install

Modified: packages/python-pip/trunk/debian/changelog
===================================================================
--- packages/python-pip/trunk/debian/changelog	2010-09-14 22:07:41 UTC (rev 14433)
+++ packages/python-pip/trunk/debian/changelog	2010-09-15 00:10:25 UTC (rev 14434)
@@ -1,3 +1,23 @@
+python-pip (0.8.1-1) unstable; urgency=low
+
+  * New upstream version
+  * Added debian/patches/
+  * Added debian/patches/series
+  * Added debian/patches/format_egg_string
+  * debian/patches/format_egg_string
+    - use the same egg string format than Debian python-setuptools
+      Closes: #562544 
+  * debian/control
+    - bump Standards-Version to 3.9.1. No changes needed.
+    - added python-setuptools to Build-Depends-Indep
+    - switched XS-Python-Version to >= 2.5
+  * debian/rules
+    - added export DH_ALWAYS_EXCLUDE=pip-2.5:pip-2.6
+      to remove unwanted generated files
+    - removing overrides
+
+ -- Carl Chenet <chaica at ohmytux.com>  Wed, 15 Sep 2010 02:09:57 +0200
+
 python-pip (0.7.2-1) unstable; urgency=low
 
   * New upstream version

Modified: packages/python-pip/trunk/debian/control
===================================================================
--- packages/python-pip/trunk/debian/control	2010-09-14 22:07:41 UTC (rev 14433)
+++ packages/python-pip/trunk/debian/control	2010-09-15 00:10:25 UTC (rev 14434)
@@ -5,9 +5,9 @@
 Uploaders: Carl Chenet <chaica at ohmytux.com>, Jeff Licquia <licquia at debian.org>
 Homepage: http://pip.openplans.org/
 Build-Depends: debhelper (>= 7.0.50~), python
-Build-Depends-Indep: python-support (>= 1.0.0)
-Standards-Version: 3.8.4
-XS-Python-Version: all
+Build-Depends-Indep: python-support (>= 1.0.0), python-setuptools (>= 0.6c1)
+Standards-Version: 3.9.1
+XS-Python-Version: >= 2.5
 Vcs-Svn: svn://svn.debian.org/svn/python-modules/packages/python-pip/trunk/
 Vcs-Browser: http://svn.debian.org/wsvn/python-modules/packages/python-pip/trunk/
 

Deleted: packages/python-pip/trunk/debian/install
===================================================================
--- packages/python-pip/trunk/debian/install	2010-09-14 22:07:41 UTC (rev 14433)
+++ packages/python-pip/trunk/debian/install	2010-09-15 00:10:25 UTC (rev 14434)
@@ -1 +0,0 @@
-pip/ usr/share/pyshared/

Added: packages/python-pip/trunk/debian/patches/format_egg_string
===================================================================
--- packages/python-pip/trunk/debian/patches/format_egg_string	                        (rev 0)
+++ packages/python-pip/trunk/debian/patches/format_egg_string	2010-09-15 00:10:25 UTC (rev 14434)
@@ -0,0 +1,16 @@
+# Description: use the same .egg string format than Debian python-setuptools
+# Author: Carl Chenet <chaica at ohmytux.com>
+Index: pip-0.8.1/pip/req.py
+===================================================================
+--- pip-0.8.1.orig/pip/req.py	2010-09-15 01:14:08.000000000 +0200
++++ pip-0.8.1/pip/req.py	2010-09-15 01:24:03.000000000 +0200
+@@ -405,7 +405,8 @@
+         paths_to_remove = UninstallPathSet(dist)
+ 
+         pip_egg_info_path = os.path.join(dist.location,
+-                                         dist.egg_name()) + '.egg-info'
++                                         #dist.egg_name()) + '.egg-info'
++                                         dist.egg_name().split('-py')[0]) + '.egg-info'
+         easy_install_egg = dist.egg_name() + '.egg'
+         develop_egg_link = egg_link_path(dist)
+         if os.path.exists(pip_egg_info_path):

Added: packages/python-pip/trunk/debian/patches/series
===================================================================
--- packages/python-pip/trunk/debian/patches/series	                        (rev 0)
+++ packages/python-pip/trunk/debian/patches/series	2010-09-15 00:10:25 UTC (rev 14434)
@@ -0,0 +1 @@
+format_egg_string

Modified: packages/python-pip/trunk/debian/rules
===================================================================
--- packages/python-pip/trunk/debian/rules	2010-09-14 22:07:41 UTC (rev 14433)
+++ packages/python-pip/trunk/debian/rules	2010-09-15 00:10:25 UTC (rev 14434)
@@ -1,15 +1,6 @@
 #!/usr/bin/make -f
+export DH_ALWAYS_EXCLUDE=pip-2.5:pip-2.6
+
 %:
 	dh $@
 
-override_dh_auto_clean:
-
-override_dh_auto_build:
-
-override_dh_auto_install:
-
-override_dh_install:
-	dh_install
-
-override_dh_link:
-	dh_link usr/share/pyshared/pip/__init__.py usr/bin/pip