[DebianGIS-dev] r2212 - in packages/gdal/branches/1.5/debian: . patches

[frankie at alioth.debian.org]

Author: frankie
Date: 2009-05-18 21:17:20 +0000 (Mon, 18 May 2009)
New Revision: 2212

Added:
   packages/gdal/branches/1.5/debian/patches/mysql5.1.dpatch
Modified:
   packages/gdal/branches/1.5/debian/changelog
   packages/gdal/branches/1.5/debian/patches/00list
Log:
Fixed musql to build on sparc


Modified: packages/gdal/branches/1.5/debian/changelog
===================================================================
--- packages/gdal/branches/1.5/debian/changelog	2009-05-18 11:03:29 UTC (rev 2211)
+++ packages/gdal/branches/1.5/debian/changelog	2009-05-18 21:17:20 UTC (rev 2212)
@@ -1,9 +1,10 @@
 gdal (1.5.4-4) unstable; urgency=low
 
-  * NOT RELEASED YET
   * Changed section to ruby for ruby-related packages.
+  * Added missing libproj-dev dependency.
+  * Backported mysql5.1 patch to fix building with recent libmysqlclient.
 
- -- Francesco Paolo Lovergine <frankie at debian.org>  Fri, 10 Apr 2009 17:57:09 +0200
+ -- Francesco Paolo Lovergine <frankie at debian.org>  Mon, 18 May 2009 23:16:05 +0200
 
 gdal (1.5.4-3) unstable; urgency=low
 

Modified: packages/gdal/branches/1.5/debian/patches/00list
===================================================================
--- packages/gdal/branches/1.5/debian/patches/00list	2009-05-18 11:03:29 UTC (rev 2211)
+++ packages/gdal/branches/1.5/debian/patches/00list	2009-05-18 21:17:20 UTC (rev 2212)
@@ -4,3 +4,4 @@
 rubymakefile
 man
 gdalpaths
+mysql5.1

Added: packages/gdal/branches/1.5/debian/patches/mysql5.1.dpatch
===================================================================
--- packages/gdal/branches/1.5/debian/patches/mysql5.1.dpatch	                        (rev 0)
+++ packages/gdal/branches/1.5/debian/patches/mysql5.1.dpatch	2009-05-18 21:17:20 UTC (rev 2212)
@@ -0,0 +1,23 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## mysql5.1.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.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


Property changes on: packages/gdal/branches/1.5/debian/patches/mysql5.1.dpatch
___________________________________________________________________
Added: svn:executable
   + *