[Python-modules-commits] [python-django] 15/16: merge patched-debian/sid into debian/sid
Brian May
bam at moszumanska.debian.org
Sun Oct 11 02:44:12 UTC 2015
This is an automated email from the git hooks/post-receive script.
bam pushed a commit to branch debian/sid
in repository python-django.
commit 9515a844dfcab6d1cda3c5d6562bab27da5b41f0
Merge: 5ca1666 8b6b9e2
Author: Brian May <brian at microcomaustralia.com.au>
Date: Sun Oct 11 13:12:00 2015 +1100
merge patched-debian/sid into debian/sid
Django.egg-info/PKG-INFO | 2 +-
Django.egg-info/SOURCES.txt | 2 +
PKG-INFO | 2 +-
debian/.git-dpm | 6 +-
...4-Added-a-dummy-class-for-HTMLParserError.patch | 2 +-
.../patches/02_disable-sources-in-sphinxdoc.diff | 2 +-
debian/patches/03_manpage.diff | 2 +-
.../06_use_debian_geoip_database_as_default.diff | 2 +-
django/__init__.py | 2 +-
django/contrib/gis/geoip/tests.py | 20 +++----
django/contrib/sessions/backends/base.py | 9 ++-
django/contrib/sessions/backends/cached_db.py | 2 +-
django/contrib/sessions/middleware.py | 50 +++++++++-------
django/contrib/sessions/tests.py | 70 ++++++++++++++++++++++
docs/howto/outputting-pdf.txt | 2 +-
docs/ref/contrib/admin/index.txt | 2 +-
docs/ref/contrib/flatpages.txt | 2 +-
docs/ref/contrib/gis/geoquerysets.txt | 5 +-
docs/ref/middleware.txt | 2 +-
docs/releases/1.4.22.txt | 29 +++++++++
docs/releases/1.7.10.txt | 25 ++++++++
docs/releases/index.txt | 2 +
docs/topics/http/sessions.txt | 14 +++--
setup.cfg | 2 +-
24 files changed, 202 insertions(+), 56 deletions(-)
diff --cc debian/.git-dpm
index 4684716,0000000..d403b0f
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
+# see git-dpm(1) from git-dpm package
- d7371c714045ad04e8c289b5948992eccb988c8e
- d7371c714045ad04e8c289b5948992eccb988c8e
- d16a450f271fa5fe3ef10b43f47307ed95b793bb
++8b6b9e2927c1191c8a896424b25653a001ee41ad
++8b6b9e2927c1191c8a896424b25653a001ee41ad
++e2f348a8f03d3f935e0233d7a747be5fd99c796f
+e2f348a8f03d3f935e0233d7a747be5fd99c796f
+python-django_1.7.10.orig.tar.gz
+ec091d804d3a71ed280c0a08804db94a7aa93b30
+7584312
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/patches/0004-Added-a-dummy-class-for-HTMLParserError.patch
index 95086b7,0000000..f7784e4
mode 100644,000000..100644
--- a/debian/patches/0004-Added-a-dummy-class-for-HTMLParserError.patch
+++ b/debian/patches/0004-Added-a-dummy-class-for-HTMLParserError.patch
@@@ -1,34 -1,0 +1,34 @@@
- From d7371c714045ad04e8c289b5948992eccb988c8e Mon Sep 17 00:00:00 2001
++From 8b6b9e2927c1191c8a896424b25653a001ee41ad Mon Sep 17 00:00:00 2001
+From: Brian May <brian at microcomaustralia.com.au>
+Date: Sun, 11 Oct 2015 12:12:44 +1100
+Subject: Added a dummy class for HTMLParserError.
+
+Fix problem introduced by python-3.5 and causes FTBFS for several Django
+related packages.
+
+Backport of upstream fix.
+https://github.com/django/django/commit/b07aa52e8a8e4c7fdc7265f75ce2e7992e657ae9
+
+Closes: #796104
+---
+ django/utils/html_parser.py | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/django/utils/html_parser.py b/django/utils/html_parser.py
+index efe5422..ab1f654 100644
+--- a/django/utils/html_parser.py
++++ b/django/utils/html_parser.py
+@@ -9,7 +9,12 @@ use_workaround = (
+ (current_version >= (3, 0) and current_version < (3, 2, 3))
+ )
+
+-HTMLParseError = _html_parser.HTMLParseError
++try:
++ HTMLParseError = _html_parser.HTMLParseError
++except AttributeError:
++ # create a dummy class for Python 3.5+ where it's been removed
++ class HTMLParseError(Exception):
++ pass
+
+ if not use_workaround:
+ if current_version >= (3, 4):
diff --cc debian/patches/02_disable-sources-in-sphinxdoc.diff
index 9502dd7,0000000..8978eed
mode 100644,000000..100644
--- a/debian/patches/02_disable-sources-in-sphinxdoc.diff
+++ b/debian/patches/02_disable-sources-in-sphinxdoc.diff
@@@ -1,33 -1,0 +1,33 @@@
- From b215f77f4711225be75eb02254142401a52a129e Mon Sep 17 00:00:00 2001
++From 71c35fd527021e8da2cc00c19830b3bef86bcd1a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Rapha=C3=ABl=20Hertzog?= <hertzog at debian.org>
+Date: Sun, 11 Oct 2015 11:34:00 +1100
+Subject: Disable creation of _sources directory by Sphinx
+
+ We do this to save some space as the sources of the documentation
+ are not really useful in a binary package.
+ .
+ This is a Debian specific patch.
+Forwarded: not-needed
+Origin: vendor
+
+Patch-Name: 02_disable-sources-in-sphinxdoc.diff
+---
+ docs/conf.py | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/docs/conf.py b/docs/conf.py
+index 7707cf3..f179438 100644
+--- a/docs/conf.py
++++ b/docs/conf.py
+@@ -200,7 +200,10 @@ html_additional_pages = {}
+ #html_split_index = False
+
+ # If true, links to the reST sources are added to the pages.
+-#html_show_sourcelink = True
++html_show_sourcelink = False
++
++# Do not ship a copy of the sources
++html_copy_source = False
+
+ # If true, "Created using Sphinx" is shown in the HTML footer. Default is True.
+ #html_show_sphinx = True
diff --cc debian/patches/03_manpage.diff
index 5807dec,0000000..9c10bef
mode 100644,000000..100644
--- a/debian/patches/03_manpage.diff
+++ b/debian/patches/03_manpage.diff
@@@ -1,34 -1,0 +1,34 @@@
- From 2dc49e337eb1953cebbf68c86d9d554388a0f080 Mon Sep 17 00:00:00 2001
++From 5ed7512d144abc9d61c271085669d77eb9c3c175 Mon Sep 17 00:00:00 2001
+From: Brett Parker <iDunno at sommitrealweird.co.uk>
+Date: Sun, 11 Oct 2015 11:34:01 +1100
+Subject: Update manual page to refer to django-admin instead of
+ django-admin.py
+
+ Update the manual page to speak of django-admin instead of
+ django-admin.py as that's the name used by the Debian package.
+ .
+ This is a Debian specific patch.
+Forwarded: not-needed
+Origin: vendor
+
+Patch-Name: 03_manpage.diff
+---
+ docs/man/django-admin.1 | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/docs/man/django-admin.1 b/docs/man/django-admin.1
+index c9932ac..bdb6438 100644
+--- a/docs/man/django-admin.1
++++ b/docs/man/django-admin.1
+@@ -1,8 +1,8 @@
+-.TH "django-admin.py" "1" "March 2008" "Django Project" ""
++.TH "django-admin" "1" "March 2008" "Django Project" ""
+ .SH "NAME"
+-django\-admin.py \- Utility script for the Django Web framework
++django\-admin \- Utility script for the Django Web framework
+ .SH "SYNOPSIS"
+-.B django\-admin.py
++.B django\-admin
+ .I <action>
+ .B [options]
+ .sp
diff --cc debian/patches/06_use_debian_geoip_database_as_default.diff
index d794c7c,0000000..990da81
mode 100644,000000..100644
--- a/debian/patches/06_use_debian_geoip_database_as_default.diff
+++ b/debian/patches/06_use_debian_geoip_database_as_default.diff
@@@ -1,69 -1,0 +1,69 @@@
- From b9e955846033c2b3c7b751cf0504e703304d43d6 Mon Sep 17 00:00:00 2001
++From ce9711773c8b21a9c207b733e0de00401eea1748 Mon Sep 17 00:00:00 2001
+From: Tapio Rantala <tapio.rantala at iki.fi>
+Date: Sun, 11 Oct 2015 11:34:02 +1100
+Subject: Use Debian GeoIP database path as default
+
+ Default to Debian standard path for GeoIP directory and for GeoIP city
+ file. Avoids the need to declare them in each project.
+ .
+ This is a Debian specific patch.
+Bug-Debian: http://bugs.debian.org/645094
+Forwarded: not-needed
+
+Patch-Name: 06_use_debian_geoip_database_as_default.diff
+---
+ django/contrib/gis/geoip/base.py | 19 ++++++++++---------
+ 1 file changed, 10 insertions(+), 9 deletions(-)
+
+diff --git a/django/contrib/gis/geoip/base.py b/django/contrib/gis/geoip/base.py
+index 9295030..0b05f43 100644
+--- a/django/contrib/gis/geoip/base.py
++++ b/django/contrib/gis/geoip/base.py
+@@ -67,7 +67,8 @@ class GeoIP(object):
+ * 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
+- this directory; overrides the GEOIP_PATH settings attribute.
++ this directory. Overrides the GEOIP_PATH settings attribute.
++ If neither is set, defaults to '/usr/share/GeoIP'.
+
+ * cache: The cache settings when opening up the GeoIP datasets,
+ and may be an integer in (0, 1, 2, 4, 8) corresponding to
+@@ -76,11 +77,13 @@ class GeoIP(object):
+ settings, respectively. Defaults to 0, meaning that the data is read
+ from the disk.
+
+- * country: The name of the GeoIP country data file. Defaults to
+- 'GeoIP.dat'; overrides the GEOIP_COUNTRY settings attribute.
++ * country: The name of the GeoIP country data file. Overrides
++ the GEOIP_COUNTRY settings attribute. If neither is set,
++ defaults to 'GeoIP.dat'
+
+- * city: The name of the GeoIP city data file. Defaults to
+- 'GeoLiteCity.dat'; overrides the GEOIP_CITY settings attribute.
++ * city: The name of the GeoIP city data file. Overrides the
++ GEOIP_CITY settings attribute. If neither is set, defaults
++ to 'GeoIPCity.dat'.
+ """
+ # Checking the given cache option.
+ if cache in self.cache_options:
+@@ -90,9 +93,7 @@ class GeoIP(object):
+
+ # Getting the GeoIP data path.
+ if not path:
+- path = GEOIP_SETTINGS.get('GEOIP_PATH', None)
+- if not path:
+- raise GeoIPException('GeoIP path must be provided via parameter or the GEOIP_PATH setting.')
++ path = GEOIP_SETTINGS.get('GEOIP_PATH', '/usr/share/GeoIP')
+ if not isinstance(path, six.string_types):
+ raise TypeError('Invalid path type: %s' % type(path).__name__)
+
+@@ -105,7 +106,7 @@ class GeoIP(object):
+ 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(force_bytes(city_db), cache)
+ self._city_file = city_db
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-django.git
More information about the Python-modules-commits
mailing list