[Python-modules-commits] r14739 - in packages/python-keyczar/trunk/debian (changelog rules)

[lfaraone at users.alioth.debian.org]

    Date: Sunday, October 24, 2010 @ 18:22:27
  Author: lfaraone
Revision: 14739

* debian/rules:
  - Handle cases when Python 2.5 is not used during build. Fixes FTBFS when
    running tests. Closes: #601259

Modified:
  packages/python-keyczar/trunk/debian/changelog
  packages/python-keyczar/trunk/debian/rules

Modified: packages/python-keyczar/trunk/debian/changelog
===================================================================
--- packages/python-keyczar/trunk/debian/changelog	2010-10-24 17:52:53 UTC (rev 14738)
+++ packages/python-keyczar/trunk/debian/changelog	2010-10-24 18:22:27 UTC (rev 14739)
@@ -1,10 +1,16 @@
 python-keyczar (0.6~b.061709-3) UNRELEASED; urgency=low
 
+  [ Christian Kastner ]
   * debian/control:
     - Bump Standards-Version to 3.9.1 (no changes needed) 
 
- -- Christian Kastner <debian at kvr.at>  Thu, 29 Jul 2010 22:49:09 +0200
+  [ Luke Faraone ]
+  * debian/rules:
+    - Handle cases when Python 2.5 is not used during build. Fixes FTBFS when
+      running tests. Closes: #601259
 
+ -- Luke Faraone <lfaraone at debian.org>  Sun, 24 Oct 2010 14:21:58 -0400
+
 python-keyczar (0.6~b.061709-2) unstable; urgency=low
 
   * debian/copyright:

Modified: packages/python-keyczar/trunk/debian/rules
===================================================================
--- packages/python-keyczar/trunk/debian/rules	2010-10-24 17:52:53 UTC (rev 14738)
+++ packages/python-keyczar/trunk/debian/rules	2010-10-24 18:22:27 UTC (rev 14739)
@@ -11,9 +11,13 @@
 
 override_dh_auto_test:
 ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
-	set -e ;\
-	cd tests/keyczar ;\
+	set -e ; \
+	cd tests/keyczar/; \
 	for py in $(PYVERS); do  \
-		PYTHONPATH=$(CURDIR)/build/lib python$$py alltests.py; \
+		if [ "$$py" \< "2.6" ]; then \
+			PYTHONPATH=$(CURDIR)/build/lib python$$py alltests.py; \
+		else \
+			PYTHONPATH=$(CURDIR)/build/lib.$(DEB_BUILD_ARCH_OS)-$(DEB_HOST_GNU_CPU)-$$py python$$py alltests.py; \
+    		fi; \
 	done
 endif