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

Tue Jun 25 21:27:32 UTC 2013

Date: Tuesday, June 25, 2013 @ 21:27:30
  Author: stefanor
Revision: 24961

debian/patches/no-python-specific-scripts.patch: Drop pip-X.Y scripts, and
simply provide pip2 and pip3. (Closes: #679196, #680150)

Added:
  packages/python-pip/trunk/debian/python-pip.links
  packages/python-pip/trunk/debian/python-pip.manpages
  packages/python-pip/trunk/debian/python3-pip.manpages
Modified:
  packages/python-pip/trunk/debian/changelog
  packages/python-pip/trunk/debian/patches/no-python-specific-scripts.patch
  packages/python-pip/trunk/debian/pip.1
  packages/python-pip/trunk/debian/python-pip.install
  packages/python-pip/trunk/debian/python3-pip.install
  packages/python-pip/trunk/debian/rules

Modified: packages/python-pip/trunk/debian/changelog
===================================================================

--- packages/python-pip/trunk/debian/changelog	2013-06-25 21:23:07 UTC (rev 24960)
+++ packages/python-pip/trunk/debian/changelog	2013-06-25 21:27:30 UTC (rev 24961)
@@ -17,6 +17,8 @@
     - Add pip/cacert.pem.
   * debian/patches/system-ca-certificates.patch: Use the CA bundle provided by
     ca-certificates.
+  * debian/patches/no-python-specific-scripts.patch: Drop pip-X.Y scripts, and
+    simply provide pip2 and pip3. (Closes: #679196, #680150)
 
   [ Jakub Wilk ]
   * Use canonical URIs for Vcs-* fields.
@@ -25,15 +27,6 @@
   * Build depend on python3-all, fixes FTBFS against multiple supported
     python3 versions (Closes: #692384).
 
-  [ Dmitry Shachnev ]
-  * Rebuild without python2.6, and drop the manpage for pip-2.6
-    (Closes: #679196).
-
-  [ Stefano Rivera ]
-  * Rework pip-X.Y script creation, to actually work with multiple supported
-    python3 versions, and to have the correct shebang in the scripts
-    (Closes: #680150).
-
  -- Jakub Wilk <jwilk at debian.org>  Sun, 05 May 2013 16:03:05 +0200
 
 python-pip (1.1-3) unstable; urgency=low

Modified: packages/python-pip/trunk/debian/patches/no-python-specific-scripts.patch
===================================================================
--- packages/python-pip/trunk/debian/patches/no-python-specific-scripts.patch	2013-06-25 21:23:07 UTC (rev 24960)
+++ packages/python-pip/trunk/debian/patches/no-python-specific-scripts.patch	2013-06-25 21:27:30 UTC (rev 24961)
@@ -1,8 +1,6 @@
-Description: Don't install Python version specific endpoints from setup.py
- We'll do them ourselves in the packaging, so that they'll have the correct
- shebangs.
- This also ensures that we will support multiple Python3 versions, where the
- entry-points.txt came from only one of the versions.
+Description: Don't install Python minor version specific endpoints
+Forwarded: https://github.com/pypa/pip/pull/976
+Bug-Upstream: https://github.com/pypa/pip/issues/943
 Author: Stefano Rivera <stefanor at debian.org>
 
 --- a/setup.py
@@ -12,7 +10,7 @@
        license='MIT',
        packages=['pip', 'pip.commands', 'pip.vcs', 'pip.backwardcompat'],
 -      entry_points=dict(console_scripts=['pip=pip:main', 'pip-%s=pip:main' % sys.version[:3]]),
-+      entry_points=dict(console_scripts=['pip=pip:main']),
++      entry_points=dict(console_scripts=['pip=pip:main', 'pip%i=pip:main' % sys.version_info[0]]),
        test_suite='nose.collector',
        tests_require=tests_require,
        zip_safe=False,

Modified: packages/python-pip/trunk/debian/pip.1
===================================================================
--- packages/python-pip/trunk/debian/pip.1	2013-06-25 21:23:07 UTC (rev 24960)
+++ packages/python-pip/trunk/debian/pip.1	2013-06-25 21:27:30 UTC (rev 24961)
@@ -33,7 +33,7 @@
 .sp
 \fBpip\fR [\fIcommand\fR] [\fIoptions\fR]
 .sp
-\fBpip\-X.Y\fR [\fIcommand\fR] [\fIoptions\fR]
+\fBpip\fIX\fR [\fIcommand\fR] [\fIoptions\fR]
 .SH "DESCRIPTION"
 .sp
 pip is an alternative Python package installer\&. It performs the same basic job as easy_install, but with some extra features\&. It can work with version control repositories (currently only Git, Mercurial, and Bazaar repositories), logs output extensively, and prevents partial installs by downloading all requirements before starting installation\&.

Modified: packages/python-pip/trunk/debian/python-pip.install
===================================================================
--- packages/python-pip/trunk/debian/python-pip.install	2013-06-25 21:23:07 UTC (rev 24960)
+++ packages/python-pip/trunk/debian/python-pip.install	2013-06-25 21:27:30 UTC (rev 24961)
@@ -1,3 +1,3 @@
 usr/lib/python2*
 usr/bin/pip
-usr/bin/pip-2.*
+usr/bin/pip2

Added: packages/python-pip/trunk/debian/python-pip.links
===================================================================
--- packages/python-pip/trunk/debian/python-pip.links	                        (rev 0)
+++ packages/python-pip/trunk/debian/python-pip.links	2013-06-25 21:27:30 UTC (rev 24961)
@@ -0,0 +1 @@
+/usr/share/man/man1/pip.1.gz /usr/share/man/man1/pip2.1.gz

Added: packages/python-pip/trunk/debian/python-pip.manpages
===================================================================
--- packages/python-pip/trunk/debian/python-pip.manpages	                        (rev 0)
+++ packages/python-pip/trunk/debian/python-pip.manpages	2013-06-25 21:27:30 UTC (rev 24961)
@@ -0,0 +1 @@
+debian/pip.1

Modified: packages/python-pip/trunk/debian/python3-pip.install
===================================================================
--- packages/python-pip/trunk/debian/python3-pip.install	2013-06-25 21:23:07 UTC (rev 24960)
+++ packages/python-pip/trunk/debian/python3-pip.install	2013-06-25 21:27:30 UTC (rev 24961)
@@ -1,2 +1,2 @@
 usr/lib/python3
-usr/bin/pip-3.*
+usr/bin/pip3

Added: packages/python-pip/trunk/debian/python3-pip.manpages
===================================================================
--- packages/python-pip/trunk/debian/python3-pip.manpages	                        (rev 0)
+++ packages/python-pip/trunk/debian/python3-pip.manpages	2013-06-25 21:27:30 UTC (rev 24961)
@@ -0,0 +1 @@
+build/pip3.1

Modified: packages/python-pip/trunk/debian/rules
===================================================================
--- packages/python-pip/trunk/debian/rules	2013-06-25 21:23:07 UTC (rev 24960)
+++ packages/python-pip/trunk/debian/rules	2013-06-25 21:27:30 UTC (rev 24961)
@@ -2,7 +2,6 @@
 
 PYTHON2=$(shell pyversions -vr)
 PYTHON3=$(shell py3versions -vr)
-PYTHON3_DEF=$(shell py3versions -vd)
 
 %:
 	dh $@ --with python2,python3
@@ -19,13 +18,10 @@
 		python$$py setup.py install --skip-build \
 		                            --root=$(CURDIR)/debian/tmp \
 		                            --install-layout=deb; \
-		cp debian/tmp/usr/bin/pip debian/tmp/usr/bin/pip-$$py; \
 	done
+	sed -i "1 s/python3.[0-9]*/python3/" debian/tmp/usr/bin/pip3
+	cp debian/pip.1 build/pip3.1
 	dh_auto_install
-	set -ex; for py in $(PYTHON2) ; do \
-		sed "1 s/python$$/python$$py/" debian/tmp/usr/bin/pip \
-		    > debian/tmp/usr/bin/pip-$$py; \
-	done
 
 override_dh_auto_clean:
 	dh_auto_clean
@@ -34,19 +30,3 @@
 
 override_dh_installchangelogs:
 	dh_installchangelogs CHANGES.txt
-
-override_dh_installman:
-	cp debian/pip.1 build/pip-$(PYTHON3_DEF).1
-	dh_installman -p python-pip debian/pip.1
-	dh_installman -p python3-pip build/pip-$(PYTHON3_DEF).1
-
-override_dh_compress:
-	dh_compress
-	set -ex; for py in $(PYTHON2); do \
-		dh_link -p python-pip /usr/share/man/man1/pip.1.gz \
-		                      /usr/share/man/man1/pip-$$py.1.gz; \
-	done
-	set -ex; for py in $(filter-out $(PYTHON3_DEF),$(PYTHON3)); do \
-		dh_link -p python3-pip /usr/share/man/man1/pip-$(PYTHON3_DEF).1.gz \
-		                       /usr/share/man/man1/pip-$$py.1.gz; \
-	done


