[Python-modules-commits] [python-django] 05/06: merge debian/patched-master into debian/master
Luke Faraone
lfaraone at moszumanska.debian.org
Wed Nov 25 05:34:22 UTC 2015
This is an automated email from the git hooks/post-receive script.
lfaraone pushed a commit to branch debian/master
in repository python-django.
commit 99e3202f9508ab329397b7f3f6910b1772d814c3
Merge: 66056b1 3b2c1c4
Author: Luke Faraone <lfaraone at debian.org>
Date: Wed Nov 25 04:24:06 2015 +0000
merge debian/patched-master into debian/master
AUTHORS | 1 +
Django.egg-info/PKG-INFO | 2 +-
Django.egg-info/SOURCES.txt | 3 +
PKG-INFO | 2 +-
debian/.git-dpm | 6 +-
.../patches/02_disable-sources-in-sphinxdoc.diff | 4 +-
.../06_use_debian_geoip_database_as_default.diff | 2 +-
django/__init__.py | 2 +-
django/contrib/postgres/fields/array.py | 22 ++++--
django/contrib/postgres/fields/ranges.py | 24 ++++--
django/contrib/postgres/fields/utils.py | 3 +
django/db/backends/mysql/operations.py | 4 +-
django/db/migrations/loader.py | 5 +-
django/db/models/base.py | 8 +-
django/db/models/deletion.py | 4 +-
django/db/models/fields/related.py | 13 ++++
django/db/models/query.py | 16 +++-
django/db/utils.py | 35 +++++----
django/forms/models.py | 10 ++-
django/template/engine.py | 8 +-
django/utils/dateformat.py | 34 ++++++--
django/utils/formats.py | 20 +++++
django/utils/six.py | 74 ++++++++++++------
django/utils/translation/trans_real.py | 1 +
docs/_ext/djangodocs.py | 30 ++++---
.../djangodocs/static/docicons-behindscenes.png | Bin 2269 -> 1065 bytes
docs/_theme/djangodocs/static/docicons-note.png | Bin 1013 -> 559 bytes
.../djangodocs/static/docicons-philosophy.png | Bin 1523 -> 791 bytes
docs/conf.py | 8 +-
docs/howto/custom-management-commands.txt | 15 ++++
docs/howto/deployment/wsgi/modwsgi.txt | 35 ++++-----
docs/howto/deployment/wsgi/uwsgi.txt | 11 +++
docs/index.txt | 2 +-
docs/ref/contrib/admin/admindocs.txt | 1 +
docs/ref/contrib/admin/index.txt | 83 ++++++++++++++++++++
docs/ref/contrib/gis/db-api.txt | 8 +-
docs/ref/contrib/gis/geos.txt | 24 ++++--
docs/ref/databases.txt | 7 +-
docs/ref/django-admin.txt | 13 ++--
docs/ref/forms/fields.txt | 3 +
docs/ref/migration-operations.txt | 4 +-
docs/ref/models/fields.txt | 10 ++-
docs/ref/models/querysets.txt | 2 +-
docs/ref/settings.txt | 9 ++-
docs/ref/templates/api.txt | 2 +
docs/ref/templates/builtins.txt | 4 +-
docs/ref/unicode.txt | 30 +++++++
docs/ref/urlresolvers.txt | 4 +-
docs/releases/1.7.11.txt | 26 +++++++
docs/releases/1.7.txt | 2 +-
docs/releases/1.8.7.txt | 66 ++++++++++++++++
docs/releases/index.txt | 2 +
docs/topics/auth/customizing.txt | 12 +--
docs/topics/auth/default.txt | 11 +++
docs/topics/class-based-views/generic-editing.txt | 6 +-
docs/topics/db/aggregation.txt | 86 +++++++++++++++------
docs/topics/db/multi-db.txt | 1 +
docs/topics/i18n/translation.txt | 6 +-
docs/topics/logging.txt | 46 ++++++-----
docs/topics/performance.txt | 10 +--
docs/topics/testing/tools.txt | 6 ++
setup.cfg | 2 +-
tests/admin_filters/tests.py | 8 +-
tests/apps/tests.py | 14 ++--
tests/backends/tests.py | 1 +
tests/basic/models.py | 1 +
tests/basic/tests.py | 11 +++
tests/delete/models.py | 6 ++
tests/delete/tests.py | 11 +++
tests/forms_tests/tests/tests.py | 14 +++-
tests/i18n/tests.py | 15 ++++
tests/model_fields/tests.py | 32 +++++++-
tests/model_regress/test_pickle.py | 17 +---
tests/multiple_database/tests.py | 21 +++++
tests/order_with_respect_to/models.py | 16 ++++
tests/order_with_respect_to/tests.py | 12 ++-
tests/postgres_tests/test_array.py | 81 +++++++++++++++++++
tests/postgres_tests/test_ranges.py | 23 ++++--
tests/prefetch_related/tests.py | 22 ++++++
tests/queryset_pickle/tests.py | 17 +---
tests/requirements/mysql.txt | 2 +-
tests/runtests.py | 2 +
tests/schema/tests.py | 27 +++----
tests/utils_tests/test_dateformat.py | 17 ++++
84 files changed, 975 insertions(+), 285 deletions(-)
diff --cc debian/.git-dpm
index b269eb6,0000000..83617d7
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
- 83cc99670b3286af2fce752a2dae943de42b183b
- 83cc99670b3286af2fce752a2dae943de42b183b
- bf9d9d34e53599542047e5129c31ea22e7151902
++3b2c1c4d755a49e4346593c11bb7a34e7161e6bd
++3b2c1c4d755a49e4346593c11bb7a34e7161e6bd
++8dd68eb3da5a210762b7c540a252f1785e972297
+8dd68eb3da5a210762b7c540a252f1785e972297
+python-django_1.8.7.orig.tar.gz
+0ad68cb4a631121c715ebe295463bada97d04d74
+7276831
+debianTag="debian/%e%v"
+patchedTag="debian/patches/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/patches/02_disable-sources-in-sphinxdoc.diff
index 1797eaf,0000000..b75d146
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 836389c5bf9ac0ac4b795f9ab1b7c72276a465bb Mon Sep 17 00:00:00 2001
++From 2e5f051da28eeebfa26fe3def3dde759c106e5d9 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:43:19 +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 03bf668..609357a 100644
++index 55d13f0..bfa6f03 100644
+--- a/docs/conf.py
++++ b/docs/conf.py
+@@ -202,7 +202,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/06_use_debian_geoip_database_as_default.diff
index f2b0164,0000000..08133ac
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 83cc99670b3286af2fce752a2dae943de42b183b Mon Sep 17 00:00:00 2001
++From 3b2c1c4d755a49e4346593c11bb7a34e7161e6bd Mon Sep 17 00:00:00 2001
+From: Tapio Rantala <tapio.rantala at iki.fi>
+Date: Sun, 11 Oct 2015 11:43:20 +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 0b160ff..0420bba 100644
+--- a/django/contrib/gis/geoip/base.py
++++ b/django/contrib/gis/geoip/base.py
+@@ -66,7 +66,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
+@@ -75,11 +76,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:
+@@ -89,9 +92,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__)
+
+@@ -104,7 +105,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