[DebianGIS-dev] r1567 - in packages/gdal/trunk/debian: . patches

[frankie at alioth.debian.org]

Author: frankie
Date: 2008-05-06 14:51:46 +0000 (Tue, 06 May 2008)
New Revision: 1567

Added:
   packages/gdal/trunk/debian/patches/ogr.py.dpatch
Modified:
   packages/gdal/trunk/debian/changelog
   packages/gdal/trunk/debian/patches/00list
Log:
Fixing #473912


Modified: packages/gdal/trunk/debian/changelog
===================================================================
--- packages/gdal/trunk/debian/changelog	2008-04-30 12:47:20 UTC (rev 1566)
+++ packages/gdal/trunk/debian/changelog	2008-05-06 14:51:46 UTC (rev 1567)
@@ -1,3 +1,10 @@
+gdal (1.5.1-4) unstable; urgency=low
+
+  * [PATCH] ogr.py.dpatch added to manage #2187 upstream issue. Thanks Steko.
+    (closes: #473912)
+ 
+ -- Francesco Paolo Lovergine <frankie at debian.org>  Tue, 06 May 2008 16:48:29 +0200
+
 gdal (1.5.1-3) unstable; urgency=low
 
   * Removed old-python stuff still around in debian/rules.

Modified: packages/gdal/trunk/debian/patches/00list
===================================================================
--- packages/gdal/trunk/debian/patches/00list	2008-04-30 12:47:20 UTC (rev 1566)
+++ packages/gdal/trunk/debian/patches/00list	2008-05-06 14:51:46 UTC (rev 1567)
@@ -5,3 +5,4 @@
 man
 max
 pythonmakefile
+ogr.py

Added: packages/gdal/trunk/debian/patches/ogr.py.dpatch
===================================================================
--- packages/gdal/trunk/debian/patches/ogr.py.dpatch	                        (rev 0)
+++ packages/gdal/trunk/debian/patches/ogr.py.dpatch	2008-05-06 14:51:46 UTC (rev 1567)
@@ -0,0 +1,58 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## ogr.py.dpatch by Francesco Paolo Lovergine <frankie at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad gdal-1.5.1~/swig/python/osgeo/ogr.py gdal-1.5.1/swig/python/osgeo/ogr.py
+--- gdal-1.5.1~/swig/python/osgeo/ogr.py	2008-04-19 19:46:19.000000000 +0200
++++ gdal-1.5.1/swig/python/osgeo/ogr.py	2008-05-06 16:50:37.000000000 +0200
+@@ -6,6 +6,8 @@
+ 
+ import _ogr
+ import new
++import types
++
+ new_instancemethod = new.instancemethod
+ try:
+     _swig_property = property
+@@ -38,14 +40,12 @@
+     except: strthis = ""
+     return "<%s.%s; %s >" % (self.__class__.__module__, self.__class__.__name__, strthis,)
+ 
+-import types
+ try:
+     _object = types.ObjectType
+     _newclass = 1
+ except AttributeError:
+     class _object : pass
+     _newclass = 0
+-del types
+ 
+ 
+ wkb25Bit = _ogr.wkb25Bit
+@@ -561,7 +561,6 @@
+     ] would return the first layer on the datasource.
+     aname'] would return the layer named "aname".
+     :4] would return a list of the first four layers."""
+-        import types
+         if isinstance(value, types.SliceType):
+             output = []
+             for i in xrange(value.start,value.stop,value.step):
+@@ -581,7 +580,6 @@
+ 
+     def GetLayer(self,iLayer=0):
+         """Return the layer given an index or a name"""
+-        import types
+         if isinstance(iLayer, types.StringTypes):
+             return self.GetLayerByName(str(iLayer))
+         elif isinstance(iLayer, types.IntType):
+@@ -1829,7 +1827,6 @@
+             raise AttributeError, name
+ 
+     def GetField(self, fld_index):
+-        import types
+         if isinstance(fld_index, types.StringType):
+             fld_index = self.GetFieldIndex(fld_index)
+         if (fld_index < 0) or (fld_index > self.GetFieldCount()):


Property changes on: packages/gdal/trunk/debian/patches/ogr.py.dpatch
___________________________________________________________________
Name: svn:executable
   + *