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

hertzog at users.alioth.debian.org hertzog at users.alioth.debian.org
Fri Dec 31 13:47:38 UTC 2010 

    Date: Friday, December 31, 2010 @ 13:47:36
  Author: hertzog
Revision: 15221

* New bugfix-only upstream release. It includes security fixes.
* Drop patches merged upstream:
  - debian/patches/05_fix_regression_tests.diff
  - debian/patches/06_fix_regression_tests.diff
* Drop debian/patches/01_disable_url_verify_regression_tests.diff as it's no
  longer needed (the failing test has been removed upstream).
* Update 03_manpage.diff and 04_hyphen-manpage.diff to cope with changes in
  the manual page.

Modified:
  packages/python-django/trunk/debian/changelog
  packages/python-django/trunk/debian/patches/03_manpage.diff
  packages/python-django/trunk/debian/patches/04_hyphen-manpage.diff
  packages/python-django/trunk/debian/patches/series
Deleted:
  packages/python-django/trunk/debian/patches/01_disable_url_verify_regression_tests.diff
  packages/python-django/trunk/debian/patches/05_fix_regression_tests.diff
  packages/python-django/trunk/debian/patches/06_fix_regression_tests.diff

Modified: packages/python-django/trunk/debian/changelog
===================================================================
--- packages/python-django/trunk/debian/changelog	2010-12-31 10:43:11 UTC (rev 15220)
+++ packages/python-django/trunk/debian/changelog	2010-12-31 13:47:36 UTC (rev 15221)
@@ -1,7 +1,14 @@
 python-django (1.2.4-1) unstable; urgency=high
 
-  * New upstream release with security fixes only.
+  * New bugfix-only upstream release. It includes security fixes.
     http://www.djangoproject.com/weblog/2010/dec/22/security/
+  * Drop patches merged upstream:
+    - debian/patches/05_fix_regression_tests.diff
+    - debian/patches/06_fix_regression_tests.diff
+  * Drop debian/patches/01_disable_url_verify_regression_tests.diff as it's no
+    longer needed (the failing test has been removed upstream).
+  * Update 03_manpage.diff and 04_hyphen-manpage.diff to cope with changes in
+    the manual page.
 
  -- Raphaël Hertzog <hertzog at debian.org>  Fri, 31 Dec 2010 11:40:28 +0100
 

Deleted: packages/python-django/trunk/debian/patches/01_disable_url_verify_regression_tests.diff
===================================================================
--- packages/python-django/trunk/debian/patches/01_disable_url_verify_regression_tests.diff	2010-12-31 10:43:11 UTC (rev 15220)
+++ packages/python-django/trunk/debian/patches/01_disable_url_verify_regression_tests.diff	2010-12-31 13:47:36 UTC (rev 15221)
@@ -1,44 +0,0 @@
-Forwarded-Upstream: not needed
-Author: Chris Lamb <lamby at debian.org>
-Comment:
- Disable regression tests that require an internet connection.
- .
- This is a Debian specific patch.
-
-diff -urNad Django-1.2-rc-1.orig/tests/regressiontests/forms/fields.py Django-1.2-rc-1/tests/regressiontests/forms/fields.py
---- Django-1.2-rc-1.orig/tests/regressiontests/forms/fields.py	2010-05-06 08:39:00.000000000 +0100
-+++ Django-1.2-rc-1/tests/regressiontests/forms/fields.py	2010-05-06 08:39:41.000000000 +0100
-@@ -513,33 +513,6 @@
-         self.assertRaisesErrorWithMessage(ValidationError, "[u'Enter a valid URL.']", f.clean, 'http://example.')
-         self.assertRaisesErrorWithMessage(ValidationError, "[u'Enter a valid URL.']", f.clean, 'http://.com')
- 
--    def test_urlfield_39(self):
--        f = URLField(verify_exists=True)
--        self.assertEqual(u'http://www.google.com/', f.clean('http://www.google.com')) # This will fail if there's no Internet connection
--        self.assertRaisesErrorWithMessage(ValidationError, "[u'Enter a valid URL.']", f.clean, 'http://example')
--        self.assertRaises(ValidationError, f.clean, 'http://www.broken.djangoproject.com') # bad domain
--        try:
--            f.clean('http://www.broken.djangoproject.com') # bad domain
--        except ValidationError, e:
--            self.assertEqual("[u'This URL appears to be a broken link.']", str(e))
--        self.assertRaises(ValidationError, f.clean, 'http://google.com/we-love-microsoft.html') # good domain, bad page
--        try:
--            f.clean('http://google.com/we-love-microsoft.html') # good domain, bad page
--        except ValidationError, e:
--            self.assertEqual("[u'This URL appears to be a broken link.']", str(e))
--        # Valid and existent IDN
--        self.assertEqual(u'http://\u05e2\u05d1\u05e8\u05d9\u05ea.idn.icann.org/', f.clean(u'http://עברית.idn.icann.org/'))
--        # Valid but non-existent IDN
--        try:
--            f.clean(u'http://broken.עברית.idn.icann.org/')
--        except ValidationError, e:
--            self.assertEqual("[u'This URL appears to be a broken link.']", str(e))
--
--    def test_urlfield_40(self):
--        f = URLField(verify_exists=True, required=False)
--        self.assertEqual(u'', f.clean(''))
--        self.assertEqual(u'http://www.google.com/', f.clean('http://www.google.com')) # This will fail if there's no Internet connection
--
-     def test_urlfield_41(self):
-         f = URLField(min_length=15, max_length=20)
-         self.assertRaisesErrorWithMessage(ValidationError, "[u'Ensure this value has at least 15 characters (it has 13).']", f.clean, 'http://f.com')

Modified: packages/python-django/trunk/debian/patches/03_manpage.diff
===================================================================
--- packages/python-django/trunk/debian/patches/03_manpage.diff	2010-12-31 10:43:11 UTC (rev 15220)
+++ packages/python-django/trunk/debian/patches/03_manpage.diff	2010-12-31 13:47:36 UTC (rev 15221)
@@ -6,18 +6,17 @@
  .
  This is a Debian specific patch.
 
---- a/docs/man/django-admin.1	2007-09-08 10:47:27.516890257 +0100
-+++ b/docs/man/django-admin.1	2007-09-08 10:48:01.822845242 +0100
-@@ -1,9 +1,9 @@
+--- a/docs/man/django-admin.1
++++ b/docs/man/django-admin.1
+@@ -1,8 +1,8 @@
 -.TH "django-admin.py" "1" "March 2008" "Django Project" ""
 +.TH "django-admin" "1" "March 2008" "Django Project" ""
  .SH "NAME"
--django\-admin.py \- Utility script for the Django web framework
-+django\-admin \- Utility script for the Django web framework
+-django\-admin.py \- Utility script for the Django Web framework
++django\-admin \- Utility script for the Django Web framework
  .SH "SYNOPSIS"
 -.B django\-admin.py
 +.B django\-admin
  .I <action>
  .B [options]
  .sp
- .SH "DESCRIPTION"

Modified: packages/python-django/trunk/debian/patches/04_hyphen-manpage.diff
===================================================================
--- packages/python-django/trunk/debian/patches/04_hyphen-manpage.diff	2010-12-31 10:43:11 UTC (rev 15220)
+++ packages/python-django/trunk/debian/patches/04_hyphen-manpage.diff	2010-12-31 13:47:36 UTC (rev 15221)
@@ -4,14 +4,14 @@
  Fix a lintian I: message about improper usage of minus instead
  of hyphen.
 
---- Django-1.2-rc-1.orig/docs/man/django-admin.1	2010-05-06 08:41:22.000000000 +0100
-+++ Django-1.2-rc-1/docs/man/django-admin.1	2010-05-06 08:41:51.000000000 +0100
-@@ -153,7 +153,7 @@
+--- a/docs/man/django-admin.1
++++ b/docs/man/django-admin.1
+@@ -183,7 +183,7 @@ The domain of the message files (default
  .TP
  .I \-e, \-\-extension=EXTENSION
  The file extension(s) to examine (default: ".html", separate multiple
 -extensions with commas, or use -e multiple times).
 +extensions with commas, or use \-e multiple times).
  .TP
- .I \-e, \-\-symlinks
+ .I \-s, \-\-symlinks
  Follows symlinks to directories when examining source code and templates for

Deleted: packages/python-django/trunk/debian/patches/05_fix_regression_tests.diff
===================================================================
--- packages/python-django/trunk/debian/patches/05_fix_regression_tests.diff	2010-12-31 10:43:11 UTC (rev 15220)
+++ packages/python-django/trunk/debian/patches/05_fix_regression_tests.diff	2010-12-31 13:47:36 UTC (rev 15221)
@@ -1,39 +0,0 @@
-Description: Adjust AdminDocTests to run after r13728. Also match comments
-  to tests and add test that was there in comment form only.
-Origin: upstream, http://code.djangoproject.com/changeset/13750
-Bug: http://code.djangoproject.com/ticket/3695
---- a/tests/regressiontests/admin_views/tests.py (revision 13697)
-+++ b/tests/regressiontests/admin_views/tests.py (revision 13750)
-@@ -2207,14 +2207,17 @@
- 
-             # A builtin tag exists in both the index and detail
--            self.assertContains(response, '<h3 id="autoescape">autoescape</h3>')
--            self.assertContains(response, '<li><a href="#autoescape">autoescape</a></li>')
-+            self.assertContains(response, '<h3 id="built_in-autoescape">autoescape</h3>')
-+            self.assertContains(response, '<li><a href="#built_in-autoescape">autoescape</a></li>')
- 
-             # An app tag exists in both the index and detail
--            # The builtin tag group exists
-+            self.assertContains(response, '<h3 id="flatpages-get_flatpages">get_flatpages</h3>')
-+            self.assertContains(response, '<li><a href="#flatpages-get_flatpages">get_flatpages</a></li>')
-+
-+            # The admin list tag group exists
-             self.assertContains(response, "<h2>admin_list</h2>", count=2)
- 
--            # A builtin tag exists in both the index and detail
--            self.assertContains(response, '<h3 id="autoescape">autoescape</h3>')
--            self.assertContains(response, '<li><a href="#admin_actions">admin_actions</a></li>')
-+            # An admin list tag exists in both the index and detail
-+            self.assertContains(response, '<h3 id="admin_list-admin_actions">admin_actions</h3>')
-+            self.assertContains(response, '<li><a href="#admin_list-admin_actions">admin_actions</a></li>')
- 
-         def test_filters(self):
-@@ -2225,6 +2228,6 @@
- 
-             # A builtin filter exists in both the index and detail
--            self.assertContains(response, '<h3 id="add">add</h3>')
--            self.assertContains(response, '<li><a href="#add">add</a></li>')
-+            self.assertContains(response, '<h3 id="built_in-add">add</h3>')
-+            self.assertContains(response, '<li><a href="#built_in-add">add</a></li>')
- 
- except ImportError:

Deleted: packages/python-django/trunk/debian/patches/06_fix_regression_tests.diff
===================================================================
--- packages/python-django/trunk/debian/patches/06_fix_regression_tests.diff	2010-12-31 10:43:11 UTC (rev 15220)
+++ packages/python-django/trunk/debian/patches/06_fix_regression_tests.diff	2010-12-31 13:47:36 UTC (rev 15221)
@@ -1,16 +0,0 @@
-Description: A second part of patch to update AdminDocsTest to fix test suite.
-Source: upstream, http://code.djangoproject.com/changeset/13764
-
-Index: /django/branches/releases/1.2.X/tests/regressiontests/admin_views/tests.py
-===================================================================
---- a/tests/regressiontests/admin_views/tests.py (revision 13750)
-+++ b/tests/regressiontests/admin_views/tests.py (revision 13764)
-@@ -2211,6 +2211,6 @@
- 
-             # An app tag exists in both the index and detail
--            self.assertContains(response, '<h3 id="flatpages-get_flatpages">get_flatpages</h3>')
--            self.assertContains(response, '<li><a href="#flatpages-get_flatpages">get_flatpages</a></li>')
-+            self.assertContains(response, '<h3 id="comments-get_comment_count">get_comment_count</h3>')
-+            self.assertContains(response, '<li><a href="#comments-get_comment_count">get_comment_count</a></li>')
- 
-             # The admin list tag group exists

Modified: packages/python-django/trunk/debian/patches/series
===================================================================
--- packages/python-django/trunk/debian/patches/series	2010-12-31 10:43:11 UTC (rev 15220)
+++ packages/python-django/trunk/debian/patches/series	2010-12-31 13:47:36 UTC (rev 15221)
@@ -1,6 +1,3 @@
-01_disable_url_verify_regression_tests.diff
 03_manpage.diff
 04_hyphen-manpage.diff
-05_fix_regression_tests.diff
-06_fix_regression_tests.diff
 07_disable_url_verify_model_tests.diff

More information about the Python-modules-commits mailing list