[Python-modules-commits] [python-pex] 01/01: * d/control: - Rename python-pex-cli binary package to pex. This now replaces/breaks earlier versions of python-pex-cli. (Closes: #801246) - Reintroduce python-pex-cli binary package as a virtual package. * d/rules: - Updated for binary package rename. * d/python-pex-cli.manpages -> d/pex.manpages.

[Barry Warsaw]

This is an automated email from the git hooks/post-receive script.

barry pushed a commit to branch master
in repository python-pex.

commit 823c125a74a8f71a87fc698bbb87de14c2dc646d
Author: Barry Warsaw <barry at debian.org>
Date:   Wed Oct 7 17:07:07 2015 -0400

    * d/control:
      - Rename python-pex-cli binary package to pex.  This now replaces/breaks
        earlier versions of python-pex-cli.  (Closes: #801246)
      - Reintroduce python-pex-cli binary package as a virtual package.
    * d/rules:
      - Updated for binary package rename.
    * d/python-pex-cli.manpages -> d/pex.manpages.
---
 debian/changelog                                 | 11 +++++++----
 debian/control                                   | 12 +++++++++++-
 debian/{python-pex-cli.manpages => pex.manpages} |  0
 debian/rules                                     | 18 ++++--------------
 4 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6833b34..f2e5875 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,12 @@
 python-pex (1.0.3-2) unstable; urgency=medium
 
-  * d/rules: Override dh_python2 and dh_python3 to force the
-    /usr/bin/pex shebang to /usr/bin/python3 in the face of multiple 
-    Python 3 versions.  See this file for why we also override
-    dh_python2.
+  * d/control:
+    - Rename python-pex-cli binary package to pex.  This now replaces/breaks
+      earlier versions of python-pex-cli.  (Closes: #801246)
+    - Reintroduce python-pex-cli binary package as a virtual package.
+  * d/rules:
+    - Updated for binary package rename.
+  * d/python-pex-cli.manpages -> d/pex.manpages.
   * d/tests/control:
     - Use Test-Command instead of a separate script.
     - Bump pex verbosity in the execution test.
diff --git a/debian/control b/debian/control
index 3b7a2ec..26e098f 100644
--- a/debian/control
+++ b/debian/control
@@ -55,7 +55,7 @@ Description: library for generating Python executable zip files
  .
  This is the Python 3 library version.
 
-Package: python-pex-cli
+Package: pex
 Architecture: all
 Depends: python3,
          python3-pex,
@@ -63,6 +63,8 @@ Depends: python3,
          python3-wheel,
          ${misc:Depends},
          ${python3:Depends}
+Replaces: python-pex-cli (<< 1.0.3-2~)
+Breaks: python-pex-cli (<< 1.0.3-2~)
 Suggests: python-pex-doc
 Description: library for generating Python executable zip files
  pex is a library for generating .pex (Python EXecutable) files which
@@ -93,3 +95,11 @@ Description: library for generating Python executable zip files
  Pants and Buck also support building .pex files directly.
  .
  This is the common documentation package.
+
+Package: python-pex-cli
+Depends: pex, ${misc:Depends}
+Architecture: all
+Priority: extra
+Section: oldlibs
+Description: transitional dummy package for pex
+ This is a transitional dummy package.  It can safely be removed.
diff --git a/debian/python-pex-cli.manpages b/debian/pex.manpages
similarity index 100%
rename from debian/python-pex-cli.manpages
rename to debian/pex.manpages
diff --git a/debian/rules b/debian/rules
index 35bdd13..3a9197a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,9 +11,9 @@ export pkgversion=$(shell dpkg-parsechangelog --show-field version)
 
 override_dh_auto_install:
 	dh_auto_install
-	# Use the Python 3 binary.
-	mkdir -p debian/python-pex-cli/usr/bin
-	mv debian/python3-pex/usr/bin/pex debian/python-pex-cli/usr/bin
+	# Use the Python 3 version of /usr/bin/pex
+	mkdir -p debian/pex/usr/bin
+	cp debian/python3-pex/usr/bin/pex debian/pex/usr/bin
 	rm -rf debian/python3-pex/usr/bin
 	rm -rf debian/python-pex/usr/bin
 
@@ -21,15 +21,5 @@ override_dh_installman:
 	PYTHONPATH=$(CURDIR) help2man -n pex -s 1 -o debian/pex.1 \
 		--version-string=$(pkgversion) \
 		--no-discard-stderr --no-info \
-		debian/python-pex-cli/usr/bin/pex
+		debian/pex/usr/bin/pex
 	dh_installman
-
-override_dh_python3:
-	dh_python3 --shebang=/usr/bin/python3
-
-# 2015-10-06 barry at debian.org This is silly, but for some reason on Debian 
-# (but not Ubuntu), without this the shebang ends up as /usr/bin/python3.5 
-# when we really want /usr/bin/python3.  The above override seems to not be
-# enough.
-override_dh_python2:
-	dh_python2 --shebang=/usr/bin/python3

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-pex.git