[Python-modules-commits] r23794 - in packages/python-django/branches/experimental/debian (3 files)

[lfaraone at users.alioth.debian.org]

    Date: Monday, March 25, 2013 @ 21:02:12
  Author: lfaraone
Revision: 23794

releasing version 1.5-1

Modified:
  packages/python-django/branches/experimental/debian/changelog
  packages/python-django/branches/experimental/debian/patches/06_use_debian_geoip_database_as_default.diff
  packages/python-django/branches/experimental/debian/python-django.docs

Modified: packages/python-django/branches/experimental/debian/changelog
===================================================================
--- packages/python-django/branches/experimental/debian/changelog	2013-03-25 21:01:05 UTC (rev 23793)
+++ packages/python-django/branches/experimental/debian/changelog	2013-03-25 21:02:12 UTC (rev 23794)
@@ -1,3 +1,9 @@
+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/branches/experimental/debian/patches/06_use_debian_geoip_database_as_default.diff
===================================================================
--- packages/python-django/branches/experimental/debian/patches/06_use_debian_geoip_database_as_default.diff	2013-03-25 21:01:05 UTC (rev 23793)
+++ packages/python-django/branches/experimental/debian/patches/06_use_debian_geoip_database_as_default.diff	2013-03-25 21:02:12 UTC (rev 23794)
@@ -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/branches/experimental/debian/python-django.docs
===================================================================
--- packages/python-django/branches/experimental/debian/python-django.docs	2013-03-25 21:01:05 UTC (rev 23793)
+++ packages/python-django/branches/experimental/debian/python-django.docs	2013-03-25 21:02:12 UTC (rev 23794)
@@ -1,2 +1,2 @@
-README
+README.rst
 AUTHORS