[Python-modules-commits] r11017 - in packages/python-django/branches/experimental/debian (3 files)

[lamby at users.alioth.debian.org]

    Date: Wednesday, January 6, 2010 @ 15:30:56
  Author: lamby
Revision: 11017

Remove "05_ftbfs_in_november.diff" - applied upstream.

Modified:
  packages/python-django/branches/experimental/debian/changelog
  packages/python-django/branches/experimental/debian/patches/series
Deleted:
  packages/python-django/branches/experimental/debian/patches/05_ftbfs_in_november.diff

Modified: packages/python-django/branches/experimental/debian/changelog
===================================================================
--- packages/python-django/branches/experimental/debian/changelog	2010-01-06 15:30:40 UTC (rev 11016)
+++ packages/python-django/branches/experimental/debian/changelog	2010-01-06 15:30:56 UTC (rev 11017)
@@ -11,6 +11,7 @@
   * Update "01_disable_url_verify_regression_tests.diff" - tests now use the
     unittest module instead of doctests.
   * Update "02-embedded_code_copies.diff".
+  * Remove "05_ftbfs_in_november.diff" - applied upstream.
 
  -- Chris Lamb <lamby at debian.org>  Wed, 06 Jan 2010 11:21:56 +0000
 

Deleted: packages/python-django/branches/experimental/debian/patches/05_ftbfs_in_november.diff
===================================================================
--- packages/python-django/branches/experimental/debian/patches/05_ftbfs_in_november.diff	2010-01-06 15:30:40 UTC (rev 11016)
+++ packages/python-django/branches/experimental/debian/patches/05_ftbfs_in_november.diff	2010-01-06 15:30:56 UTC (rev 11017)
@@ -1,13 +0,0 @@
-Forwarded-Upstream: http://code.djangoproject.com/changeset/11697
-Comment:
- Fix FTBFS in November.
-
---- ./tests/regressiontests/views/tests/generic/date_based.py (revision 10556)
-+++ ./tests/regressiontests/views/tests/generic/date_based.py (revision 11697)
-@@ -101,5 +101,5 @@
-         now = datetime.now()
-         prev_month = now.date().replace(day=1)
--        if prev_month.month == 11:
-+        if prev_month.month == 1:
-             prev_month = prev_month.replace(year=prev_month.year-1, month=12)
-         else:

Modified: packages/python-django/branches/experimental/debian/patches/series
===================================================================
--- packages/python-django/branches/experimental/debian/patches/series	2010-01-06 15:30:40 UTC (rev 11016)
+++ packages/python-django/branches/experimental/debian/patches/series	2010-01-06 15:30:56 UTC (rev 11017)
@@ -2,5 +2,4 @@
 02-embedded_code_copies.diff
 03_manpage.diff
 04_hyphen-manpage.diff
-05_ftbfs_in_november.diff
 06_python_2.6.3_regression.diff