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

frankie at alioth.debian.org frankie at alioth.debian.org
Mon May 18 11:02:38 UTC 2009


Author: frankie
Date: 2009-05-18 11:02:37 +0000 (Mon, 18 May 2009)
New Revision: 2210

Modified:
   packages/gdal/trunk/debian/changelog
   packages/gdal/trunk/debian/patches/doxygen.dpatch
   packages/gdal/trunk/debian/patches/swig1338.dpatch
Log:
New upstream version.


Modified: packages/gdal/trunk/debian/changelog
===================================================================
--- packages/gdal/trunk/debian/changelog	2009-05-15 18:52:06 UTC (rev 2209)
+++ packages/gdal/trunk/debian/changelog	2009-05-18 11:02:37 UTC (rev 2210)
@@ -1,3 +1,11 @@
+gdal (1.6.1-1) experimental; urgency=low
+
+  * NOT RELEASED YET
+  * New upstream release with many fixes.
+  * Updated patches: doxygen.
+
+ -- Francesco Paolo Lovergine <frankie at debian.org>  Mon, 18 May 2009 12:03:30 +0200
+
 gdal (1.6.0-4) experimental; urgency=low
 
   * NOT RELEASED.

Modified: packages/gdal/trunk/debian/patches/doxygen.dpatch
===================================================================
--- packages/gdal/trunk/debian/patches/doxygen.dpatch	2009-05-15 18:52:06 UTC (rev 2209)
+++ packages/gdal/trunk/debian/patches/doxygen.dpatch	2009-05-18 11:02:37 UTC (rev 2210)
@@ -5,15 +5,15 @@
 ## DP: No description.
 
 @DPATCH@
-diff -urNad gdal-1.6.0~/GNUmakefile gdal-1.6.0/GNUmakefile
---- gdal-1.6.0~/GNUmakefile	2009-02-09 17:29:22.000000000 +0100
-+++ gdal-1.6.0/GNUmakefile	2009-02-09 17:30:51.000000000 +0100
+diff -urNad gdal-1.6.1~/GNUmakefile gdal-1.6.1/GNUmakefile
+--- gdal-1.6.1~/GNUmakefile	2009-05-18 12:01:24.000000000 +0200
++++ gdal-1.6.1/GNUmakefile	2009-05-18 12:03:15.000000000 +0200
 @@ -146,7 +146,7 @@
  
  man:
  # Generate man pages
--	(cat Doxyfile ; echo "ENABLED_SECTIONS=man"; echo "INPUT=doc ogr"; echo "FILE_PATTERNS=*utilities.dox"; echo "GENERATE_HTML=NO"; echo "GENERATE_MAN=YES") | doxygen -
-+	(cat Doxyfile ; echo "ENABLED_SECTIONS=man"; echo "INPUT=doc ogr apps swig/python/scripts"; echo "FILE_PATTERNS=*.cpp *.dox"; echo "GENERATE_HTML=NO"; echo "GENERATE_MAN=YES") | doxygen - 
+-	(cat Doxyfile ; echo "ENABLED_SECTIONS=man"; echo "INPUT=doc ogr apps"; echo "FILE_PATTERNS=*utilities.dox gdalwarp.cpp"; echo "GENERATE_HTML=NO"; echo "GENERATE_MAN=YES") | doxygen -
++	(cat Doxyfile ; echo "ENABLED_SECTIONS=man"; echo "INPUT=doc ogr apps swig/pyhton/scripts"; echo "FILE_PATTERNS=*.dox *.cpp"; echo "GENERATE_HTML=NO"; echo "GENERATE_MAN=YES") | doxygen -
  
  all:	default ogr-all
  

Modified: packages/gdal/trunk/debian/patches/swig1338.dpatch
===================================================================
--- packages/gdal/trunk/debian/patches/swig1338.dpatch	2009-05-15 18:52:06 UTC (rev 2209)
+++ packages/gdal/trunk/debian/patches/swig1338.dpatch	2009-05-18 11:02:37 UTC (rev 2210)
@@ -5,10 +5,10 @@
 ## DP: No description.
 
 @DPATCH@
-diff -urNad gdal-1.6.0~/swig/include/python/typemaps_python.i gdal-1.6.0/swig/include/python/typemaps_python.i
---- gdal-1.6.0~/swig/include/python/typemaps_python.i	2008-09-22 00:52:46.000000000 +0200
-+++ gdal-1.6.0/swig/include/python/typemaps_python.i	2009-04-15 16:58:36.000000000 +0200
-@@ -877,7 +877,11 @@
+diff -urNad gdal-1.6.1~/swig/include/python/typemaps_python.i gdal-1.6.1/swig/include/python/typemaps_python.i
+--- gdal-1.6.1~/swig/include/python/typemaps_python.i	2009-05-18 12:03:54.000000000 +0200
++++ gdal-1.6.1/swig/include/python/typemaps_python.i	2009-05-18 12:04:09.000000000 +0200
+@@ -939,7 +939,11 @@
    for( int i = 0; i<$1; i++ ) {
  
        PyObject *o = PySequence_GetItem($input,i);
@@ -18,5 +18,5 @@
 +      SwigPyObject *sobj = SWIG_Python_GetSwigThis(o);
 +%#endif
        type* rawobjectpointer = NULL;
-       if (sobj) {
-           Py_DECREF(sobj);
+       if (!sobj) {
+           SWIG_fail;




More information about the Pkg-grass-devel mailing list