[Python-modules-commits] r25891 - in packages/cssutils/trunk/debian (6 files)

cjsmo-guest at users.alioth.debian.org cjsmo-guest at users.alioth.debian.org
Wed Sep 18 04:46:26 UTC 2013 

    Date: Wednesday, September 18, 2013 @ 04:46:21
  Author: cjsmo-guest
Revision: 25891

New upsteam release

Added:
  packages/cssutils/trunk/debian/patches/disable_test.patch
Modified:
  packages/cssutils/trunk/debian/changelog
  packages/cssutils/trunk/debian/patches/series
  packages/cssutils/trunk/debian/rules
Deleted:
  packages/cssutils/trunk/debian/patches/02_disable_wrong_tests.patch
  packages/cssutils/trunk/debian/python3-cssutils.examples

Modified: packages/cssutils/trunk/debian/changelog
===================================================================
--- packages/cssutils/trunk/debian/changelog	2013-09-17 21:19:24 UTC (rev 25890)
+++ packages/cssutils/trunk/debian/changelog	2013-09-18 04:46:21 UTC (rev 25891)
@@ -1,3 +1,15 @@
+cssutils (0.9.10-1) unstable; urgency=low
+
+  * New upstream release.
+  * Removed debian/python3-cssutils.examples.  Closes: #712150
+  * Updated debian/rules to account for upstream directory changes.
+  * With upstream directory changes the test dir renameing is not needed so
+    removed from debian/rules.
+  * Reworked debian/patches/02_disable_wrong_test.patch, one test has been
+    removed by upstream.
+
+ -- Charlie Smotherman <cjsmo at cableone.net>  Mon, 16 Sep 2013 05:57:03 -0500
+
 cssutils (0.9.10~b1-2) unstable; urgency=low
 
   * Team upload.

Deleted: packages/cssutils/trunk/debian/patches/02_disable_wrong_tests.patch
===================================================================
--- packages/cssutils/trunk/debian/patches/02_disable_wrong_tests.patch	2013-09-17 21:19:24 UTC (rev 25890)
+++ packages/cssutils/trunk/debian/patches/02_disable_wrong_tests.patch	2013-09-18 04:46:21 UTC (rev 25891)
@@ -1,35 +0,0 @@
-Description: disable two tests that caused the package to FTBFS
- First one is wrong and already removed upstream:
- https://bitbucket.org/cthedot/cssutils/commits/153f6254f3/
- .
- Another one is sometimes failing with hash randomization enabled,
- see https://bitbucket.org/cthedot/cssutils/issue/30/
-Bug-Debian: http://bugs.debian.org/686340
-Last-Update: 2013-05-19
-
---- a/src/tests/test_cssstylesheet.py
-+++ b/src/tests/test_cssstylesheet.py
-@@ -333,7 +333,7 @@
-         self.assertEquals('example', s.namespaces['ex2'])
-         self.assertRaises(xml.dom.NamespaceErr, s.namespaces.__getitem__, 'UNSET')
-         # __iter__
--        self.assertEquals(['', 'ex2'], list(s.namespaces))
-+        #self.assertEquals(['', 'ex2'], list(s.namespaces))
-         # __len__
-         self.assertEqual(2, len(s.namespaces))
-         # __setitem__
---- a/src/tests/test_encutils/__init__.py
-+++ b/src/tests/test_encutils/__init__.py
-@@ -153,9 +153,9 @@
-             """<meta content="text/html;charset=ascii" http-equiv="cONTENT-type">
-                 </ >""":
-                 ('text/html', 'ascii'),
--            """</ >
--                <meta content="text/html;charset=ascii" http-equiv="cONTENT-type">""":
--                (None, None),
-+#           """</ >
-+#               <meta content="text/html;charset=ascii" http-equiv="cONTENT-type">""":
-+#               (None, None),
-             """<meta content="text/html" http-equiv="cONTENT-type">
-                 </ >
-                 <meta content="text/html;charset=ascii" http-equiv="cONTENT-type">""":

Added: packages/cssutils/trunk/debian/patches/disable_test.patch
===================================================================
--- packages/cssutils/trunk/debian/patches/disable_test.patch	                        (rev 0)
+++ packages/cssutils/trunk/debian/patches/disable_test.patch	2013-09-18 04:46:21 UTC (rev 25891)
@@ -0,0 +1,19 @@
+Description: disable test that caused the package to FTBFS
+Author: Charlie Smotherman <cjsmo at cableone.net>
+Last-Update: 2013-09-17
+
+
+
+Index: cssutils-0.9.10/src/cssutils/tests/test_cssstylesheet.py
+===================================================================
+--- cssutils-0.9.10.orig/src/cssutils/tests/test_cssstylesheet.py	2013-03-31 17:42:26.000000000 -0500
++++ cssutils-0.9.10/src/cssutils/tests/test_cssstylesheet.py	2013-09-16 07:19:18.633097907 -0500
+@@ -333,7 +333,7 @@
+         self.assertEquals('example', s.namespaces['ex2'])
+         self.assertRaises(xml.dom.NamespaceErr, s.namespaces.__getitem__, 'UNSET')
+         # __iter__
+-        self.assertEquals(['', 'ex2'], list(s.namespaces))
++#        self.assertEquals(['', 'ex2'], list(s.namespaces))
+         # __len__
+         self.assertEqual(2, len(s.namespaces))
+         # __setitem__

Modified: packages/cssutils/trunk/debian/patches/series
===================================================================
--- packages/cssutils/trunk/debian/patches/series	2013-09-17 21:19:24 UTC (rev 25890)
+++ packages/cssutils/trunk/debian/patches/series	2013-09-18 04:46:21 UTC (rev 25891)
@@ -1,2 +1,2 @@
+disable_test.patch
 01_setup_fix.patch
-02_disable_wrong_tests.patch

Deleted: packages/cssutils/trunk/debian/python3-cssutils.examples
===================================================================
--- packages/cssutils/trunk/debian/python3-cssutils.examples	2013-09-17 21:19:24 UTC (rev 25890)
+++ packages/cssutils/trunk/debian/python3-cssutils.examples	2013-09-18 04:46:21 UTC (rev 25891)
@@ -1 +0,0 @@
-examples/*

Modified: packages/cssutils/trunk/debian/rules
===================================================================
--- packages/cssutils/trunk/debian/rules	2013-09-17 21:19:24 UTC (rev 25890)
+++ packages/cssutils/trunk/debian/rules	2013-09-18 04:46:21 UTC (rev 25891)
@@ -29,7 +29,7 @@
 		          --exclude='test_cssText2' \
 		          --exclude='test_getMetaInfo' \
 	              --exclude='test_errorhandler.py' \
-		          --where $(CURDIR)/build/lib.linux-*/tests; \
+		          --where $(CURDIR)/build/lib.linux-*/cssutils/tests; \
 	done
 	set -ex; \
 	for py in $(PY3VERS); do \
@@ -40,7 +40,7 @@
 		           --exclude='test_combine' \
 		           --exclude='test_cssText2' \
 	               --exclude='test_errorhandler.py' \
-		           --py3where $(CURDIR)/build/lib/tests; \
+		           --py3where $(CURDIR)/build/lib/cssutils/tests; \
 	done
 endif
 
@@ -48,9 +48,7 @@
 	set -ex; \
 	for py in $(PYVERS); do \
 		$$py setup.py install --skip-build --root debian/python-cssutils \
-			--install-layout deb; \
-		mv $(DESTDIR2)/usr/lib/$$py/dist-packages/tests \
-		   $(DESTDIR2)/usr/lib/$$py/dist-packages/cssutils_tests; \
+			--install-layout deb; 
 	done
 	#fix our py2 shebangs
 	sed -i -e 's,#!/usr/bin/python.*,#!/usr/bin/python,' $(DESTDIR2)/usr/bin/cssparse_py2 \
@@ -62,9 +60,7 @@
 	set -ex; \
 	for py in $(PY3VERS); do \
 		$$py setup.py install --skip-build --root debian/python3-cssutils \
-			--install-layout deb; \
-		mv $(DESTDIR3)/usr/lib/python3/dist-packages/tests \
-		   $(DESTDIR3)/usr/lib/python3/dist-packages/cssutils_tests; \
+			--install-layout deb;
 	done
 	#fix our py3 shebangs
 	sed -i -e 's,#!/usr/bin/python.*,#!/usr/bin/python3,' $(DESTDIR3)/usr/bin/cssparse_py3 \

More information about the Python-modules-commits mailing list