Author: frankie Date: 2008-06-10 12:44:37 +0000 (Tue, 10 Jun 2008) New Revision: 1611
Added: packages/gdal/trunk/debian/ogr.py.diff packages/gdal/trunk/debian/patches/pythonmakefile.dpatch Removed: packages/gdal/trunk/debian/ogr.py.diff packages/gdal/trunk/debian/patches/max.dpatch packages/gdal/trunk/debian/patches/pythonmakefile.dpatch Modified: packages/gdal/trunk/debian/changelog packages/gdal/trunk/debian/patches/00list packages/gdal/trunk/debian/rules Log: New upstream version Modified: packages/gdal/trunk/debian/changelog =================================================================== --- packages/gdal/trunk/debian/changelog 2008-06-09 20:54:54 UTC (rev 1610) +++ packages/gdal/trunk/debian/changelog 2008-06-10 12:44:37 UTC (rev 1611) @@ -1,8 +1,10 @@ -gdal (1.5.1-6) UNRELEASED; urgency=low +gdal (1.5.2-1) unstable; urgency=low - * NOT RELEASED YET + * New upstream release. This is a bug fix release. + (closes: #485582) + * Patchset updated: removed max.dpatch, merged upstream - -- Francesco Paolo Lovergine <[EMAIL PROTECTED]> Sat, 07 Jun 2008 09:31:27 +0200 + -- Francesco Paolo Lovergine <[EMAIL PROTECTED]> Tue, 10 Jun 2008 14:43:06 +0200 gdal (1.5.1-5) unstable; urgency=low Deleted: packages/gdal/trunk/debian/ogr.py.diff =================================================================== --- packages/gdal/trunk/debian/ogr.py.diff 2008-06-09 20:54:54 UTC (rev 1610) +++ packages/gdal/trunk/debian/ogr.py.diff 2008-06-10 12:44:37 UTC (rev 1611) @@ -1,54 +0,0 @@ -This is a patch suggested in #473912 (i.e. fix for upstream bug #2187). -It is merged in 1.5.2 AFAIK. - -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()): Added: packages/gdal/trunk/debian/ogr.py.diff =================================================================== --- packages/gdal/trunk/debian/ogr.py.diff (rev 0) +++ packages/gdal/trunk/debian/ogr.py.diff 2008-06-10 12:44:37 UTC (rev 1611) @@ -0,0 +1,54 @@ +This is a patch suggested in #473912 (i.e. fix for upstream bug #2187). +It is merged in 1.5.2 AFAIK. + +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()): Modified: packages/gdal/trunk/debian/patches/00list =================================================================== --- packages/gdal/trunk/debian/patches/00list 2008-06-09 20:54:54 UTC (rev 1610) +++ packages/gdal/trunk/debian/patches/00list 2008-06-10 12:44:37 UTC (rev 1611) @@ -3,6 +3,5 @@ doc rubymakefile man -max pythonmakefile gdalpaths Deleted: packages/gdal/trunk/debian/patches/max.dpatch =================================================================== --- packages/gdal/trunk/debian/patches/max.dpatch 2008-06-09 20:54:54 UTC (rev 1610) +++ packages/gdal/trunk/debian/patches/max.dpatch 2008-06-10 12:44:37 UTC (rev 1611) @@ -1,114 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## max.dpatch by Francesco Paolo Lovergine <[EMAIL PROTECTED]> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. - [EMAIL PROTECTED]@ -diff -urNad gdal-1.5.1~/ogr/ogrsf_frmts/geojson/jsonc/arraylist.c gdal-1.5.1/ogr/ogrsf_frmts/geojson/jsonc/arraylist.c ---- gdal-1.5.1~/ogr/ogrsf_frmts/geojson/jsonc/arraylist.c 2007-11-07 05:00:48.000000000 +0100 -+++ gdal-1.5.1/ogr/ogrsf_frmts/geojson/jsonc/arraylist.c 2008-04-07 13:26:42.000000000 +0200 -@@ -23,6 +23,8 @@ - #include "bits.h" - #include "arraylist.h" - -+#include <cpl_port.h> /* MIN and MAX macros */ -+ - struct array_list* - array_list_new(array_list_free_fn *free_fn) - { -@@ -62,7 +64,7 @@ - int new_size; - - if(max < this->size) return 0; -- new_size = max(this->size << 1, max); -+ new_size = MAX(this->size << 1, max); - if(!(t = realloc(this->array, new_size*sizeof(void*)))) return -1; - this->array = t; - (void)memset(this->array + this->size, 0, (new_size-this->size)*sizeof(void*)); -diff -urNad gdal-1.5.1~/ogr/ogrsf_frmts/geojson/jsonc/bits.h gdal-1.5.1/ogr/ogrsf_frmts/geojson/jsonc/bits.h ---- gdal-1.5.1~/ogr/ogrsf_frmts/geojson/jsonc/bits.h 2007-11-07 05:00:48.000000000 +0100 -+++ gdal-1.5.1/ogr/ogrsf_frmts/geojson/jsonc/bits.h 2008-04-07 13:25:45.000000000 +0200 -@@ -12,14 +12,6 @@ - #ifndef _bits_h_ - #define _bits_h_ - --#ifndef min --#define min(a,b) ((a) < (b) ? (a) : (b)) --#endif -- --#ifndef max --#define max(a,b) ((a) > (b) ? (a) : (b)) --#endif -- - #define hexdigit(x) (((x) <= '9') ? (x) - '0' : ((x) & 7) + 9) - #define error_ptr(error) ((void*)error) - #define is_error(ptr) ((unsigned long)ptr > (unsigned long)-4000L) -diff -urNad gdal-1.5.1~/ogr/ogrsf_frmts/geojson/jsonc/json_tokener.c gdal-1.5.1/ogr/ogrsf_frmts/geojson/jsonc/json_tokener.c ---- gdal-1.5.1~/ogr/ogrsf_frmts/geojson/jsonc/json_tokener.c 2007-11-07 12:51:17.000000000 +0100 -+++ gdal-1.5.1/ogr/ogrsf_frmts/geojson/jsonc/json_tokener.c 2008-04-07 13:30:21.000000000 +0200 -@@ -23,6 +23,7 @@ - #include "json_object.h" - #include "json_tokener.h" - -+#include <cpl_port.h> /* MIN and MAX macros */ - - #if !HAVE_STRNCASECMP && defined(_MSC_VER) - /* MSC has the version as _strnicmp */ -@@ -106,7 +107,7 @@ - { - if(str) { - size_t len = strlen(str); -- size_t nn = min(len,n); -+ size_t nn = MIN(len,n); - char* s = (char*)malloc(sizeof(char) * (nn + 1)); - - if(s) { -@@ -230,7 +231,7 @@ - case json_tokener_state_null: - printbuf_memappend(tok->pb, &c, 1); - if(strncasecmp(json_null_str, tok->pb->buf, -- min(tok->st_pos+1, strlen(json_null_str))) == 0) { -+ MIN(tok->st_pos+1, strlen(json_null_str))) == 0) { - if(tok->st_pos == strlen(json_null_str)) { - current = NULL; - saved_state = json_tokener_state_finish; -@@ -351,7 +352,7 @@ - case json_tokener_state_boolean: - printbuf_memappend(tok->pb, &c, 1); - if(strncasecmp(json_true_str, tok->pb->buf, -- min(tok->st_pos+1, strlen(json_true_str))) == 0) { -+ MIN(tok->st_pos+1, strlen(json_true_str))) == 0) { - if(tok->st_pos == strlen(json_true_str)) { - current = json_object_new_boolean(1); - saved_state = json_tokener_state_finish; -@@ -359,7 +360,7 @@ - goto redo_char; - } - } else if(strncasecmp(json_false_str, tok->pb->buf, -- min(tok->st_pos+1, strlen(json_false_str))) == 0) { -+ MIN(tok->st_pos+1, strlen(json_false_str))) == 0) { - if(tok->st_pos == strlen(json_false_str)) { - current = json_object_new_boolean(0); - saved_state = json_tokener_state_finish; -diff -urNad gdal-1.5.1~/ogr/ogrsf_frmts/geojson/jsonc/printbuf.c gdal-1.5.1/ogr/ogrsf_frmts/geojson/jsonc/printbuf.c ---- gdal-1.5.1~/ogr/ogrsf_frmts/geojson/jsonc/printbuf.c 2007-12-02 19:32:25.000000000 +0100 -+++ gdal-1.5.1/ogr/ogrsf_frmts/geojson/jsonc/printbuf.c 2008-04-07 13:27:06.000000000 +0200 -@@ -28,6 +28,8 @@ - - #include "cpl_string.h" - -+#include <cpl_port.h> /* MIN and MAX macros */ -+ - struct printbuf* printbuf_new() - { - struct printbuf *p; -@@ -47,7 +49,7 @@ - { - char *t; - if(p->size - p->bpos <= size) { -- int new_size = max(p->size * 2, p->bpos + size + 8); -+ int new_size = MAX(p->size * 2, p->bpos + size + 8); - #ifdef PRINTBUF_DEBUG - mc_debug("printbuf_memappend: realloc " - "bpos=%d wrsize=%d old_size=%d new_size=%d\n", Deleted: packages/gdal/trunk/debian/patches/pythonmakefile.dpatch =================================================================== --- packages/gdal/trunk/debian/patches/pythonmakefile.dpatch 2008-06-09 20:54:54 UTC (rev 1610) +++ packages/gdal/trunk/debian/patches/pythonmakefile.dpatch 2008-06-10 12:44:37 UTC (rev 1611) @@ -1,19 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## python.dpatch by Francesco Paolo Lovergine <[EMAIL PROTECTED]> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. - [EMAIL PROTECTED]@ -diff -urNad gdal-1.5.1~/swig/python/GNUmakefile gdal-1.5.1/swig/python/GNUmakefile ---- gdal-1.5.1~/swig/python/GNUmakefile 2008-04-19 13:12:54.000000000 +0200 -+++ gdal-1.5.1/swig/python/GNUmakefile 2008-04-19 13:21:27.000000000 +0200 -@@ -2,7 +2,7 @@ - - include ../../GDALmake.opt - --ifndef $(PYTHON) -+ifndef PYTHON - PYTHON=python - endif - Added: packages/gdal/trunk/debian/patches/pythonmakefile.dpatch =================================================================== --- packages/gdal/trunk/debian/patches/pythonmakefile.dpatch (rev 0) +++ packages/gdal/trunk/debian/patches/pythonmakefile.dpatch 2008-06-10 12:44:37 UTC (rev 1611) @@ -0,0 +1,19 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## python.dpatch by Francesco Paolo Lovergine <[EMAIL PROTECTED]> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + [EMAIL PROTECTED]@ +diff -urNad gdal-1.5.1~/swig/python/GNUmakefile gdal-1.5.1/swig/python/GNUmakefile +--- gdal-1.5.1~/swig/python/GNUmakefile 2008-04-19 13:12:54.000000000 +0200 ++++ gdal-1.5.1/swig/python/GNUmakefile 2008-04-19 13:21:27.000000000 +0200 +@@ -2,7 +2,7 @@ + + include ../../GDALmake.opt + +-ifndef $(PYTHON) ++ifndef PYTHON + PYTHON=python + endif + Modified: packages/gdal/trunk/debian/rules =================================================================== --- packages/gdal/trunk/debian/rules 2008-06-09 20:54:54 UTC (rev 1610) +++ packages/gdal/trunk/debian/rules 2008-06-10 12:44:37 UTC (rev 1611) @@ -74,6 +74,7 @@ $(MAKE) -C $(CURDIR)/swig/python clean; \ $(MAKE) -C $(CURDIR)/swig/python generate build; \ $(MAKE) -C $(CURDIR)/swig/python install DESTDIR=$(CURDIR)/debian/python-tmp; \ + echo "Patching ogr.py" ; \ patch $(CURDIR)/debian/python-tmp/usr/lib/python$$V/site-packages/osgeo/ogr.py $(CURDIR)/debian/ogr.py.diff; \ done $(MAKE) docs _______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel