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

[lamby at users.alioth.debian.org]

    Date: Wednesday, January 6, 2010 @ 15:31:03
  Author: lamby
Revision: 11018

Remove "06_python_2.6.3_regression.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/06_python_2.6.3_regression.diff

Modified: packages/python-django/branches/experimental/debian/changelog
===================================================================
--- packages/python-django/branches/experimental/debian/changelog	2010-01-06 15:30:56 UTC (rev 11017)
+++ packages/python-django/branches/experimental/debian/changelog	2010-01-06 15:31:03 UTC (rev 11018)
@@ -12,6 +12,7 @@
     unittest module instead of doctests.
   * Update "02-embedded_code_copies.diff".
   * Remove "05_ftbfs_in_november.diff" - applied upstream.
+  * Remove "06_python_2.6.3_regression.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/06_python_2.6.3_regression.diff
===================================================================
--- packages/python-django/branches/experimental/debian/patches/06_python_2.6.3_regression.diff	2010-01-06 15:30:56 UTC (rev 11017)
+++ packages/python-django/branches/experimental/debian/patches/06_python_2.6.3_regression.diff	2010-01-06 15:31:03 UTC (rev 11018)
@@ -1,14 +0,0 @@
-Forwarded-Upstream: http://code.djangoproject.com/changeset/11619
-Comment:
- Fix FTBFS under Python 2.6.3; int(Decimal('nan')) raises ValueError instead
- of returning None.
-
---- ./django/template/defaultfilters.py (revision 10543)
-+++ ./django/template/defaultfilters.py (revision 11619)
-@@ -163,5 +163,5 @@
-     try:
-         m = int(d) - d
--    except (OverflowError, InvalidOperation):
-+    except (ValueError, OverflowError, InvalidOperation):
-         return input_val
- 

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