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

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

    Date: Monday, January 21, 2013 @ 10:55:49
  Author: valhalla-guest
Revision: 23368

NMU by Helmut Grohne <helmut at subdivi.de> to close #682648

Added:
  packages/python-gnupg/trunk/debian/bin/
  packages/python-gnupg/trunk/debian/bin/gpg
Modified:
  packages/python-gnupg/trunk/debian/changelog
  packages/python-gnupg/trunk/debian/rules

Added: packages/python-gnupg/trunk/debian/bin/gpg
===================================================================
--- packages/python-gnupg/trunk/debian/bin/gpg	                        (rev 0)
+++ packages/python-gnupg/trunk/debian/bin/gpg	2013-01-21 10:55:49 UTC (rev 23368)
@@ -0,0 +1,7 @@
+#!/bin/sh
+GPG=`which -a gpg | uniq | tail -n+2 | head -n1`
+if echo "$*" | grep -q gen-key; then
+	exec "$GPG" --quick-random "$@"
+else
+	exec "$GPG" "$@"
+fi

Modified: packages/python-gnupg/trunk/debian/changelog
===================================================================
--- packages/python-gnupg/trunk/debian/changelog	2013-01-21 08:31:32 UTC (rev 23367)
+++ packages/python-gnupg/trunk/debian/changelog	2013-01-21 10:55:49 UTC (rev 23368)
@@ -1,3 +1,11 @@
+python-gnupg (0.3.0-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Work around test suite hangs by adding --quick-random when generating
+    keys. Closes: #682648
+
+ -- Helmut Grohne <helmut at subdivi.de>  Mon, 22 Oct 2012 23:30:19 +0200
+
 python-gnupg (0.3.0-1) unstable; urgency=low
 
   * New upstream release

Modified: packages/python-gnupg/trunk/debian/rules
===================================================================
--- packages/python-gnupg/trunk/debian/rules	2013-01-21 08:31:32 UTC (rev 23367)
+++ packages/python-gnupg/trunk/debian/rules	2013-01-21 10:55:49 UTC (rev 23368)
@@ -18,12 +18,12 @@
 override_dh_auto_test:
 ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
 	set -ex; for py in $(shell pyversions -r -v); do \
-		PYTHONPATH=$(CURDIR)/build/lib.*-$$py  python$$py test_gnupg.py ;\
+		PATH=$(CURDIR)/debian/bin:$$PATH PYTHONPATH=$(CURDIR)/build/lib.*-$$py  python$$py test_gnupg.py ;\
 	done
 	set -ex; for python in $(shell py3versions -r); do \
 		cp test_gnupg.py test_gnupg_3.py ;\
 		2to3 -w test_gnupg_3.py ;\
-		PYTHONPATH=$(CURDIR)/build/lib $$python test_gnupg_3.py ;\
+		PATH=$(CURDIR)/debian/bin:$$PATH PYTHONPATH=$(CURDIR)/build/lib $$python test_gnupg_3.py ;\
 		rm test_gnupg_3.py ;\
 	done
 endif