[Python-modules-commits] [python-django] 04/16: Initialize git-dpm
Brian May
bam at moszumanska.debian.org
Sun Oct 11 02:44:11 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 a3866a67df885080bae508ca72dbfcc1fedabf9f
Merge: 4065914 b9e9558
Author: Brian May <brian at microcomaustralia.com.au>
Date: Sun Oct 11 11:34:03 2015 +1100
Initialize git-dpm
debian/.git-dpm | 8 ++++++++
debian/patches/02_disable-sources-in-sphinxdoc.diff | 16 +++++++++++++---
debian/patches/03_manpage.diff | 15 +++++++++++++--
.../06_use_debian_geoip_database_as_default.diff | 21 +++++++++++++++------
django/contrib/gis/geoip/base.py | 19 ++++++++++---------
docs/conf.py | 5 ++++-
docs/man/django-admin.1 | 6 +++---
7 files changed, 66 insertions(+), 24 deletions(-)
diff --cc debian/.git-dpm
index 0000000,0000000..2e35cf2
new file mode 100644
--- /dev/null
+++ b/debian/.git-dpm
@@@ -1,0 -1,0 +1,8 @@@
++# see git-dpm(1) from git-dpm package
++b9e955846033c2b3c7b751cf0504e703304d43d6
++b9e955846033c2b3c7b751cf0504e703304d43d6
++d16a450f271fa5fe3ef10b43f47307ed95b793bb
++d16a450f271fa5fe3ef10b43f47307ed95b793bb
++python-django_1.7.9.orig.tar.gz
++473599c2e2810a30bb86fd9c730ef52f23e5f709
++7605194
diff --cc debian/patches/02_disable-sources-in-sphinxdoc.diff
index 0e00a13,0000000..9502dd7
mode 100644,000000..100644
--- a/debian/patches/02_disable-sources-in-sphinxdoc.diff
+++ b/debian/patches/02_disable-sources-in-sphinxdoc.diff
@@@ -1,23 -1,0 +1,33 @@@
- Description: Disable creation of _sources directory by Sphinx
++From b215f77f4711225be75eb02254142401a52a129e 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
- Author: Raphaël Hertzog <hertzog at debian.org>
+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
- @@ -196,7 +196,10 @@ html_additional_pages = {}
++@@ -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 b44b0a2,0000000..5807dec
mode 100644,000000..100644
--- a/debian/patches/03_manpage.diff
+++ b/debian/patches/03_manpage.diff
@@@ -1,23 -1,0 +1,34 @@@
- Description: Update manual page to refer to django-admin instead of django-admin.py
++From 2dc49e337eb1953cebbf68c86d9d554388a0f080 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
- Author: Brett Parker <iDunno at sommitrealweird.co.uk>
+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 bfe3690,0000000..d794c7c
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,60 -1,0 +1,69 @@@
- Description: Use Debian GeoIP database path as default
++From b9e955846033c2b3c7b751cf0504e703304d43d6 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
- Author: Tapio Rantala <tapio.rantala at iki.fi>
+
++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.
- -
- - * city: The name of the GeoIP city data file. Defaults to
- - 'GeoLiteCity.dat'; overrides the GEOIP_CITY 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