[Python-modules-commits] r24703 - in packages/python-keyring/trunk/debian (4 files)

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

    Date: Saturday, June 8, 2013 @ 10:00:18
  Author: mitya57-guest
Revision: 24703

* Bump Standards-Version to 3.9.4 and debhelper compat level to 9.
* Disable HTTP traffic in debian/rules.
* Run upstream testsuite during build; simplify other debian/rules parts.

Modified:
  packages/python-keyring/trunk/debian/changelog
  packages/python-keyring/trunk/debian/compat
  packages/python-keyring/trunk/debian/control
  packages/python-keyring/trunk/debian/rules

Modified: packages/python-keyring/trunk/debian/changelog
===================================================================
--- packages/python-keyring/trunk/debian/changelog	2013-06-08 09:43:03 UTC (rev 24702)
+++ packages/python-keyring/trunk/debian/changelog	2013-06-08 10:00:18 UTC (rev 24703)
@@ -8,11 +8,14 @@
   [ Dmitry Shachnev ]
   * New upstream release.
   * Switch debian/watch to use .tar.bz2 archives from BitBucket, rather than
-    .zip archives from PyPI.
+    .zip archives from PyPI; drop unzip build-dependency.
   * Recommend python[3]-secretstorage, as the default backend now uses it.
   * Suggest python[3]-gi and gir1.2-gnomekeyring-1.0, as the GNOME Keyring
     backend now uses it.
   * Drop all patches, applied upstream.
+  * Bump Standards-Version to 3.9.4 and debhelper compat level to 9.
+  * Disable HTTP traffic in debian/rules.
+  * Run upstream testsuite during build; simplify other debian/rules parts.
 
  -- Jakub Wilk <jwilk at debian.org>  Sun, 05 May 2013 16:02:50 +0200
 

Modified: packages/python-keyring/trunk/debian/compat
===================================================================
--- packages/python-keyring/trunk/debian/compat	2013-06-08 09:43:03 UTC (rev 24702)
+++ packages/python-keyring/trunk/debian/compat	2013-06-08 10:00:18 UTC (rev 24703)
@@ -1 +1 @@
-7
+9

Modified: packages/python-keyring/trunk/debian/control
===================================================================
--- packages/python-keyring/trunk/debian/control	2013-06-08 09:43:03 UTC (rev 24702)
+++ packages/python-keyring/trunk/debian/control	2013-06-08 10:00:18 UTC (rev 24703)
@@ -5,8 +5,14 @@
 X-Python3-Version: >= 3.2
 Maintainer: Carl Chenet <chaica at debian.org>
 Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
-Build-Depends: debhelper (>= 7.0.50~), python-all (>=2.6.6-3), python-setuptools, python3-all, python3-setuptools, unzip
-Standards-Version: 3.9.3
+Build-Depends: debhelper (>= 9),
+               python-all (>= 2.6.6-3),
+               python-mock,
+               python-setuptools,
+               python3-all,
+               python3-mock,
+               python3-setuptools
+Standards-Version: 3.9.4
 Homepage: http://home.python-keyring.org/
 Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/python-keyring/trunk/
 Vcs-Browser: http://anonscm.debian.org/viewvc/python-modules/packages/python-keyring/trunk/

Modified: packages/python-keyring/trunk/debian/rules
===================================================================
--- packages/python-keyring/trunk/debian/rules	2013-06-08 09:43:03 UTC (rev 24702)
+++ packages/python-keyring/trunk/debian/rules	2013-06-08 10:00:18 UTC (rev 24703)
@@ -2,27 +2,36 @@
 
 #DH_VERBOSE=1
 
-PYTHON2=$(shell pyversions -vr)
-PYTHON3=$(shell py3versions -vr)
+PYTHON2=$(shell pyversions -r)
+PYTHON3=$(shell py3versions -r)
 
+# Send HTTP traffic to “discard” service
+export http_proxy = http://127.0.1.1:9/
+export https_proxy = ${http_proxy}
+
 %:
 	dh $@ --with python2,python3
 
 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 override_dh_auto_test:
-	
+	set -ex; for py in $(PYTHON); do \
+		$$py -m unittest discover -v; \
+	done;
+	set -ex; cd build/lib; for py in $(PYTHON3); do \
+		$$py -m unittest discover -v; \
+	done;
 endif
 
 override_dh_auto_build:
 	dh_auto_build
 	set -ex; for py in $(PYTHON3) ; do \
-		python$$py setup.py build; \
+		$$py setup.py build; \
 	done;
 
 override_dh_auto_install:
 	dh_auto_install
 	set -ex; for py in $(PYTHON3) ; do \
-		python$$py setup.py install --root=$(CURDIR)/debian/tmp --install-layout=deb; \
+		$$py setup.py install --root=$(CURDIR)/debian/tmp --install-layout=deb; \
 	done;
 
 override_dh_installchangelogs: