[Python-apps-commits] r10663 - in packages/pyrit/trunk/debian (changelog rules)

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

    Date: Monday, March 10, 2014 @ 00:28:39
  Author: chrisk-guest
Revision: 10663

Light restructuring of debian/rules

Modified:
  packages/pyrit/trunk/debian/changelog
  packages/pyrit/trunk/debian/rules

Modified: packages/pyrit/trunk/debian/changelog
===================================================================
--- packages/pyrit/trunk/debian/changelog	2014-03-10 00:28:07 UTC (rev 10662)
+++ packages/pyrit/trunk/debian/changelog	2014-03-10 00:28:39 UTC (rev 10663)
@@ -1,7 +1,7 @@
 pyrit (0.4.0-3) UNRELEASED; urgency=low
 
   * debian/copyright:
-    - Added copyright attribution for some of the dump files. It was incorrectly
+    - Add copyright attribution for some of the dump files. It was incorrectly
       assumed that all of these originated from upstream; upstream however had
       included them from third parties with their permission.
     - Update to machine-readable format v1.0
@@ -12,18 +12,20 @@
   * debian/control:
     - Bump Standards-Version to 3.9.5 (no changes needed)
     - Bump debhelper dependency to (>= 9)
-    - Dropped dependency on python-support and bumped python-all-dev dependency
+    - Drop dependency on python-support and bumped python-all-dev dependency
       to (>= 2.6.6-3~) for dh_python2
-    - Added X-Python-Version matching the former debian/pyversions
+    - Add X-Python-Version with >= 2.6
     - Updated Vcs-* URLs
   * debian/compat:
     - Bump debhelper compatibility level to 9
   * debian/rules:
-    - Converted to dh_python2
+    - Convert build process to dh_python2
   * debian/pyversions:
     - Removed (obsolete)
   * debian/watch:
     - Use Google Code URLs following wiki.debian.org recommendations
+  * debian/source/lintian-overrides:
+    - Add override for debian-watch-may-check-gpg-signature
   * debian/patches (refreshed):
     - 0006-custom-config-file
 

Modified: packages/pyrit/trunk/debian/rules
===================================================================
--- packages/pyrit/trunk/debian/rules	2014-03-10 00:28:07 UTC (rev 10662)
+++ packages/pyrit/trunk/debian/rules	2014-03-10 00:28:39 UTC (rev 10663)
@@ -5,6 +5,7 @@
 #export DH_VERBOSE=1
 
 PYVERS = $(shell pyversions -r -v)
+PYPLATFORM = $(shell python -c 'import distutils.util as d; print d.get_platform()')
 
 # If DEB_BUILD_OPTIONS contains parallel=N, use N number of cores for the
 # unit tests as well. Whatever N is, pyrit won't use more than the number
@@ -22,12 +23,11 @@
 override_dh_auto_test:
 ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
 	set -e ;\
+	cd test ;\
 	for py in $(PYVERS); do \
-		LIB=$$(ls -d $(CURDIR)/build/lib.*-$$py) ;\
-		cd test ;\
-		PYRIT_CONFIG_FILE=../debian/config.build PYTHONPATH=$$LIB \
+		PYRIT_CONFIG_FILE=../debian/config.build \
+		PYTHONPATH=$(CURDIR)/build/lib.$(PYPLATFORM)-$$py \
 			python$$py test_pyrit.py ;\
-		cd .. ;\
 	done
 endif