[Python-modules-commits] r21589 - in packages/prettytable/trunk/debian (changelog rules)

[morph at users.alioth.debian.org]

    Date: Saturday, May 5, 2012 @ 16:58:41
  Author: morph
Revision: 21589

* debian/rules
  - remove python3 transformation commands, available upstream now
  - run tests at build time

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

Modified: packages/prettytable/trunk/debian/changelog
===================================================================
--- packages/prettytable/trunk/debian/changelog	2012-05-05 16:30:18 UTC (rev 21588)
+++ packages/prettytable/trunk/debian/changelog	2012-05-05 16:58:41 UTC (rev 21589)
@@ -1,8 +1,11 @@
 prettytable (0.6~rc2-1) UNRELEASED; urgency=low
 
   * New upstream release candidate
+  * debian/rules
+    - remove python3 transformation commands, available upstream now
+    - run tests at build time
 
- -- Sandro Tosi <morph at debian.org>  Sat, 05 May 2012 18:15:24 +0200
+ -- Sandro Tosi <morph at debian.org>  Sat, 05 May 2012 18:55:57 +0200
 
 prettytable (0.5-2) unstable; urgency=low
 

Modified: packages/prettytable/trunk/debian/rules
===================================================================
--- packages/prettytable/trunk/debian/rules	2012-05-05 16:30:18 UTC (rev 21588)
+++ packages/prettytable/trunk/debian/rules	2012-05-05 16:58:41 UTC (rev 21589)
@@ -15,18 +15,12 @@
 			--root $(CURDIR)/debian/python-prettytable; \
 	done
 
-	# convert to Python 3
-	2to3 -w $(CURDIR)/prettytable.py
-
 	set -e ; \
 	for python in $(PY3VERS); do \
 		$$python setup.py install --no-compile -O0 --install-layout=deb \
 			--root $(CURDIR)/debian/python3-prettytable; \
 	done
 
-	# restore pristine copy after 2to3 run
-	mv $(CURDIR)/prettytable.py.bak $(CURDIR)/prettytable.py
-
 override_dh_auto_clean:
 	set -e ; \
 	for python in $(PY2VERS); do \
@@ -38,3 +32,11 @@
 	done
 	find . -name \*.pyc -exec rm {} \;
 	dh_clean
+
+override_dh_auto_test:
+ifeq ($(filter nocheck,$(DEB_BUILD_OPTIONS)),)
+	set -e ; \
+	for python in $(PY2VERS) $(PY3VERS); do \
+		$$python prettytable_test.py ; \
+	done
+endif