[Python-modules-commits] r13810 - in packages/python-django-tinymce/trunk/debian (6 files)

[jwilk at users.alioth.debian.org]

    Date: Tuesday, July 6, 2010 @ 20:04:28
  Author: jwilk
Revision: 13810

* Switch to source format 3.0 (quilt).
* Fix watch file.
* Add patch to fix import error with Django 1.2 (closes: #587073).

Added:
  packages/python-django-tinymce/trunk/debian/patches/
  packages/python-django-tinymce/trunk/debian/patches/series
  packages/python-django-tinymce/trunk/debian/patches/smart_unicode-import.diff
Modified:
  packages/python-django-tinymce/trunk/debian/changelog
  packages/python-django-tinymce/trunk/debian/source/format
  packages/python-django-tinymce/trunk/debian/watch

Modified: packages/python-django-tinymce/trunk/debian/changelog
===================================================================
--- packages/python-django-tinymce/trunk/debian/changelog	2010-07-06 19:55:02 UTC (rev 13809)
+++ packages/python-django-tinymce/trunk/debian/changelog	2010-07-06 20:04:28 UTC (rev 13810)
@@ -1,3 +1,13 @@
+python-django-tinymce (1.5-3) UNRELEASED; urgency=low
+
+  [ Jakub Wilk ]
+  * Switch to source format 3.0 (quilt).
+  * Fix watch file.
+  * Add patch to fix import error with Django 1.2 (closes: #587073). Thanks to
+    Ionut Ciocirlan for the bug report.
+
+ -- Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>  Tue, 06 Jul 2010 21:48:53 +0200
+
 python-django-tinymce (1.5-2) unstable; urgency=low
 
   * Change priority from 'optional' to 'extra', as the package conflicts with

Added: packages/python-django-tinymce/trunk/debian/patches/series
===================================================================
--- packages/python-django-tinymce/trunk/debian/patches/series	                        (rev 0)
+++ packages/python-django-tinymce/trunk/debian/patches/series	2010-07-06 20:04:28 UTC (rev 13810)
@@ -0,0 +1 @@
+smart_unicode-import.diff

Added: packages/python-django-tinymce/trunk/debian/patches/smart_unicode-import.diff
===================================================================
--- packages/python-django-tinymce/trunk/debian/patches/smart_unicode-import.diff	                        (rev 0)
+++ packages/python-django-tinymce/trunk/debian/patches/smart_unicode-import.diff	2010-07-06 20:04:28 UTC (rev 13810)
@@ -0,0 +1,19 @@
+Description: Fix import error with Django 1.2.
+Bug: http://code.google.com/p/django-tinymce/issues/detail?id=63
+Bug-Debian: http://bugs.debian.org/587073
+Origin: upstream, http://code.google.com/p/django-tinymce/source/detail?r=96
+
+--- a/tinymce/widgets.py
++++ b/tinymce/widgets.py
+@@ -11,7 +11,10 @@
+ from django.contrib.admin import widgets as admin_widgets
+ from django.core.urlresolvers import reverse
+ from django.forms.widgets import flatatt
+-from django.forms.util import smart_unicode
++try:
++    from django.utils.encoding import smart_unicode
++except ImportError:
++    from django.forms.util import smart_unicode
+ from django.utils.html import escape
+ from django.utils import simplejson
+ from django.utils.datastructures import SortedDict

Modified: packages/python-django-tinymce/trunk/debian/source/format
===================================================================
--- packages/python-django-tinymce/trunk/debian/source/format	2010-07-06 19:55:02 UTC (rev 13809)
+++ packages/python-django-tinymce/trunk/debian/source/format	2010-07-06 20:04:28 UTC (rev 13810)
@@ -1 +1 @@
-1.0
+3.0 (quilt)

Modified: packages/python-django-tinymce/trunk/debian/watch
===================================================================
--- packages/python-django-tinymce/trunk/debian/watch	2010-07-06 19:55:02 UTC (rev 13809)
+++ packages/python-django-tinymce/trunk/debian/watch	2010-07-06 20:04:28 UTC (rev 13810)
@@ -1,3 +1,5 @@
 version=3
-http://code.google.com/p/django-tinymce/downloads/list \
-http://django-tinymce.googlecode.com/files/django-tinymce-(.*).tar.gz
+opts=\
+downloadurlmangle=s|.*[?]name=(.*?)&.*|http://django-tinymce.googlecode.com/files/$1|,\
+filenamemangle=s|[^/]+[?]name=(.*?)&.*|$1| \
+http://code.google.com/p/django-tinymce/downloads/detail[?]name=django-tinymce-([0-9.]+).tar.gz&.*