[Python-modules-commits] r24269 - in packages/python-django/trunk/debian (4 files)

[lfaraone at users.alioth.debian.org]

    Date: Thursday, May 9, 2013 @ 19:11:21
  Author: lfaraone
Revision: 24269

releasing version 1.5.1-2

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/python-django.docs

Modified: packages/python-django/trunk/debian/changelog
===================================================================
--- packages/python-django/trunk/debian/changelog	2013-05-09 18:36:16 UTC (rev 24268)
+++ packages/python-django/trunk/debian/changelog	2013-05-09 19:11:21 UTC (rev 24269)
@@ -1,9 +1,26 @@
-python-django (1.4.5-2) UNRELEASED; urgency=low
+python-django (1.5.1-2) unstable; urgency=low
 
+  [ Jakub Wilk ]
   * Use canonical URIs for Vcs-* fields.
 
- -- Jakub Wilk <jwilk at debian.org>  Sun, 05 May 2013 16:02:28 +0200
+  [ Luke Faraone ]
+  * Upload to unstable.
 
+ -- Luke Faraone <lfaraone at debian.org>  Thu, 09 May 2013 15:10:47 -0400
+
+python-django (1.5.1-1) experimental; urgency=low
+
+  * New upstream release.
+  * Add self to uploaders field.
+
+ -- Luke Faraone <lfaraone at debian.org>  Thu, 28 Mar 2013 17:17:10 -0400
+
+python-django (1.5-1) experimental; urgency=low
+
+  * New upstream release. Closes: #646634, #663230, #436983
+
+ -- Luke Faraone <lfaraone at debian.org>  Fri, 22 Mar 2013 17:52:30 -0400
+
 python-django (1.4.5-1) unstable; urgency=high
 
   * New upstream maintenance release dropping some undesired .pyc files

Modified: packages/python-django/trunk/debian/control
===================================================================
--- packages/python-django/trunk/debian/control	2013-05-09 18:36:16 UTC (rev 24268)
+++ packages/python-django/trunk/debian/control	2013-05-09 19:11:21 UTC (rev 24269)
@@ -2,7 +2,9 @@
 Section: python
 Priority: optional
 Maintainer: Chris Lamb <lamby at debian.org>
-Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>, Raphaël Hertzog <hertzog at debian.org>
+Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>,
+ Raphaël Hertzog <hertzog at debian.org>,
+ Luke Faraone <lfaraone at debian.org>
 Standards-Version: 3.9.3
 Build-Depends: debhelper (>= 7.0.50), python (>= 2.6.6-3~), python-sphinx (>= 1.0.8), locales (>= 0)
 Build-Depends-Indep: libjs-jquery

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	2013-05-09 18:36:16 UTC (rev 24268)
+++ packages/python-django/trunk/debian/patches/06_use_debian_geoip_database_as_default.diff	2013-05-09 19:11:21 UTC (rev 24269)
@@ -9,7 +9,7 @@
 
 --- a/django/contrib/gis/geoip/base.py
 +++ b/django/contrib/gis/geoip/base.py
-@@ -61,7 +61,8 @@ class GeoIP(object):
+@@ -63,7 +63,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
-@@ -70,11 +71,13 @@ class GeoIP(object):
+@@ -72,11 +73,13 @@
              settings,  respectively.  Defaults to 0, meaning that the data is read
              from the disk.
  
@@ -38,17 +38,17 @@
          """
          # Checking the given cache option.
          if cache in self.cache_options:
-@@ -84,8 +87,7 @@ class GeoIP(object):
+@@ -86,8 +89,7 @@
  
          # 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, basestring):
+         if not isinstance(path, six.string_types):
              raise TypeError('Invalid path type: %s' % type(path).__name__)
  
-@@ -98,7 +100,7 @@ class GeoIP(object):
+@@ -100,7 +102,7 @@
                  self._country = GeoIP_open(country_db, cache)
                  self._country_file = country_db
  

Modified: packages/python-django/trunk/debian/python-django.docs
===================================================================
--- packages/python-django/trunk/debian/python-django.docs	2013-05-09 18:36:16 UTC (rev 24268)
+++ packages/python-django/trunk/debian/python-django.docs	2013-05-09 19:11:21 UTC (rev 24269)
@@ -1,2 +1,2 @@
-README
+README.rst
 AUTHORS