[Python-apps-commits] r12679 - in packages/pylint/trunk/debian (changelog control rules)

[morph at users.alioth.debian.org]

    Date: Sunday, January 3, 2016 @ 13:10:49
  Author: morph
Revision: 12679

Fix build with multiple supported Python versions; patch by Dmitry Shachnev;
Closes: #802126

Modified:
  packages/pylint/trunk/debian/changelog
  packages/pylint/trunk/debian/control
  packages/pylint/trunk/debian/rules

Modified: packages/pylint/trunk/debian/changelog
===================================================================
--- packages/pylint/trunk/debian/changelog	2016-01-03 13:04:43 UTC (rev 12678)
+++ packages/pylint/trunk/debian/changelog	2016-01-03 13:10:49 UTC (rev 12679)
@@ -7,8 +7,10 @@
   * debian/copyright
     - extend packaging copyright years
     - update for new upstream code
+  * Fix build with multiple supported Python versions; patch by Dmitry Shachnev;
+    Closes: #802126
 
- -- Sandro Tosi <morph at debian.org>  Sun, 03 Jan 2016 13:04:27 +0000
+ -- Sandro Tosi <morph at debian.org>  Sun, 03 Jan 2016 13:09:47 +0000
 
 pylint (1.4.4-1) unstable; urgency=medium
 

Modified: packages/pylint/trunk/debian/control
===================================================================
--- packages/pylint/trunk/debian/control	2016-01-03 13:04:43 UTC (rev 12678)
+++ packages/pylint/trunk/debian/control	2016-01-03 13:10:49 UTC (rev 12679)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Sandro Tosi <morph at debian.org>
 Uploaders: Python Applications Packaging Team <python-apps-team at lists.alioth.debian.org>
-Build-Depends: debhelper (>= 9), python (>= 2.6.6-3~), python3, dh-python
+Build-Depends: debhelper (>= 9), python (>= 2.6.6-3~), python3-all, dh-python
 Build-Depends-Indep: python-astroid (>= 1.4.1), python3-astroid (>= 1.4.1), python-unittest2, python-six, python-sphinx
 Standards-Version: 3.9.6
 XS-Python-Version: >= 2.6

Modified: packages/pylint/trunk/debian/rules
===================================================================
--- packages/pylint/trunk/debian/rules	2016-01-03 13:04:43 UTC (rev 12678)
+++ packages/pylint/trunk/debian/rules	2016-01-03 13:10:49 UTC (rev 12679)
@@ -32,13 +32,17 @@
 
 
 override_dh_auto_install:
-	NO_SETUPTOOLS=1 $(PYTHON2) setup.py -q install --no-compile \
+	for python in $(PYTHON2); do \
+		NO_SETUPTOOLS=1 $$python setup.py -q install --no-compile \
 			--root=$(CURDIR)/debian/pylint \
-			--install-layout=deb
+			--install-layout=deb; \
+	done
 
-	NO_SETUPTOOLS=1 $(PYTHON3) setup.py -q install --no-compile \
+	for python in $(PYTHON3); do \
+		NO_SETUPTOOLS=1 $$python setup.py -q install --no-compile \
 			--root=$(CURDIR)/debian/pylint3 \
-			--install-layout=deb
+			--install-layout=deb; \
+	done
 
 	rm -rf debian/pylint/usr/lib/python*/*-packages/pylint/test
 	rm -rf debian/pylint3/usr/lib/python*/*-packages/pylint/test
@@ -51,13 +55,16 @@
 	  chmod a+x debian/pylint/usr/bin/$$exec; \
 	done
 	for exec in pylint pylint-gui symilar epylint pyreverse ; do \
-	  # no need to change shebang in py3k execs, they are correct \
+	  # no need to change shebang in py3k execs, they will be handled by dh_python3 \
 	  chmod a+x debian/pylint3/usr/bin/$$exec; \
 	  mv debian/pylint3/usr/bin/$$exec debian/pylint3/usr/bin/$${exec}3 ; \
 	done
 
 	install -m 644 elisp/pylint.el debian/pylint/usr/share/emacs/site-lisp/pylint/
 
+override_dh_python3:
+	dh_python3 -p pylint3 --shebang=/usr/bin/python3
+
 override_dh_installman:
 	dh_installman -ppylint  man/*.1
 	dh_installman -ppylint3 man/*.1