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

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

    Date: Thursday, February 13, 2014 @ 15:11:27
  Author: eriol-guest
Revision: 27642

Switched to pybuild

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

Modified: packages/geopy/trunk/debian/changelog
===================================================================
--- packages/geopy/trunk/debian/changelog	2014-02-13 14:34:02 UTC (rev 27641)
+++ packages/geopy/trunk/debian/changelog	2014-02-13 15:11:27 UTC (rev 27642)
@@ -1,6 +1,7 @@
 geopy (0.98-1) UNRELEASED; urgency=medium
 
   * New upstream release
+  * Switched to pybuild
   * debian/patches/01_add_missing_test_file.patch
     - Removed since no more used upstream
   * debian/patches/02_fix_missing_imports.patch:
@@ -11,7 +12,7 @@
   * debian/patches/04_use_lt_and_eq_instead_of_cmp.patch
     - Refreshed
 
- -- Daniele Tricoli <eriol at mornie.org>  Thu, 13 Feb 2014 15:33:11 +0100
+ -- Daniele Tricoli <eriol at mornie.org>  Thu, 13 Feb 2014 16:08:31 +0100
 
 geopy (0.95.1-1) unstable; urgency=low
 

Modified: packages/geopy/trunk/debian/control
===================================================================
--- packages/geopy/trunk/debian/control	2014-02-13 14:34:02 UTC (rev 27641)
+++ packages/geopy/trunk/debian/control	2014-02-13 15:11:27 UTC (rev 27642)
@@ -5,6 +5,7 @@
 Priority: optional
 Build-Depends:
  debhelper (>= 9),
+ dh-python,
  python-all (>= 2.6.6-3),
  python-beautifulsoup,
  python-nose,

Modified: packages/geopy/trunk/debian/rules
===================================================================
--- packages/geopy/trunk/debian/rules	2014-02-13 14:34:02 UTC (rev 27641)
+++ packages/geopy/trunk/debian/rules	2014-02-13 15:11:27 UTC (rev 27642)
@@ -1,47 +1,8 @@
 #!/usr/bin/make -f
 
 export PYTHONWARNINGS=d
+export PYBUILD_DESTDIR_python2=debian/python-geopy/
+export PYBUILD_DESTDIR_python3=debian/python3-geopy/
 
-PYVERS := $(shell pyversions -r)
-PY3VERS := $(shell py3versions -r)
-
 %:
-	dh $@ --with python2,python3
-
-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
-
-override_dh_auto_install:
-	# Remove tests to not pollute namespace.
-	rm -rf  build/lib*/geopy/tests
-
-	set -ex; \
-	for python in $(PYVERS); do \
-		$$python setup.py install --skip-build --root debian/python-geopy \
-			--install-layout deb; \
-	done
-
-	set -ex; \
-	for python in $(PY3VERS); do \
-		$$python setup.py install --skip-build --root debian/python3-geopy \
-			--install-layout deb; \
-	done
-
-override_dh_installchangelogs:
-	dh_installchangelogs RELEASES
-
-override_dh_auto_test:
-ifeq "$(filter nocheck,$(DEB_BUILD_OPTIONS))" ""
-	# Run tests only for Python2 since upstream is using Beautiful Soup 3.
-	set -e; \
-	for python in $(PYVERS); do \
-		$$python /usr/bin/nosetests; \
-	done
-endif
+	dh $@ --with python2,python3 --buildsystem=pybuild