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

[xnox at users.alioth.debian.org]

    Date: Sunday, August 4, 2013 @ 22:18:29
  Author: xnox
Revision: 9931

Switch to dh-python.

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

Modified: packages/pyflakes/trunk/debian/changelog
===================================================================
--- packages/pyflakes/trunk/debian/changelog	2013-07-31 15:40:42 UTC (rev 9930)
+++ packages/pyflakes/trunk/debian/changelog	2013-08-04 22:18:29 UTC (rev 9931)
@@ -1,3 +1,9 @@
+pyflakes (0.7.2-2) UNRELEASED; urgency=low
+
+  * Switch to dh-python.
+
+ -- Dmitrijs Ledkovs <xnox at debian.org>  Sun, 04 Aug 2013 23:17:49 +0100
+
 pyflakes (0.7.2-1) unstable; urgency=low
 
   [ Sandro Tosi ]

Modified: packages/pyflakes/trunk/debian/control
===================================================================
--- packages/pyflakes/trunk/debian/control	2013-07-31 15:40:42 UTC (rev 9930)
+++ packages/pyflakes/trunk/debian/control	2013-08-04 22:18:29 UTC (rev 9931)
@@ -6,6 +6,7 @@
            Varun Hiremath <varun at debian.org>,
            Dmitrijs Ledkovs <xnox at debian.org>,
 Build-Depends: debhelper (>= 9),
+	       dh-python,
                python-all,
                python-nose,
                python-setuptools,

Modified: packages/pyflakes/trunk/debian/rules
===================================================================
--- packages/pyflakes/trunk/debian/rules	2013-07-31 15:40:42 UTC (rev 9930)
+++ packages/pyflakes/trunk/debian/rules	2013-08-04 22:18:29 UTC (rev 9931)
@@ -1,41 +1,21 @@
 #!/usr/bin/make -f
 
-include /usr/share/dpkg/pkg-info.mk
-PYTHON2:=$(shell pyversions -r)
-PYTHON3:=$(shell py3versions -r)
-py3sdo=set -e; $(foreach py, $(PYTHON3), $(py) $(1);)
-pyalldo=set -e; $(foreach py, $(PYTHON2) $(PYTHON3), $(py) $(1);)
-
 # Prevent setuptools/distribute from accessing the internet.
 export http_proxy = http://127.0.9.1:9
 
+export PYBUILD_DESTDIR_python2=debian/pyflakes
+export PYBUILD_DESTDIR_python3=debian/pyflakes
+
 %:
-	dh $@ --with python2,python3
+	dh $@ --with python2,python3 --buildsystem=pybuild
 
-ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
-override_dh_auto_test:
-	$(call pyalldo, setup.py test)
-endif
+override_dh_installchangelogs:
+	dh_installchangelogs NEWS.txt
 
-override_dh_auto_build:
-	dh_auto_build
-	$(call py3sdo, setup.py build)
-
 override_dh_auto_install:
-	$(call py3sdo, setup.py install --root=$(CURDIR)/debian/$(DEB_SOURCE) --install-layout=deb)
-	cd $(CURDIR)/debian/$(DEB_SOURCE)/usr/bin && mv pyflakes pyflakes3
 	dh_auto_install
+	cp debian/pyflakes/usr/bin/pyflakes debian/pyflakes/usr/bin/pyflakes3
+	sed -i '1s/3.*/2.7/' ./debian/pyflakes/usr/bin/pyflakes
 
-override_dh_installchangelogs:
-	dh_installchangelogs NEWS.txt
-
-override_dh_python2:
-	dh_python2 -ppyflakes
-
 override_dh_python3:
-	dh_python3 --shebang=/usr/bin/python3 -ppyflakes
-
-override_dh_auto_clean:
-	dh_auto_clean
-	rm -rf build
-	rm -rf *.egg-info
+	dh_python3 --shebang=/usr/bin/python3