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

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

    Date: Tuesday, October 5, 2010 @ 23:13:37
  Author: chaica-guest
Revision: 14526

  * debian/patches/remove_hardcoded_python_version
    - remove pip-X.X exe and hardcoded Python version in entry_points.txt

Added:
  packages/python-pip/trunk/debian/patches/remove_hardcoded_python_version
Modified:
  packages/python-pip/trunk/debian/changelog
  packages/python-pip/trunk/debian/patches/series
  packages/python-pip/trunk/debian/rules

Modified: packages/python-pip/trunk/debian/changelog
===================================================================
--- packages/python-pip/trunk/debian/changelog	2010-10-05 21:07:38 UTC (rev 14525)
+++ packages/python-pip/trunk/debian/changelog	2010-10-05 23:13:37 UTC (rev 14526)
@@ -4,16 +4,16 @@
   * debian/patches/format_egg_string
     - use the same egg string format than Debian python-setuptools
       Closes: #562544 
+  * debian/patches/remove_hardcoded_python_version
+    - remove pip-X.X exe and hardcoded Python version in entry_points.txt
   * 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>  Tue, 05 Oct 2010 01:44:06 +0200
+ -- Carl Chenet <chaica at ohmytux.com>  Wed, 06 Oct 2010 01:15:42 +0200
 
 python-pip (0.7.2-1) unstable; urgency=low
 

Added: packages/python-pip/trunk/debian/patches/remove_hardcoded_python_version
===================================================================
--- packages/python-pip/trunk/debian/patches/remove_hardcoded_python_version	                        (rev 0)
+++ packages/python-pip/trunk/debian/patches/remove_hardcoded_python_version	2010-10-05 23:13:37 UTC (rev 14526)
@@ -0,0 +1,24 @@
+# Description: remove the harcoded python version in console exe
+# Author: Carl Chenet <chaica at ohmytux.com>
+Index: pip-0.8.1/pip.egg-info/entry_points.txt
+===================================================================
+--- pip-0.8.1.orig/pip.egg-info/entry_points.txt	2010-10-06 00:40:00.000000000 +0200
++++ pip-0.8.1/pip.egg-info/entry_points.txt	2010-10-06 00:40:49.000000000 +0200
+@@ -1,4 +1,2 @@
+ [console_scripts]
+ pip = pip:main
+-pip-2.6 = pip:main
+-
+Index: pip-0.8.1/setup.py
+===================================================================
+--- pip-0.8.1.orig/setup.py	2010-10-06 00:39:42.000000000 +0200
++++ pip-0.8.1/setup.py	2010-10-06 00:40:37.000000000 +0200
+@@ -35,7 +35,7 @@
+       url='http://pip.openplans.org',
+       license='MIT',
+       packages=['pip', 'pip.commands', 'pip.vcs'],
+-      entry_points=dict(console_scripts=['pip=pip:main', 'pip-%s=pip:main' % sys.version[:3]]),
++      entry_points=dict(console_scripts=['pip=pip:main']),
+       test_suite='nose.collector',
+       tests_require=['nose', 'virtualenv', 'scripttest', 'mock'],
+       zip_safe=False)

Modified: packages/python-pip/trunk/debian/patches/series
===================================================================
--- packages/python-pip/trunk/debian/patches/series	2010-10-05 21:07:38 UTC (rev 14525)
+++ packages/python-pip/trunk/debian/patches/series	2010-10-05 23:13:37 UTC (rev 14526)
@@ -1 +1,2 @@
 format_egg_string
+remove_hardcoded_python_version

Modified: packages/python-pip/trunk/debian/rules
===================================================================
--- packages/python-pip/trunk/debian/rules	2010-10-05 21:07:38 UTC (rev 14525)
+++ packages/python-pip/trunk/debian/rules	2010-10-05 23:13:37 UTC (rev 14526)
@@ -1,5 +1,4 @@
 #!/usr/bin/make -f
-export DH_ALWAYS_EXCLUDE=pip-2.5:pip-2.6
 
 %:
 	dh $@