Author: frankie
Date: 2009-05-20 21:06:03 +0000 (Wed, 20 May 2009)
New Revision: 2225
Removed:
packages/gdal/trunk/debian/patches/mysql5.1.dpatch
packages/gdal/trunk/debian/patches/swig1338.dpatch
Modified:
packages/gdal/trunk/debian/changelog
packages/gdal/trunk/debian/patches/00list
Log:
Remove unuseful/wrong patches for 1.6.1
Modified: packages/gdal/trunk/debian/changelog
===================================================================
--- packages/gdal/trunk/debian/changelog 2009-05-20 17:34:36 UTC (rev
2224)
+++ packages/gdal/trunk/debian/changelog 2009-05-20 21:06:03 UTC (rev
2225)
@@ -1,3 +1,9 @@
+gdal (1.6.1-2) experimental; urgency=low
+
+ * Removed superfluous patches, applied upstream: mysql5.1, swig1338
+
+ -- Francesco Paolo Lovergine <fran...@debian.org> Tue, 19 May 2009 15:35:02
+0200
+
gdal (1.6.1-1) experimental; urgency=low
* New upstream release with many fixes.
Modified: packages/gdal/trunk/debian/patches/00list
===================================================================
--- packages/gdal/trunk/debian/patches/00list 2009-05-20 17:34:36 UTC (rev
2224)
+++ packages/gdal/trunk/debian/patches/00list 2009-05-20 21:06:03 UTC (rev
2225)
@@ -7,5 +7,3 @@
python
doxygen
hdf4
-mysql5.1
-swig1338
Deleted: packages/gdal/trunk/debian/patches/mysql5.1.dpatch
===================================================================
--- packages/gdal/trunk/debian/patches/mysql5.1.dpatch 2009-05-20 17:34:36 UTC
(rev 2224)
+++ packages/gdal/trunk/debian/patches/mysql5.1.dpatch 2009-05-20 21:06:03 UTC
(rev 2225)
@@ -1,23 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## mysql5.1.dpatch by Francesco Paolo Lovergine <fran...@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
-...@dpatch@
-diff -urNad gdal-1.6.0~/ogr/ogrsf_frmts/mysql/ogr_mysql.h
gdal-1.6.0/ogr/ogrsf_frmts/mysql/ogr_mysql.h
---- gdal-1.6.0~/ogr/ogrsf_frmts/mysql/ogr_mysql.h 2008-10-23
00:04:33.000000000 +0000
-+++ gdal-1.6.0/ogr/ogrsf_frmts/mysql/ogr_mysql.h 2009-05-12
21:22:04.000000000 +0000
-@@ -31,8 +31,12 @@
- #ifndef _OGR_MYSQL_H_INCLUDED
- #define _OGR_MYSQL_H_INCLUDED
-
-+#define max
-+#define min
- #include <my_global.h>
- #include <mysql.h>
-+#undef min
-+#undef max
-
- #ifdef bool
- #undef bool
Deleted: packages/gdal/trunk/debian/patches/swig1338.dpatch
===================================================================
--- packages/gdal/trunk/debian/patches/swig1338.dpatch 2009-05-20 17:34:36 UTC
(rev 2224)
+++ packages/gdal/trunk/debian/patches/swig1338.dpatch 2009-05-20 21:06:03 UTC
(rev 2225)
@@ -1,22 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## swig1338.dpatch by Francesco Paolo Lovergine <fran...@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
-...@dpatch@
-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);
-+%#if SWIG_VERSION <= 0x010337
- PySwigObject *sobj = SWIG_Python_GetSwigThis(o);
-+%#else
-+ SwigPyObject *sobj = SWIG_Python_GetSwigThis(o);
-+%#endif
- type* rawobjectpointer = NULL;
- if (!sobj) {
- SWIG_fail;
_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
