[Python-modules-commits] r29288 - in packages/python-werkzeug/trunk/debian (5 files)

[piotr at users.alioth.debian.org]

    Date: Tuesday, June 10, 2014 @ 20:15:24
  Author: piotr
Revision: 29288

* New upstream release
* Remove b23efe87 patch (no longer needed)
* Add 13218dea patch to fix tests on Python 3.4 (closes: 745852)
* Add maxsize fix for Python 3 (backported 0bad0c25 commit)
* Hardcode LC_ALL to C.UTF-8 while invoking tests to workaround pbuilder's
  ancient defaults (closes: 739077)

Modified:
  packages/python-werkzeug/trunk/debian/changelog
  packages/python-werkzeug/trunk/debian/patches/drop_ubuntu_font.patch
  packages/python-werkzeug/trunk/debian/patches/series
  packages/python-werkzeug/trunk/debian/rules
Deleted:
  packages/python-werkzeug/trunk/debian/patches/b23efe87.patch

Modified: packages/python-werkzeug/trunk/debian/changelog
===================================================================
--- packages/python-werkzeug/trunk/debian/changelog	2014-06-10 19:20:50 UTC (rev 29287)
+++ packages/python-werkzeug/trunk/debian/changelog	2014-06-10 20:15:24 UTC (rev 29288)
@@ -1,3 +1,22 @@
+python-werkzeug (0.9.6+dfsg-1) unstable; urgency=medium
+
+  * New upstream release
+  * Remove b23efe87 patch (no longer needed)
+  * Add 13218dea patch to fix tests on Python 3.4 (closes: 745852)
+  * Add maxsize fix for Python 3 (backported 0bad0c25 commit)
+  * Hardcode LC_ALL to C.UTF-8 while invoking tests to workaround pbuilder's
+    ancient defaults (closes: 739077)
+
+ -- Piotr Ożarowski <piotr at debian.org>  Tue, 10 Jun 2014 20:47:05 +0200
+
+python-werkzeug (0.9.4+dfsg-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Start memcached for tests, thanks to Sebastian Ramacher for the patch
+    (Closes: #725594)
+
+ -- Gaudenz Steinlin <gaudenz at debian.org>  Mon, 06 Jan 2014 19:01:32 +0100
+
 python-werkzeug (0.9.4+dfsg-1) unstable; urgency=low
 
   * New upstream release

Deleted: packages/python-werkzeug/trunk/debian/patches/b23efe87.patch
===================================================================
--- packages/python-werkzeug/trunk/debian/patches/b23efe87.patch	2014-06-10 19:20:50 UTC (rev 29287)
+++ packages/python-werkzeug/trunk/debian/patches/b23efe87.patch	2014-06-10 20:15:24 UTC (rev 29288)
@@ -1,19 +0,0 @@
-commit b23efe879bbab6e992172df0a101b576bc5b2ea6
-Author: Armin Ronacher <armin.ronacher at active-4.com>
-Date:   Wed Sep 4 23:12:50 2013 +0600
-
-    Fixed a failing test on 3.3
-
-diff --git a/werkzeug/testsuite/urls.py b/werkzeug/testsuite/urls.py
-index c63c577..b333e1b 100644
---- a/werkzeug/testsuite/urls.py
-+++ b/werkzeug/testsuite/urls.py
-@@ -146,7 +146,7 @@ class URLsTestCase(WerkzeugTestCase):
-                           'http://xn--f-1gaa.com:8080/bam/baz')
- 
-     def test_iri_safe_quoting(self):
--        uri = b'http://xn--f-1gaa.com/%2F%25?q=%C3%B6&x=%3D%25#%25'
-+        uri = 'http://xn--f-1gaa.com/%2F%25?q=%C3%B6&x=%3D%25#%25'
-         iri = u'http://föö.com/%2F%25?q=ö&x=%3D%25#%25'
-         self.assert_strict_equal(urls.uri_to_iri(uri), iri)
-         self.assert_strict_equal(urls.iri_to_uri(urls.uri_to_iri(uri)), uri)

Modified: packages/python-werkzeug/trunk/debian/patches/drop_ubuntu_font.patch
===================================================================
--- packages/python-werkzeug/trunk/debian/patches/drop_ubuntu_font.patch	2014-06-10 19:20:50 UTC (rev 29287)
+++ packages/python-werkzeug/trunk/debian/patches/drop_ubuntu_font.patch	2014-06-10 20:15:24 UTC (rev 29288)
@@ -1,8 +1,8 @@
 # ubuntu.ttf has been removed from Debian package
-Index: python-werkzeug-0.8.1/werkzeug/debug/shared/style.css
+Index: werkzeug-0.9.6/werkzeug/debug/shared/style.css
 ===================================================================
---- python-werkzeug-0.8.1.orig/werkzeug/debug/shared/style.css
-+++ python-werkzeug-0.8.1/werkzeug/debug/shared/style.css
+--- werkzeug-0.9.6.orig/werkzeug/debug/shared/style.css
++++ werkzeug-0.9.6/werkzeug/debug/shared/style.css
 @@ -1,9 +1,7 @@
  @font-face {
 -  font-family: 'Ubuntu';

Modified: packages/python-werkzeug/trunk/debian/patches/series
===================================================================
--- packages/python-werkzeug/trunk/debian/patches/series	2014-06-10 19:20:50 UTC (rev 29287)
+++ packages/python-werkzeug/trunk/debian/patches/series	2014-06-10 20:15:24 UTC (rev 29288)
@@ -1,2 +1,3 @@
 drop_ubuntu_font.patch
-b23efe87.patch
+13218de4.patch
+0bad0c25.patch

Modified: packages/python-werkzeug/trunk/debian/rules
===================================================================
--- packages/python-werkzeug/trunk/debian/rules	2014-06-10 19:20:50 UTC (rev 29287)
+++ packages/python-werkzeug/trunk/debian/rules	2014-06-10 20:15:24 UTC (rev 29288)
@@ -19,7 +19,10 @@
 	dh_auto_clean
 
 override_dh_auto_test:
-	http_proxy='' dh_auto_test
+	set -ex; \
+		memcached -p 11211 -l 127.0.0.1 & \
+		trap "kill $$! || true" EXIT; \
+		http_proxy='' LC_ALL=C.UTF-8 dh_auto_test; \
 
 override_dh_auto_install:
 	dh_auto_install