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

[lfaraone at users.alioth.debian.org]

    Date: Wednesday, April 23, 2014 @ 03:42:10
  Author: lfaraone
Revision: 28623

releasing package python-django version 1.6.3-1

Modified:
  packages/python-django/trunk/debian/changelog
  packages/python-django/trunk/debian/patches/series
Deleted:
  packages/python-django/trunk/debian/patches/07_translation_encoding_fix.diff
  packages/python-django/trunk/debian/patches/ticket21869.diff

Modified: packages/python-django/trunk/debian/changelog
===================================================================
--- packages/python-django/trunk/debian/changelog	2014-04-22 05:50:21 UTC (rev 28622)
+++ packages/python-django/trunk/debian/changelog	2014-04-23 03:42:10 UTC (rev 28623)
@@ -1,3 +1,17 @@
+python-django (1.6.3-1) unstable; urgency=high
+
+  * New upstream security release.
+    - Unexpected code execution using ``reverse()``
+    - CVE-2014-0472
+    - Caching of anonymous pages could reveal CSRF token
+    - CVE-2014-0473
+    - MySQL typecasting could result in unexpected matches
+    - CVE-2014-0474
+  * Drop patches 07_translation_encoding_fix and ticket21869.diff; merged
+    upstream
+
+ -- Luke Faraone <lfaraone at debian.org>  Mon, 21 Apr 2014 16:47:14 -0700
+
 python-django (1.6.1-2) unstable; urgency=medium
 
   * Team upload.

Deleted: packages/python-django/trunk/debian/patches/07_translation_encoding_fix.diff
===================================================================
--- packages/python-django/trunk/debian/patches/07_translation_encoding_fix.diff	2014-04-22 05:50:21 UTC (rev 28622)
+++ packages/python-django/trunk/debian/patches/07_translation_encoding_fix.diff	2014-04-23 03:42:10 UTC (rev 28623)
@@ -1,34 +0,0 @@
-Description: Remove doubly-UTF-8-encoded comment from German translations.
-
-We instead replace the offending line with the attribution information
-currently available in master.
-
-Author: Luke Faraone <lfaraone at debian.org>
-Origin: vendor
-Bug: https://code.djangoproject.com/ticket/21601
-Bug-Debian: http://bugs.debian.org/729194
-Forwarded: https://code.djangoproject.com/attachment/ticket/21601/21601.diff
-Last-Update: 2013-12-12
-
---- python-django-1.6.1.orig/django/contrib/admindocs/locale/de/LC_MESSAGES/django.po
-+++ python-django-1.6.1/django/contrib/admindocs/locale/de/LC_MESSAGES/django.po
-@@ -1,7 +1,7 @@
- # This file is distributed under the same license as the Django package.
- #
- # Translators:
--# Jannis Š, 2013
-+# Jannis Leidel <jannis at leidel.info>, 2013
- msgid ""
- msgstr ""
- "Project-Id-Version: django-core\n"
---- python-django-1.6.1.orig/django/contrib/auth/locale/de/LC_MESSAGES/django.po
-+++ python-django-1.6.1/django/contrib/auth/locale/de/LC_MESSAGES/django.po
-@@ -3,7 +3,7 @@
- # Translators:
- # André Hagenbruch <ahagenbruch at googlemail.com>, 2011
- # apollo13 <florian at apolloner.eu>, 2012
--# Jannis Š, 2013
-+# Jannis Leidel <jannis at leidel.info>, 2013
- # Markus Holtermann <inyoka at markusholtermann.eu>, 2013
- msgid ""
- msgstr ""

Modified: packages/python-django/trunk/debian/patches/series
===================================================================
--- packages/python-django/trunk/debian/patches/series	2014-04-22 05:50:21 UTC (rev 28622)
+++ packages/python-django/trunk/debian/patches/series	2014-04-23 03:42:10 UTC (rev 28623)
@@ -1,5 +1,3 @@
 02_disable-sources-in-sphinxdoc.diff
 03_manpage.diff
 06_use_debian_geoip_database_as_default.diff
-07_translation_encoding_fix.diff
-ticket21869.diff

Deleted: packages/python-django/trunk/debian/patches/ticket21869.diff
===================================================================
--- packages/python-django/trunk/debian/patches/ticket21869.diff	2014-04-22 05:50:21 UTC (rev 28622)
+++ packages/python-django/trunk/debian/patches/ticket21869.diff	2014-04-23 03:42:10 UTC (rev 28623)
@@ -1,23 +0,0 @@
-Subject: Documentation not building on Sphinx 1.2.1
-Origin: https://github.com/django/django/commit/e1d18b9d2e8ac292940f070b0a8cb9733756acd9#diff-b6a99c1d3137306aa674102ff23eafa4R249
-Bug: https://code.djangoproject.com/ticket/21869
-Forwarded: not-needed
-
---- a/docs/_ext/djangodocs.py
-+++ b/docs/_ext/djangodocs.py
-@@ -101,11 +101,13 @@
-         self.compact_p = self.context.pop()
-         self.body.append('</table>\n')
- 
--    # <big>? Really?
-     def visit_desc_parameterlist(self, node):
--        self.body.append('(')
-+        self.body.append('(')  # by default sphinx puts <big> around the "("
-         self.first_param = 1
-+        self.optional_param_level = 0
-         self.param_separator = node.child_text_separator
-+        self.required_params_left = sum([isinstance(c, addnodes.desc_parameter)
-+                                         for c in node.children])
- 
-     def depart_desc_parameterlist(self, node):
-         self.body.append(')')