[Python-modules-commits] r19486 - in packages/cssutils/trunk/debian (control rules)

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

    Date: Thursday, December 1, 2011 @ 04:57:05
  Author: cjsmo-guest
Revision: 19486

add breaks, do tests to build dir

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

Modified: packages/cssutils/trunk/debian/control
===================================================================
--- packages/cssutils/trunk/debian/control	2011-12-01 01:45:47 UTC (rev 19485)
+++ packages/cssutils/trunk/debian/control	2011-12-01 04:57:05 UTC (rev 19486)
@@ -25,6 +25,7 @@
          ${python:Depends},
          python-pkg-resources
 Replaces: python-encutils, python-cssutils-doc
+Breaks: python-encutils, python-cssutils-doc
 Provides: python-encutils
 Description: CSS Cascading Style Sheets parser and builder
  Package to parse and build CSS Cascading Style Sheets. DOM only, not any
@@ -45,6 +46,7 @@
 Depends: ${misc:Depends},
          ${python3:Depends},
          python3-pkg-resources
+Breaks: python-encutils, python-cssutils-doc
 Description: Python3 CSS Cascading Style Sheets parser and builder
  Python3 package to parse and build CSS Cascading Style Sheets. DOM only, not
  any rendering facilities! Base upon and partly implements the following

Modified: packages/cssutils/trunk/debian/rules
===================================================================
--- packages/cssutils/trunk/debian/rules	2011-12-01 01:45:47 UTC (rev 19485)
+++ packages/cssutils/trunk/debian/rules	2011-12-01 04:57:05 UTC (rev 19486)
@@ -3,7 +3,6 @@
 #get our python versions
 PYVERS    := $(shell pyversions -r)
 PY3VERS   := $(shell py3versions -r)
-T_DIR     := $(CURDIR)/debian/python-cssutils/usr/lib
 
 %:
 	dh $@ --with python2,python3
@@ -14,11 +13,33 @@
 		$$py setup.py build; \
 	done
 
+override_dh_auto_test:
+	#run py2 tests, unable to run py3 tests, a py3-nose package is not 
+	#available (yet).
+	set -e; \
+	for py in $(PYVERS); do \
+		nosetests --verbosity=2 -w $(CURDIR)/build/lib.*/tests \
+		basetest.py test_codec.py test_csscharsetrule.py \
+		test_csscomment.py test_cssfontfacerule.py test_cssimportrule.py \
+		test_cssnamespacerule.py test_csspagerule.py test_cssproperties.py \
+		test_cssrule.py test_cssrulelist.py test_cssstyledeclaration.py \
+		test_cssstylerule.py test_cssstylesheet.py test_cssunknownrule.py \
+		test_cssutilsimport.py test_cssvalue.py test_cssvariablesdeclaration.py \
+		test_cssvariablesrule.py test_domimplementation.py test_errorhandler.py \
+		test_helper.py test_cssmediarule.py test_medialist.py test_mediaquery.py \
+		test_parse.py test_prodparser.py test_profiles.py test_properties.py \
+		test_property.py test_selector.py test_selectorlist.py test_serialize.py \
+		test_settings.py test_stylesheet.py test_tokenize2.py test_util.py \
+		test_value.py test_x.py test_encutils/__init__.py; \
+	done
+
 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; \
 	done
 	#remove py3 executables from py2 package
 	rm $(CURDIR)/debian/python-cssutils/usr/bin/cssparse_py3
@@ -33,27 +54,6 @@
 	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
-	#do tests for py2 package. Unable to run tests for py3 package, py3-nose
-	#package is not available (yet). Not running test_script_csscombine and
-	#test_cssutils.py.
-	set -e; \
-	for py in $(PYVERS); do \
-		mv $(CURDIR)/debian/python-cssutils/usr/lib/$$py/dist-packages/tests \
-		   $(CURDIR)/debian/python-cssutils/usr/lib/$$py/dist-packages/cssutils_tests; \
-		nosetests --verbosity=2 -w $(T_DIR)/$$py/dist-packages/cssutils_tests \
-		basetest.py test_codec.py test_csscharsetrule.py \
-		test_csscomment.py test_cssfontfacerule.py test_cssimportrule.py \
-		test_cssnamespacerule.py test_csspagerule.py test_cssproperties.py \
-		test_cssrule.py test_cssrulelist.py test_cssstyledeclaration.py \
-		test_cssstylerule.py test_cssstylesheet.py test_cssunknownrule.py \
-		test_cssutilsimport.py test_cssvalue.py test_cssvariablesdeclaration.py \
-		test_cssvariablesrule.py test_domimplementation.py test_errorhandler.py \
-		test_helper.py test_cssmediarule.py test_medialist.py test_mediaquery.py \
-		test_parse.py test_prodparser.py test_profiles.py test_properties.py \
-		test_property.py test_selector.py test_selectorlist.py test_serialize.py \
-		test_settings.py test_stylesheet.py test_tokenize2.py test_util.py \
-		test_value.py test_x.py test_encutils/__init__.py; \
-	done
 
 override_dh_installman:
 	cp debian/man/cssparse.manpage1 debian/man/cssparse_py2.1