[Python-modules-commits] r32725 - in packages/django-markupfield/tags (9 files)
fladi-guest at users.alioth.debian.org
fladi-guest at users.alioth.debian.org
Tue May 19 18:35:40 UTC 2015
Date: Tuesday, May 19, 2015 @ 18:35:39
Author: fladi-guest
Revision: 32725
[svn-buildpackage] Tagging django-markupfield 1.3.4-1
Added:
packages/django-markupfield/tags/1.3.4-1/
packages/django-markupfield/tags/1.3.4-1/debian/changelog
(from rev 32724, packages/django-markupfield/trunk/debian/changelog)
packages/django-markupfield/tags/1.3.4-1/debian/control
(from rev 32723, packages/django-markupfield/trunk/debian/control)
packages/django-markupfield/tags/1.3.4-1/debian/copyright
(from rev 32723, packages/django-markupfield/trunk/debian/copyright)
packages/django-markupfield/tags/1.3.4-1/debian/patches/django-1.7.patch
(from rev 32723, packages/django-markupfield/trunk/debian/patches/django-1.7.patch)
Deleted:
packages/django-markupfield/tags/1.3.4-1/debian/changelog
packages/django-markupfield/tags/1.3.4-1/debian/control
packages/django-markupfield/tags/1.3.4-1/debian/copyright
packages/django-markupfield/tags/1.3.4-1/debian/patches/django-1.7.patch
Deleted: packages/django-markupfield/tags/1.3.4-1/debian/changelog
===================================================================
--- packages/django-markupfield/trunk/debian/changelog 2015-05-19 18:16:25 UTC (rev 32722)
+++ packages/django-markupfield/tags/1.3.4-1/debian/changelog 2015-05-19 18:35:39 UTC (rev 32725)
@@ -1,121 +0,0 @@
-django-markupfield (1.3.2-1) unstable; urgency=high
-
- [ Paul Tagliamonte ]
- * Team Upload
- * New upstream release solves CVE-2015-0846, thanks to James P. Turk.
-
- [ Michael Fladischer ]
- * New upstream release.
- * Use pypi.debian.net service for uscan.
- * Bump Standards-Version to 3.9.6.
-
- -- Paul Tagliamonte <paultag at debian.org> Sun, 19 Apr 2015 17:03:24 -0400
-
-django-markupfield (1.2.1-2) unstable; urgency=low
-
- * Switch buildsystem to pybuild.
- * Drop versioned dependency on python-django on binary package too as there
- are no prior versions in the archive.
-
- -- Michael Fladischer <FladischerMichael at fladi.at> Thu, 28 Aug 2014 13:19:47 +0200
-
-django-markupfield (1.2.1-1) unstable; urgency=medium
-
- * New upstream release.
- * Add support for Python 3.
- * Add lintian-override for missing PGP signature on upstream tarball.
- * Add django-1.7.patch to fix tests with Django 1.7c3 (Closes: #755640).
- * Drop versioned dependency on python-django as there are no prior versions
- in the archive.
- * Add python-setuptools to Build-Depends as they are now used in setup.py.
-
- -- Michael Fladischer <FladischerMichael at fladi.at> Wed, 27 Aug 2014 13:59:26 +0200
-
-django-markupfield (1.2.0-1) unstable; urgency=low
-
- * New upstream release.
- * Switch to dh_python2.
- * Build-Depends on dh-python.
- * Relax Build-Depends on debhelper to >= 8.1.0~.
- * Bump Standards version to 3.9.5.
- * Drop our own version of settings.py and use the one supplied by
- upstream for running unit tests.
- * Drop XS-Python-Version and add X-Python-Version.
-
- -- Michael Fladischer <FladischerMichael at fladi.at> Mon, 16 Dec 2013 13:22:52 +0100
-
-django-markupfield (1.1.1-2) unstable; urgency=low
-
- * Team upload.
- * debian/settings.py: Set SECRET_KEY which is required by Django 1.5. Thanks
- to Andrey Rahmatullin for the analysis. (Closes: #709130)
-
- -- Sebastian Ramacher <sramacher at debian.org> Fri, 24 May 2013 13:37:42 +0200
-
-django-markupfield (1.1.1-1) unstable; urgency=low
-
- [ Michael Fladischer ]
- * New upstream release.
- * Bump python version to >= 2.6.
- * Bump Depends/Build-Depends on python-django to >= 1.4.2 because of
- django.utils.six.
- * Bump Standards version to 3.9.4.
- Change Build-Depends on debhelper to >= 8.1.0 to satisfy build-arch and
- build-indep targets.
- * Drop temporary fix for PKG-INFO.
- * Rename license because of included reference to django-markupfield
- in d/copyright.
- * Update years in d/copyright.
- * Add email address to name in d/copyright.
-
- [ Jakub Wilk ]
- * Use canonical URIs for Vcs-* fields.
-
- -- Michael Fladischer <FladischerMichael at fladi.at> Wed, 08 May 2013 11:43:49 +0200
-
-django-markupfield (1.0.2-2) unstable; urgency=low
-
- * Change order of my name.
- * Update DEP-5 URL to 1.0.
- * Bump Standards-Version to 3.9.3.
- * Update years in d/copyright.
- * Fix tests for django (>= 1.4) FTBFS (Closes: #669472).
- - Ship out own settings.py
- - Bump B-D for python-django to (>= 1.2)
- * Temporary fix for Metadata-Version in egg-info.
-
- -- Michael Fladischer <FladischerMichael at fladi.at> Mon, 23 Apr 2012 15:07:33 +0200
-
-django-markupfield (1.0.2-1) unstable; urgency=low
-
- * New upstream release.
- * Bumped Standards-Version to 3.9.2 (no change necessary).
- * Bump python-django dependency to (>= 1.1).
-
- -- Fladischer Michael <FladischerMichael at fladi.at> Sat, 18 Jun 2011 23:19:20 +0200
-
-django-markupfield (1.0.1-1) unstable; urgency=low
-
- * New upstream release.
- * Streamlined files in debian/ with `wrap-and-sort`.
-
- -- Fladischer Michael <FladischerMichael at fladi.at> Wed, 09 Mar 2011 11:14:05 +0100
-
-django-markupfield (1.0.0b2-1) unstable; urgency=low
-
- * New upstream release.
- * Remove workaround for #575377 as it is fixed by python-2.5.5-5.
- * Use DEP5 for copyright file.
- * Set PMPT as maintainer and myself as uploader.
- * Bump to standards-version 3.9.1.
- * Drop fix_tests patch as it has been fixed upstream.
- * Drop debian/pyversions in favour of XS-Python-Version.
-
- -- Fladischer Michael <FladischerMichael at fladi.at> Mon, 07 Feb 2011 13:17:14 +0100
-
-django-markupfield (1.0.0a2-1) unstable; urgency=low
-
- * Initial release (Closes: #577193)
- * Include fix_tests patch to to have correct markup settings during tests.
-
- -- Fladischer Michael <FladischerMichael at fladi.at> Mon, 19 Apr 2010 14:43:29 +0200
Copied: packages/django-markupfield/tags/1.3.4-1/debian/changelog (from rev 32724, packages/django-markupfield/trunk/debian/changelog)
===================================================================
--- packages/django-markupfield/tags/1.3.4-1/debian/changelog (rev 0)
+++ packages/django-markupfield/tags/1.3.4-1/debian/changelog 2015-05-19 18:35:39 UTC (rev 32725)
@@ -0,0 +1,128 @@
+django-markupfield (1.3.4-1) unstable; urgency=medium
+
+ * New upstream release.
+ * Change my email address to fladi at debian.org.
+
+ -- Michael Fladischer <fladi at debian.org> Tue, 19 May 2015 20:30:20 +0200
+
+django-markupfield (1.3.2-1) unstable; urgency=high
+
+ [ Paul Tagliamonte ]
+ * Team Upload
+ * New upstream release solves CVE-2015-0846, thanks to James P. Turk.
+
+ [ Michael Fladischer ]
+ * New upstream release.
+ * Use pypi.debian.net service for uscan.
+ * Bump Standards-Version to 3.9.6.
+
+ -- Paul Tagliamonte <paultag at debian.org> Sun, 19 Apr 2015 17:03:24 -0400
+
+django-markupfield (1.2.1-2) unstable; urgency=low
+
+ * Switch buildsystem to pybuild.
+ * Drop versioned dependency on python-django on binary package too as there
+ are no prior versions in the archive.
+
+ -- Michael Fladischer <FladischerMichael at fladi.at> Thu, 28 Aug 2014 13:19:47 +0200
+
+django-markupfield (1.2.1-1) unstable; urgency=medium
+
+ * New upstream release.
+ * Add support for Python 3.
+ * Add lintian-override for missing PGP signature on upstream tarball.
+ * Add django-1.7.patch to fix tests with Django 1.7c3 (Closes: #755640).
+ * Drop versioned dependency on python-django as there are no prior versions
+ in the archive.
+ * Add python-setuptools to Build-Depends as they are now used in setup.py.
+
+ -- Michael Fladischer <FladischerMichael at fladi.at> Wed, 27 Aug 2014 13:59:26 +0200
+
+django-markupfield (1.2.0-1) unstable; urgency=low
+
+ * New upstream release.
+ * Switch to dh_python2.
+ * Build-Depends on dh-python.
+ * Relax Build-Depends on debhelper to >= 8.1.0~.
+ * Bump Standards version to 3.9.5.
+ * Drop our own version of settings.py and use the one supplied by
+ upstream for running unit tests.
+ * Drop XS-Python-Version and add X-Python-Version.
+
+ -- Michael Fladischer <FladischerMichael at fladi.at> Mon, 16 Dec 2013 13:22:52 +0100
+
+django-markupfield (1.1.1-2) unstable; urgency=low
+
+ * Team upload.
+ * debian/settings.py: Set SECRET_KEY which is required by Django 1.5. Thanks
+ to Andrey Rahmatullin for the analysis. (Closes: #709130)
+
+ -- Sebastian Ramacher <sramacher at debian.org> Fri, 24 May 2013 13:37:42 +0200
+
+django-markupfield (1.1.1-1) unstable; urgency=low
+
+ [ Michael Fladischer ]
+ * New upstream release.
+ * Bump python version to >= 2.6.
+ * Bump Depends/Build-Depends on python-django to >= 1.4.2 because of
+ django.utils.six.
+ * Bump Standards version to 3.9.4.
+ Change Build-Depends on debhelper to >= 8.1.0 to satisfy build-arch and
+ build-indep targets.
+ * Drop temporary fix for PKG-INFO.
+ * Rename license because of included reference to django-markupfield
+ in d/copyright.
+ * Update years in d/copyright.
+ * Add email address to name in d/copyright.
+
+ [ Jakub Wilk ]
+ * Use canonical URIs for Vcs-* fields.
+
+ -- Michael Fladischer <FladischerMichael at fladi.at> Wed, 08 May 2013 11:43:49 +0200
+
+django-markupfield (1.0.2-2) unstable; urgency=low
+
+ * Change order of my name.
+ * Update DEP-5 URL to 1.0.
+ * Bump Standards-Version to 3.9.3.
+ * Update years in d/copyright.
+ * Fix tests for django (>= 1.4) FTBFS (Closes: #669472).
+ - Ship out own settings.py
+ - Bump B-D for python-django to (>= 1.2)
+ * Temporary fix for Metadata-Version in egg-info.
+
+ -- Michael Fladischer <FladischerMichael at fladi.at> Mon, 23 Apr 2012 15:07:33 +0200
+
+django-markupfield (1.0.2-1) unstable; urgency=low
+
+ * New upstream release.
+ * Bumped Standards-Version to 3.9.2 (no change necessary).
+ * Bump python-django dependency to (>= 1.1).
+
+ -- Fladischer Michael <FladischerMichael at fladi.at> Sat, 18 Jun 2011 23:19:20 +0200
+
+django-markupfield (1.0.1-1) unstable; urgency=low
+
+ * New upstream release.
+ * Streamlined files in debian/ with `wrap-and-sort`.
+
+ -- Fladischer Michael <FladischerMichael at fladi.at> Wed, 09 Mar 2011 11:14:05 +0100
+
+django-markupfield (1.0.0b2-1) unstable; urgency=low
+
+ * New upstream release.
+ * Remove workaround for #575377 as it is fixed by python-2.5.5-5.
+ * Use DEP5 for copyright file.
+ * Set PMPT as maintainer and myself as uploader.
+ * Bump to standards-version 3.9.1.
+ * Drop fix_tests patch as it has been fixed upstream.
+ * Drop debian/pyversions in favour of XS-Python-Version.
+
+ -- Fladischer Michael <FladischerMichael at fladi.at> Mon, 07 Feb 2011 13:17:14 +0100
+
+django-markupfield (1.0.0a2-1) unstable; urgency=low
+
+ * Initial release (Closes: #577193)
+ * Include fix_tests patch to to have correct markup settings during tests.
+
+ -- Fladischer Michael <FladischerMichael at fladi.at> Mon, 19 Apr 2010 14:43:29 +0200
Deleted: packages/django-markupfield/tags/1.3.4-1/debian/control
===================================================================
--- packages/django-markupfield/trunk/debian/control 2015-05-19 18:16:25 UTC (rev 32722)
+++ packages/django-markupfield/tags/1.3.4-1/debian/control 2015-05-19 18:35:39 UTC (rev 32725)
@@ -1,59 +0,0 @@
-Source: django-markupfield
-Section: python
-Priority: optional
-Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
-Uploaders: Michael Fladischer <FladischerMichael at fladi.at>
-Build-Depends: debhelper (>= 8.1.0~),
- dh-python,
- python-all,
- python-django,
- python-docutils,
- python-markdown,
- python-setuptools,
- python3-all,
- python3-django,
- python3-docutils,
- python3-markdown,
- python3-setuptools
-Standards-Version: 3.9.6
-X-Python-Version: >= 2.6
-X-Python3-Version: >= 3.0
-Homepage: http://pypi.python.org/pypi/django-markupfield/
-Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/django-markupfield/trunk/
-Vcs-Browser: http://anonscm.debian.org/viewvc/python-modules/packages/django-markupfield/trunk/
-
-Package: python-django-markupfield
-Architecture: all
-Depends: python-django, ${misc:Depends}, ${python:Depends}
-Suggests: python-docutils, python-markdown, python-textile
-Description: custom Django field for easy use of markup in text fields
- An implementation of a custom MarkupField for Django. A MarkupField is in
- essence a TextField with an associated markup type. The field also caches
- its rendered value.
- .
- It supports these markup types by default:
- * html: allows HTML, potentially unsafe
- * plain: plain text markup, calls urlize and replaces text with linebreaks
- And these markups if the appropriate Python module is installed:
- * markdown: default markdown renderer (requires python-markdown)
- * restructuredtext: default ReST renderer (requires python-docutils)
- * textile: default textile renderer (requires python-textile)
-
-Package: python3-django-markupfield
-Architecture: all
-Depends: python3-django, ${misc:Depends}, ${python3:Depends}
-Suggests: python3-docutils, python3-markdown
-Description: custom Django field for easy use of markup in text fields (Python3 version)
- An implementation of a custom MarkupField for Django. A MarkupField is in
- essence a TextField with an associated markup type. The field also caches
- its rendered value.
- .
- It supports these markup types by default:
- * html: allows HTML, potentially unsafe
- * plain: plain text markup, calls urlize and replaces text with linebreaks
- And these markups if the appropriate Python module is installed:
- * markdown: default markdown renderer (requires python-markdown)
- * restructuredtext: default ReST renderer (requires python-docutils)
- * textile: default textile renderer (requires python-textile)
- .
- This package contains the Python 3 version of the library.
Copied: packages/django-markupfield/tags/1.3.4-1/debian/control (from rev 32723, packages/django-markupfield/trunk/debian/control)
===================================================================
--- packages/django-markupfield/tags/1.3.4-1/debian/control (rev 0)
+++ packages/django-markupfield/tags/1.3.4-1/debian/control 2015-05-19 18:35:39 UTC (rev 32725)
@@ -0,0 +1,59 @@
+Source: django-markupfield
+Section: python
+Priority: optional
+Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
+Uploaders: Michael Fladischer <fladi at debian.org>
+Build-Depends: debhelper (>= 8.1.0~),
+ dh-python,
+ python-all,
+ python-django,
+ python-docutils,
+ python-markdown,
+ python-setuptools,
+ python3-all,
+ python3-django,
+ python3-docutils,
+ python3-markdown,
+ python3-setuptools
+Standards-Version: 3.9.6
+X-Python-Version: >= 2.6
+X-Python3-Version: >= 3.0
+Homepage: http://pypi.python.org/pypi/django-markupfield/
+Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/django-markupfield/trunk/
+Vcs-Browser: http://anonscm.debian.org/viewvc/python-modules/packages/django-markupfield/trunk/
+
+Package: python-django-markupfield
+Architecture: all
+Depends: python-django, ${misc:Depends}, ${python:Depends}
+Suggests: python-docutils, python-markdown, python-textile
+Description: custom Django field for easy use of markup in text fields
+ An implementation of a custom MarkupField for Django. A MarkupField is in
+ essence a TextField with an associated markup type. The field also caches
+ its rendered value.
+ .
+ It supports these markup types by default:
+ * html: allows HTML, potentially unsafe
+ * plain: plain text markup, calls urlize and replaces text with linebreaks
+ And these markups if the appropriate Python module is installed:
+ * markdown: default markdown renderer (requires python-markdown)
+ * restructuredtext: default ReST renderer (requires python-docutils)
+ * textile: default textile renderer (requires python-textile)
+
+Package: python3-django-markupfield
+Architecture: all
+Depends: python3-django, ${misc:Depends}, ${python3:Depends}
+Suggests: python3-docutils, python3-markdown
+Description: custom Django field for easy use of markup in text fields (Python3 version)
+ An implementation of a custom MarkupField for Django. A MarkupField is in
+ essence a TextField with an associated markup type. The field also caches
+ its rendered value.
+ .
+ It supports these markup types by default:
+ * html: allows HTML, potentially unsafe
+ * plain: plain text markup, calls urlize and replaces text with linebreaks
+ And these markups if the appropriate Python module is installed:
+ * markdown: default markdown renderer (requires python-markdown)
+ * restructuredtext: default ReST renderer (requires python-docutils)
+ * textile: default textile renderer (requires python-textile)
+ .
+ This package contains the Python 3 version of the library.
Deleted: packages/django-markupfield/tags/1.3.4-1/debian/copyright
===================================================================
--- packages/django-markupfield/trunk/debian/copyright 2015-05-19 18:16:25 UTC (rev 32722)
+++ packages/django-markupfield/tags/1.3.4-1/debian/copyright 2015-05-19 18:35:39 UTC (rev 32725)
@@ -1,37 +0,0 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: django-markupfield
-Upstream-Contact: James Turk <james.p.turk at gmail.com>
-Source: http://pypi.python.org/pypi/django-markupfield/
-
-Files: *
-Copyright: 2010-2013, James Turk <james.p.turk at gmail.com>
-License: BSD-django-markupfield
-
-Files: debian/*
-Copyright: 2010-2013, Michael Fladischer <FladischerMichael at fladi.at>
-License: BSD-django-markupfield
-
-License: BSD-django-markupfield
- Redistribution and use in source and binary forms, with or without modification,
- are permitted provided that the following conditions are met:
- .
- * Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
- * Neither the name of django-markupfield nor the names of its contributors
- may be used to endorse or promote products derived from this software
- without specific prior written permission.
- .
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
Copied: packages/django-markupfield/tags/1.3.4-1/debian/copyright (from rev 32723, packages/django-markupfield/trunk/debian/copyright)
===================================================================
--- packages/django-markupfield/tags/1.3.4-1/debian/copyright (rev 0)
+++ packages/django-markupfield/tags/1.3.4-1/debian/copyright 2015-05-19 18:35:39 UTC (rev 32725)
@@ -0,0 +1,37 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: django-markupfield
+Upstream-Contact: James Turk <james.p.turk at gmail.com>
+Source: http://pypi.python.org/pypi/django-markupfield/
+
+Files: *
+Copyright: 2010-2013, James Turk <james.p.turk at gmail.com>
+License: BSD-django-markupfield
+
+Files: debian/*
+Copyright: 2010-2015, Michael Fladischer <fladi at debian.org>
+License: BSD-django-markupfield
+
+License: BSD-django-markupfield
+ Redistribution and use in source and binary forms, with or without modification,
+ are permitted provided that the following conditions are met:
+ .
+ * Redistributions of source code must retain the above copyright notice,
+ this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following disclaimer in the documentation
+ and/or other materials provided with the distribution.
+ * Neither the name of django-markupfield nor the names of its contributors
+ may be used to endorse or promote products derived from this software
+ without specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
Deleted: packages/django-markupfield/tags/1.3.4-1/debian/patches/django-1.7.patch
===================================================================
--- packages/django-markupfield/trunk/debian/patches/django-1.7.patch 2015-05-19 18:16:25 UTC (rev 32722)
+++ packages/django-markupfield/tags/1.3.4-1/debian/patches/django-1.7.patch 2015-05-19 18:35:39 UTC (rev 32725)
@@ -1,26 +0,0 @@
-Description: Use tuple for choices to un-break Django 1.7c3
- Django 1.7c3 breaks on non-subscriptable objects, therefor changing the choices
- in the tests from list to tuple.
- This patch should be dropped once the #23112 fix is shipped in the Debian
- Django package.
-Author: Michael Fladischer <FladischerMichael at fladi.at>
-Last-Update: 2014-08-27
-Bug: https://code.djangoproject.com/ticket/23112
-Forwarded: not-needed
-
---- a/markupfield/tests/tests.py
-+++ b/markupfield/tests/tests.py
-@@ -11,11 +11,11 @@
- from markupfield.tests.models import Post, Article, Concrete
-
- from django.forms.models import modelform_factory
--ArticleForm = modelform_factory(Article, fields=['normal_field', 'normal_field_markup_type',
-+ArticleForm = modelform_factory(Article, fields=('normal_field', 'normal_field_markup_type',
- 'markup_choices_field',
- 'markup_choices_field_markup_type',
- 'default_field', 'default_field_markup_type',
-- 'markdown_field'])
-+ 'markdown_field'))
-
-
- class MarkupFieldTestCase(TestCase):
Copied: packages/django-markupfield/tags/1.3.4-1/debian/patches/django-1.7.patch (from rev 32723, packages/django-markupfield/trunk/debian/patches/django-1.7.patch)
===================================================================
--- packages/django-markupfield/tags/1.3.4-1/debian/patches/django-1.7.patch (rev 0)
+++ packages/django-markupfield/tags/1.3.4-1/debian/patches/django-1.7.patch 2015-05-19 18:35:39 UTC (rev 32725)
@@ -0,0 +1,26 @@
+Description: Use tuple for choices to un-break Django 1.7c3
+ Django 1.7c3 breaks on non-subscriptable objects, therefor changing the choices
+ in the tests from list to tuple.
+ This patch should be dropped once the #23112 fix is shipped in the Debian
+ Django package.
+Author: Michael Fladischer <fladi at debian.org>
+Last-Update: 2014-08-27
+Bug: https://code.djangoproject.com/ticket/23112
+Forwarded: not-needed
+
+--- a/markupfield/tests/tests.py
++++ b/markupfield/tests/tests.py
+@@ -11,11 +11,11 @@
+ from markupfield.tests.models import Post, Article, Concrete
+
+ from django.forms.models import modelform_factory
+-ArticleForm = modelform_factory(Article, fields=['normal_field', 'normal_field_markup_type',
++ArticleForm = modelform_factory(Article, fields=('normal_field', 'normal_field_markup_type',
+ 'markup_choices_field',
+ 'markup_choices_field_markup_type',
+ 'default_field', 'default_field_markup_type',
+- 'markdown_field'])
++ 'markdown_field'))
+
+
+ class MarkupFieldTestCase(TestCase):
More information about the Python-modules-commits
mailing list