[Python-modules-commits] r19930 - in packages/cssutils/trunk/debian (changelog rules)

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

    Date: Sunday, January 8, 2012 @ 16:44:58
  Author: cjsmo-guest
Revision: 19930

clean up rules, update changelog

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

Modified: packages/cssutils/trunk/debian/changelog
===================================================================
--- packages/cssutils/trunk/debian/changelog	2012-01-08 16:36:10 UTC (rev 19929)
+++ packages/cssutils/trunk/debian/changelog	2012-01-08 16:44:58 UTC (rev 19930)
@@ -1,4 +1,4 @@
-cssutils (0.9.8~a3-1) UNRELEASED; urgency=low
+cssutils (0.9.8-1) UNRELEASED; urgency=low
 
   [ Jakub Wilk ]
   * Add Vcs-* fields.
@@ -43,7 +43,7 @@
     python-cssutils.prerm, python3-cssutils.postinst, python3-cssutils.prerm.
   * Added 01_setup_fix.patch to create py2 and py3 executables.
 
- -- Charlie Smotherman <cjsmo at cableone.net>  Tue, 20 Dec 2011 00:44:32 -0500
+ -- Charlie Smotherman <cjsmo at cableone.net>  Sun, 08 Jan 2012 09:50:28 -0500
 
 cssutils (0.9.8~a1-1) unstable; urgency=low
 

Modified: packages/cssutils/trunk/debian/rules
===================================================================
--- packages/cssutils/trunk/debian/rules	2012-01-08 16:36:10 UTC (rev 19929)
+++ packages/cssutils/trunk/debian/rules	2012-01-08 16:44:58 UTC (rev 19930)
@@ -1,9 +1,12 @@
 #!/usr/bin/make -f
 
 #get our python versions
-PYVERS  := $(shell pyversions -r)
-PY3VERS := $(shell py3versions -r)
+PYVERS   := $(shell pyversions -r)
+PY3VERS  := $(shell py3versions -r)
 
+DESTDIR2 := $(CURDIR)/debian/python-cssutils
+DESTDIR3 := $(CURDIR)/debian/python3-cssutils
+
 %:
 	dh $@ --with python2,python3
 
@@ -16,32 +19,34 @@
 override_dh_auto_test:
 	set -e; \
 	for py in $(PYVERS); do \
-		nosetests -v; \
+		python setup.py nosetests; \
 	done
+	#unable to run py3 unittests, there is not a py3-nose package available to
+	#run tests with.
 
 override_dh_auto_install:
 	set -e; \
 	for py in $(PYVERS); do \
 		$$py setup.py install --skip-build --root debian/python-cssutils \
 			--install-layout deb; \
-		mv $(CURDIR)/debian/python-cssutils/usr/lib/$$py/dist-packages/tests \
-		   $(CURDIR)/debian/python-cssutils/usr/lib/$$py/dist-packages/cssutils_tests; \
+		mv $(DESTDIR2)/usr/lib/$$py/dist-packages/tests \
+		   $(DESTDIR2)/usr/lib/$$py/dist-packages/cssutils_tests; \
 	done
 	#remove py3 executables from py2 package
-	rm $(CURDIR)/debian/python-cssutils/usr/bin/cssparse_py3
-	rm $(CURDIR)/debian/python-cssutils/usr/bin/csscombine_py3
-	rm $(CURDIR)/debian/python-cssutils/usr/bin/csscapture_py3
+	rm $(DESTDIR2)/usr/bin/cssparse_py3
+	rm $(DESTDIR2)/usr/bin/csscombine_py3
+	rm $(DESTDIR2)/usr/bin/csscapture_py3
 	set -e; \
 	for py in $(PY3VERS); do \
 		$$py setup.py install --skip-build --root debian/python3-cssutils \
 			--install-layout deb; \
-		mv $(CURDIR)/debian/python3-cssutils/usr/lib/python3/dist-packages/tests \
-		   $(CURDIR)/debian/python3-cssutils/usr/lib/python3/dist-packages/cssutils_tests; \
+		mv $(DESTDIR3)/usr/lib/python3/dist-packages/tests \
+		   $(DESTDIR3)/usr/lib/python3/dist-packages/cssutils_tests; \
 	done
 	#remove py2 executables from py3 package
-	rm $(CURDIR)/debian/python3-cssutils/usr/bin/cssparse_py2
-	rm $(CURDIR)/debian/python3-cssutils/usr/bin/csscombine_py2
-	rm $(CURDIR)/debian/python3-cssutils/usr/bin/csscapture_py2
+	rm $(DESTDIR3)/usr/bin/cssparse_py2
+	rm $(DESTDIR3)/usr/bin/csscombine_py2
+	rm $(DESTDIR3)/usr/bin/csscapture_py2
 
 override_dh_installman:
 	cp debian/man/cssparse.manpage1 debian/man/cssparse_py2.1