[Python-modules-commits] r27475 - in packages/python-django/trunk/debian (5 files)
lfaraone at users.alioth.debian.org
lfaraone at users.alioth.debian.org
Wed Jan 29 14:58:21 UTC 2014
Date: Wednesday, January 29, 2014 @ 14:58:20
Author: lfaraone
Revision: 27475
releasing package python-django version 1.6.1-1
Added:
packages/python-django/trunk/debian/patches/07_translation_encoding_fix.diff
Modified:
packages/python-django/trunk/debian/changelog
packages/python-django/trunk/debian/control
packages/python-django/trunk/debian/patches/06_use_debian_geoip_database_as_default.diff
packages/python-django/trunk/debian/patches/series
Modified: packages/python-django/trunk/debian/changelog
===================================================================
--- packages/python-django/trunk/debian/changelog 2014-01-28 22:10:11 UTC (rev 27474)
+++ packages/python-django/trunk/debian/changelog 2014-01-29 14:58:20 UTC (rev 27475)
@@ -1,3 +1,29 @@
+python-django (1.6.1-1) unstable; urgency=medium
+
+ * New upstream version.
+ * Fix broken encoding in translations attribution. (Closes: #729194)
+
+ -- Luke Faraone <lfaraone at debian.org> Thu, 12 Dec 2013 15:46:01 -0500
+
+python-django (1.6-1) unstable; urgency=low
+
+ * New upstream version. Closes: #557474, #724637.
+ * python-django now also suggests the installation of ipython,
+ bpython, python-django-doc, and libgdal1.
+ Closes: #636511, #686333, #704203
+ * Set package maintainer to Debian Python Modules Team.
+ * Bump standards version to 3.9.5, no changes needed.
+
+ -- Luke Faraone <lfaraone at debian.org> Thu, 07 Nov 2013 15:33:49 -0500
+
+python-django (1.5.4-1) unstable; urgency=high
+
+ * New upstream security release. Fixes CVE-2013-1443. Closes: #723043.
+ https://www.djangoproject.com/weblog/2013/sep/15/security/
+ - Denial-of-service via large passwords. CVE-2013-1443
+
+ -- Luke Faraone <lfaraone at debian.org> Sun, 15 Sep 2013 15:50:10 -0400
+
python-django (1.5.3-1) unstable; urgency=high
* New upstream security release. Fixes CVE-2013-4315. Closes: #722605
Modified: packages/python-django/trunk/debian/control
===================================================================
--- packages/python-django/trunk/debian/control 2014-01-28 22:10:11 UTC (rev 27474)
+++ packages/python-django/trunk/debian/control 2014-01-29 14:58:20 UTC (rev 27475)
@@ -1,11 +1,11 @@
Source: python-django
Section: python
Priority: optional
-Maintainer: Chris Lamb <lamby at debian.org>
-Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>,
+Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
+Uploaders: Luke Faraone <lfaraone at debian.org>,
Raphaël Hertzog <hertzog at debian.org>,
- Luke Faraone <lfaraone at debian.org>
-Standards-Version: 3.9.4
+ Chris Lamb <lamby at debian.org>
+Standards-Version: 3.9.5
Build-Depends: debhelper (>= 9), python (>= 2.6.6-3~), python-sphinx (>= 1.0.8), locales (>= 0)
Build-Depends-Indep: libjs-jquery
Homepage: http://www.djangoproject.com/
@@ -16,7 +16,7 @@
Architecture: all
Depends: ${misc:Depends}, ${python:Depends}
Recommends: libjs-jquery
-Suggests: python-psycopg2, python-psycopg, python-mysqldb, python-flup, python-sqlite, python-yaml, geoip-database-contrib, gettext
+Suggests: python-psycopg2, python-psycopg, python-mysqldb, python-flup, python-sqlite, python-yaml, geoip-database-contrib, gettext, python-django-doc, ipython, bpython, libgdal1
Description: High-level Python web development framework
Django is a high-level web application framework that loosely follows the
model-view-controller design pattern.
Modified: packages/python-django/trunk/debian/patches/06_use_debian_geoip_database_as_default.diff
===================================================================
--- packages/python-django/trunk/debian/patches/06_use_debian_geoip_database_as_default.diff 2014-01-28 22:10:11 UTC (rev 27474)
+++ packages/python-django/trunk/debian/patches/06_use_debian_geoip_database_as_default.diff 2014-01-29 14:58:20 UTC (rev 27475)
@@ -9,7 +9,7 @@
--- a/django/contrib/gis/geoip/base.py
+++ b/django/contrib/gis/geoip/base.py
-@@ -63,7 +63,8 @@
+@@ -64,7 +64,8 @@
* path: Base directory to where GeoIP data is located or the full path
to where the city or country data files (*.dat) are located.
Assumes that both the city and country data sets are located in
@@ -19,7 +19,7 @@
* cache: The cache settings when opening up the GeoIP datasets,
and may be an integer in (0, 1, 2, 4, 8) corresponding to
-@@ -72,11 +73,13 @@
+@@ -73,11 +74,13 @@
settings, respectively. Defaults to 0, meaning that the data is read
from the disk.
@@ -38,7 +38,7 @@
"""
# Checking the given cache option.
if cache in self.cache_options:
-@@ -86,8 +89,7 @@
+@@ -87,8 +90,7 @@
# Getting the GeoIP data path.
if not path:
@@ -48,12 +48,12 @@
if not isinstance(path, six.string_types):
raise TypeError('Invalid path type: %s' % type(path).__name__)
-@@ -100,7 +102,7 @@
- self._country = GeoIP_open(country_db, cache)
+@@ -101,7 +103,7 @@
+ self._country = GeoIP_open(force_bytes(country_db), cache)
self._country_file = country_db
- city_db = os.path.join(path, city or GEOIP_SETTINGS.get('GEOIP_CITY', 'GeoLiteCity.dat'))
+ city_db = os.path.join(path, city or GEOIP_SETTINGS.get('GEOIP_CITY', 'GeoIPCity.dat'))
if os.path.isfile(city_db):
- self._city = GeoIP_open(city_db, cache)
+ self._city = GeoIP_open(force_bytes(city_db), cache)
self._city_file = city_db
Added: packages/python-django/trunk/debian/patches/07_translation_encoding_fix.diff
===================================================================
--- packages/python-django/trunk/debian/patches/07_translation_encoding_fix.diff (rev 0)
+++ packages/python-django/trunk/debian/patches/07_translation_encoding_fix.diff 2014-01-29 14:58:20 UTC (rev 27475)
@@ -0,0 +1,34 @@
+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-01-28 22:10:11 UTC (rev 27474)
+++ packages/python-django/trunk/debian/patches/series 2014-01-29 14:58:20 UTC (rev 27475)
@@ -1,3 +1,4 @@
02_disable-sources-in-sphinxdoc.diff
03_manpage.diff
06_use_debian_geoip_database_as_default.diff
+07_translation_encoding_fix.diff
More information about the Python-modules-commits
mailing list