[Python-modules-commits] r22481 - in packages/python-django/trunk/debian (4 files)

Thu Aug 2 08:51:37 UTC 2012

Date: Thursday, August 2, 2012 @ 08:51:36
  Author: hertzog
Revision: 22481

* New upstream security and maintenance release. Closes: #683364
* Drop 01_disable_broken_test.diff and 04_hyphen-manpage.diff which
  have been merged upstream.

Modified:
  packages/python-django/trunk/debian/changelog
  packages/python-django/trunk/debian/patches/series
Deleted:
  packages/python-django/trunk/debian/patches/01_disable_broken_test.diff
  packages/python-django/trunk/debian/patches/04_hyphen-manpage.diff

Modified: packages/python-django/trunk/debian/changelog
===================================================================

--- packages/python-django/trunk/debian/changelog	2012-08-01 20:02:01 UTC (rev 22480)
+++ packages/python-django/trunk/debian/changelog	2012-08-02 08:51:36 UTC (rev 22481)
@@ -1,3 +1,11 @@
+python-django (1.4.1-1) unstable; urgency=low
+
+  * New upstream security and maintenance release. Closes: #683364
+  * Drop 01_disable_broken_test.diff and 04_hyphen-manpage.diff which
+    have been merged upstream.
+
+ -- RaphaÃ«l Hertzog <hertzog at debian.org>  Thu, 02 Aug 2012 10:44:02 +0200
+
 python-django (1.4-1) unstable; urgency=low
 
   * New upstream release. Closes: #666003

Deleted: packages/python-django/trunk/debian/patches/01_disable_broken_test.diff
===================================================================
--- packages/python-django/trunk/debian/patches/01_disable_broken_test.diff	2012-08-01 20:02:01 UTC (rev 22480)
+++ packages/python-django/trunk/debian/patches/01_disable_broken_test.diff	2012-08-02 08:51:36 UTC (rev 22481)
@@ -1,26 +0,0 @@
-Description: Disable non working test
- The HTMLParser in recent Python versions accepts "<!--" which used
- to be rejected up to now. The test suite ensure that HTMLParser
- rejected those and is thus currently broken.
- .
- Until we have a proper upstream fix, we just disable the non-working
- test.
-Author: RaphaÃ«l Hertzog <hertzog at debian.org>
-Bug: https://code.djangoproject.com/ticket/18027
-Forwarded: not-needed
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/tests/regressiontests/test_utils/tests.py
-+++ b/tests/regressiontests/test_utils/tests.py
-@@ -422,8 +422,9 @@ class HTMLEqualTests(TestCase):
-             self.assertHTMLEqual('', '<p>')
-         with self.assertRaises(HTMLParseError):
-             parse_html('</p>')
--        with self.assertRaises(HTMLParseError):
--            parse_html('<!--')
-+        # Disabled because it does not work as expected with Python >= 2.7.3
-+        #with self.assertRaises(HTMLParseError):
-+        #    parse_html('<!--')
- 
-     def test_contains_html(self):
-         response = HttpResponse('''<body>

Deleted: packages/python-django/trunk/debian/patches/04_hyphen-manpage.diff
===================================================================
--- packages/python-django/trunk/debian/patches/04_hyphen-manpage.diff	2012-08-01 20:02:01 UTC (rev 22480)
+++ packages/python-django/trunk/debian/patches/04_hyphen-manpage.diff	2012-08-02 08:51:36 UTC (rev 22481)
@@ -1,18 +0,0 @@
-Description: Properly escape a dash in the django-admin manual page
- Fix a lintian I: message about improper usage of minus instead
- of hyphen.
- .
- This should be forwarded upstream.
-Author: Raphael Hertzog <hertzog at debian.org>
-
---- a/docs/man/django-admin.1
-+++ b/docs/man/django-admin.1
-@@ -194,7 +194,7 @@ The domain of the message files (default
- .TP
- .I \-e, \-\-extension=EXTENSION
- The file extension(s) to examine (separate multiple
--extensions with commas, or use -e multiple times) (makemessages command).
-+extensions with commas, or use \-e multiple times) (makemessages command).
- .TP
- .I \-s, \-\-symlinks
- Follows symlinks to directories when examining source code and templates for

Modified: packages/python-django/trunk/debian/patches/series
===================================================================
--- packages/python-django/trunk/debian/patches/series	2012-08-01 20:02:01 UTC (rev 22480)
+++ packages/python-django/trunk/debian/patches/series	2012-08-02 08:51:36 UTC (rev 22481)
@@ -1,5 +1,3 @@
-01_disable_broken_test.diff
 02_disable-sources-in-sphinxdoc.diff
 03_manpage.diff
-04_hyphen-manpage.diff
 06_use_debian_geoip_database_as_default.diff


