[Python-modules-commits] r26196 - in packages/requests/trunk/debian (changelog control rules)

[eriol-guest at users.alioth.debian.org]

    Date: Friday, October 18, 2013 @ 15:41:32
  Author: eriol-guest
Revision: 26196

Switched to pybuild

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

Modified: packages/requests/trunk/debian/changelog
===================================================================
--- packages/requests/trunk/debian/changelog	2013-10-18 14:54:25 UTC (rev 26195)
+++ packages/requests/trunk/debian/changelog	2013-10-18 15:41:32 UTC (rev 26196)
@@ -1,6 +1,7 @@
 requests (2.0.0-1) UNRELEASED; urgency=low
 
   * New upstream release (Closes: #725784)
+  * Switched to pybuild
   * debian/control
     - Bumped python(3)-urllib3 to (>=1.7.1)
   * debian/patches/02_use-system-chardet-and-urllib3.patches
@@ -8,7 +9,7 @@
   * debian/watch
     - Switched download URL to https
 
- -- Daniele Tricoli <eriol at mornie.org>  Fri, 18 Oct 2013 16:38:29 +0200
+ -- Daniele Tricoli <eriol at mornie.org>  Fri, 18 Oct 2013 17:40:40 +0200
 
 requests (1.2.3-1) unstable; urgency=low
 

Modified: packages/requests/trunk/debian/control
===================================================================
--- packages/requests/trunk/debian/control	2013-10-18 14:54:25 UTC (rev 26195)
+++ packages/requests/trunk/debian/control	2013-10-18 15:41:32 UTC (rev 26196)
@@ -5,6 +5,7 @@
 Priority: optional
 Build-Depends:
  debhelper (>= 9),
+ dh-python,
  python-all (>= 2.6.6-3),
  python-chardet,
  python-urllib3 (>= 1.7.1),

Modified: packages/requests/trunk/debian/rules
===================================================================
--- packages/requests/trunk/debian/rules	2013-10-18 14:54:25 UTC (rev 26195)
+++ packages/requests/trunk/debian/rules	2013-10-18 15:41:32 UTC (rev 26196)
@@ -1,34 +1,16 @@
 #!/usr/bin/make -f
 
-PYVERS := $(shell pyversions -r)
-PY3VERS := $(shell py3versions -r)
+export PYBUILD_DESTDIR_python2=debian/python-requests/
+export PYBUILD_DESTDIR_python3=debian/python3-requests/
 
+
 %:
-	dh $@ --with python2,python3 --buildsystem=python_distutils
+	dh $@ --with python2,python3 --buildsystem=pybuild
 
-override_dh_auto_build:
-	set -ex; \
-	for python in $(PYVERS) $(PY3VERS); do \
-		$$python setup.py build; \
-	done
-
 override_dh_auto_clean:
 	rm -rf build
 	dh_auto_clean
 	rm -rf requests.egg-info
 
-override_dh_auto_install:
-	set -ex; \
-	for python in $(PYVERS); do \
-		$$python setup.py install --skip-build --root debian/python-requests \
-			--install-layout deb; \
-	done
-
-	set -ex; \
-	for python in $(PY3VERS); do \
-		$$python setup.py install --skip-build --root debian/python3-requests \
-			--install-layout deb; \
-	done
-
 override_dh_installchangelogs:
 	dh_installchangelogs HISTORY.rst