[Python-modules-commits] [python-django] 05/08: Refresh all patches and drop 03_manpage.diff, merged upstream.

[Raphaël Hertzog]

This is an automated email from the git hooks/post-receive script.

hertzog pushed a commit to branch debian/experimental
in repository python-django.

commit a39aa71ca9238141f7f5e8551bf6ce4076c0fc1f
Author: Raphaël Hertzog <hertzog at debian.org>
Date:   Wed May 20 10:07:31 2015 +0200

    Refresh all patches and drop 03_manpage.diff, merged upstream.
---
 debian/changelog                                   |  2 ++
 .../patches/02_disable-sources-in-sphinxdoc.diff   |  8 ++++----
 debian/patches/03_manpage.diff                     | 23 ----------------------
 .../06_use_debian_geoip_database_as_default.diff   |  8 ++++----
 debian/patches/series                              |  1 -
 5 files changed, 10 insertions(+), 32 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 78f9400..e5f9b9b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ python-django (1.8.1-1) UNRELEASED; urgency=medium
   * New major upstream release:
     https://docs.djangoproject.com/en/1.8/releases/1.8/
     https://docs.djangoproject.com/en/1.8/releases/1.8.1/
+  * Refresh all patches.
+  * Drop 03_manpage.diff, merged upstream.
 
  -- Raphaël Hertzog <hertzog at debian.org>  Wed, 20 May 2015 09:54:47 +0200
 
diff --git a/debian/patches/02_disable-sources-in-sphinxdoc.diff b/debian/patches/02_disable-sources-in-sphinxdoc.diff
index 0e00a13..b7b5ed3 100644
--- a/debian/patches/02_disable-sources-in-sphinxdoc.diff
+++ b/debian/patches/02_disable-sources-in-sphinxdoc.diff
@@ -9,15 +9,15 @@ Origin: vendor
 
 --- a/docs/conf.py
 +++ b/docs/conf.py
-@@ -196,7 +196,10 @@ html_additional_pages = {}
- #html_split_index = False
+@@ -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 = 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
+ # html_show_sphinx = True
diff --git a/debian/patches/03_manpage.diff b/debian/patches/03_manpage.diff
deleted file mode 100644
index b44b0a2..0000000
--- a/debian/patches/03_manpage.diff
+++ /dev/null
@@ -1,23 +0,0 @@
-Description: 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
-
---- 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 --git a/debian/patches/06_use_debian_geoip_database_as_default.diff b/debian/patches/06_use_debian_geoip_database_as_default.diff
index bfe3690..074f115 100644
--- a/debian/patches/06_use_debian_geoip_database_as_default.diff
+++ b/debian/patches/06_use_debian_geoip_database_as_default.diff
@@ -9,7 +9,7 @@ Author: Tapio Rantala <tapio.rantala at iki.fi>
 
 --- a/django/contrib/gis/geoip/base.py
 +++ b/django/contrib/gis/geoip/base.py
-@@ -67,7 +67,8 @@ class GeoIP(object):
+@@ -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
@@ -19,7 +19,7 @@ Author: Tapio Rantala <tapio.rantala at iki.fi>
  
          * 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):
+@@ -75,11 +76,13 @@ class GeoIP(object):
              settings,  respectively.  Defaults to 0, meaning that the data is read
              from the disk.
  
@@ -38,7 +38,7 @@ Author: Tapio Rantala <tapio.rantala at iki.fi>
          """
          # Checking the given cache option.
          if cache in self.cache_options:
-@@ -90,9 +93,7 @@ class GeoIP(object):
+@@ -89,9 +92,7 @@ class GeoIP(object):
  
          # Getting the GeoIP data path.
          if not path:
@@ -49,7 +49,7 @@ Author: Tapio Rantala <tapio.rantala at iki.fi>
          if not isinstance(path, six.string_types):
              raise TypeError('Invalid path type: %s' % type(path).__name__)
  
-@@ -105,7 +106,7 @@ class GeoIP(object):
+@@ -104,7 +105,7 @@ class GeoIP(object):
                  self._country = GeoIP_open(force_bytes(country_db), cache)
                  self._country_file = country_db
  
diff --git a/debian/patches/series b/debian/patches/series
index c73a668..9b1ddfc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 02_disable-sources-in-sphinxdoc.diff
-03_manpage.diff
 06_use_debian_geoip_database_as_default.diff

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-django.git