[Python-modules-commits] [tox] 01/01: Fix build on systems without Python 3.4.

[Barry Warsaw]

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

barry pushed a commit to branch master
in repository tox.

commit 174fe7ba4cd8ef387df5151b48a934f154effaa1
Author: Barry Warsaw <barry at python.org>
Date:   Tue Feb 16 10:21:12 2016 -0500

    Fix build on systems without Python 3.4.
    
    * d/control: Add Build-Depends on dh-python.
    * d/rules:
      - export PYBUILD_NAME=tox
      - Add override_dh_install to make sure that the default Python 3
        version of the library gets installed correctly.
      - Remove debian/tox.install since that was hardcoded to a specific
        Python 3 version, which might not exist.
---
 debian/changelog   | 12 ++++++++++++
 debian/control     |  1 +
 debian/rules       | 11 ++++++++++-
 debian/tox.install |  2 --
 4 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2f19206..8514cca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+tox (2.3.1-2) UNRELEASED; urgency=medium
+
+  * d/control: Add Build-Depends on dh-python.
+  * d/rules:
+    - export PYBUILD_NAME=tox
+    - Add override_dh_install to make sure that the default Python 3
+      version of the library gets installed correctly.
+    - Remove debian/tox.install since that was hardcoded to a specific
+      Python 3 version, which might not exist.
+
+ -- Barry Warsaw <barry at debian.org>  Tue, 16 Feb 2016 09:39:09 -0500
+
 tox (2.3.1-1) unstable; urgency=medium
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index 4320025..29fcf94 100644
--- a/debian/control
+++ b/debian/control
@@ -5,6 +5,7 @@ Maintainer: Barry Warsaw <barry at debian.org>
 Uploaders: Python Applications Packaging Team <python-apps-team at lists.alioth.debian.org>
 Homepage: http://tox.testrun.org
 Build-Depends: debhelper (>= 9),
+               dh-python,
                python3-all,
                python3-pip,
                python3-pkg-resources,
diff --git a/debian/rules b/debian/rules
index 0597666..6b1f6ef 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,10 @@
 #!/usr/bin/make -f
 
 #export DH_VERBOSE=1
-PYTHON3=$(shell py3versions -sv)
+#export PYBUILD_VERBOSE=1
+export PYBUILD_NAME=tox
+
+PYTHON3=$(shell py3versions -d)
 
 BUILD_DATE=$(\
     shell dpkg-parsechangelog -S Date | LC_ALL=C date -u "+%B %d, %Y" -f -)
@@ -14,6 +17,12 @@ BUILD_DATE=$(\
 # because upstream always changes the mix.
 override_dh_auto_test:
 
+override_dh_install:
+	dh_install
+	dh_install debian/python3-tox/usr/bin usr
+	dh_install debian/python3-tox/usr/lib/$(PYTHON3)/dist-packages \
+		   usr/lib/python3
+
 override_dh_installdocs:
 	python3 setup.py build_sphinx
 	dh_installdocs doc/build/html
diff --git a/debian/tox.install b/debian/tox.install
deleted file mode 100644
index fc9159c..0000000
--- a/debian/tox.install
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/tmp/usr/lib/python3.4/dist-packages usr/lib/python3
-debian/tmp/usr/bin

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