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

[frankie at alioth.debian.org]

Author: frankie
Date: 2007-05-18 21:12:04 +0000 (Fri, 18 May 2007)
New Revision: 842

Added:
   packages/gdal/trunk/debian/patches/gcc43.dpatch
Modified:
   packages/gdal/trunk/debian/changelog
   packages/gdal/trunk/debian/control
   packages/gdal/trunk/debian/patches/00list
Log:
Multiple fixes


Modified: packages/gdal/trunk/debian/changelog
===================================================================
--- packages/gdal/trunk/debian/changelog	2007-05-18 14:20:31 UTC (rev 841)
+++ packages/gdal/trunk/debian/changelog	2007-05-18 21:12:04 UTC (rev 842)
@@ -1,3 +1,14 @@
+gdal (1.4.1-6) unstable; urgency=low
+
+  * New patch gcc43.dpatch, to be compliant with gcc 4.3. Thanks Martin Michlmayr.
+    (closes: #419827)
+  * Revised libgdal1-dev dependencies due to libtool .la file. Thanks Kurt Roeckx.
+    (closes: #421992)
+  * Removed fake libsqlite0-dev build-dep.
+  * Explicitly removing libtool .libs dir in clean target.
+
+ -- Francesco Paolo Lovergine <frankie at debian.org>  Fri, 18 May 2007 22:28:24 +0200
+
 gdal (1.4.1-5) unstable; urgency=low
 
   * libcfitsio3 library is now GPL on Debian, so disabled due to incompatibility with GDAL copyright.

Modified: packages/gdal/trunk/debian/control
===================================================================
--- packages/gdal/trunk/debian/control	2007-05-18 14:20:31 UTC (rev 841)
+++ packages/gdal/trunk/debian/control	2007-05-18 21:12:04 UTC (rev 842)
@@ -6,9 +6,8 @@
 Build-Depends: debhelper (>= 5.0.37.2), zlib1g-dev, netcdfg-dev,
  libtiff4-dev, libjasper-dev|libjasper-1.701-dev, libpng12-dev, libjpeg62-dev, libungif4-dev,
  libhdf4g-dev, libhdf5-serial-dev, libpq-dev | postgresql-dev, libxerces27-dev, unixodbc-dev (>=2.2.11), 
- libsqlite0-dev, python-dev, python-numeric, doxygen, d-shlibs,
- libgeos-dev, dpatch, libmysqlclient15-dev, python-all-dev (>= 2.3.5-11), python-central (>=0.5), 
- libcurl4-dev|libcurl-dev, libsqlite3-dev, libogdi3.2-dev
+ python-dev, python-numeric, doxygen, d-shlibs, libgeos-dev, dpatch, libmysqlclient15-dev, python-all-dev (>= 2.3.5-11), 
+ python-central (>=0.5), libcurl4-dev|libcurl-dev, libsqlite3-dev, libogdi3.2-dev
 Standards-Version: 3.7.2
 XS-Python-Version: all
 
@@ -45,8 +44,8 @@
 Architecture: any
 Depends: libgdal1-1.4.0 (=${Source-Version}), libc6-dev, netcdfg-dev, libtiff4-dev, 
  libjasper-dev|libjasper-1.701-dev, libpng12-dev, libjpeg62-dev, libungif4-dev, libhdf4g-dev, 
- libpq-dev | postgresql-dev, libxerces27-dev, unixodbc-dev, libsqlite0-dev, libgeos-dev,
- libmysqlclient15-dev, libhdf5-serial-dev
+ libpq-dev | postgresql-dev, libxerces27-dev, unixodbc-dev, libsqlite3-dev, libgeos-dev,
+ libmysqlclient15-dev, libhdf5-serial-dev, libltdl3-dev, libcurl4-dev|libcurl-dev
 Suggests: libgdal-doc
 Provides: libgdal-dev
 Replaces: libgdal1-1.3.1-dev, libgdal1-1.3.2-dev

Modified: packages/gdal/trunk/debian/patches/00list
===================================================================
--- packages/gdal/trunk/debian/patches/00list	2007-05-18 14:20:31 UTC (rev 841)
+++ packages/gdal/trunk/debian/patches/00list	2007-05-18 21:12:04 UTC (rev 842)
@@ -2,3 +2,4 @@
 ogdi
 swig
 doc
+gcc43

Added: packages/gdal/trunk/debian/patches/gcc43.dpatch
===================================================================
--- packages/gdal/trunk/debian/patches/gcc43.dpatch	                        (rev 0)
+++ packages/gdal/trunk/debian/patches/gcc43.dpatch	2007-05-18 21:12:04 UTC (rev 842)
@@ -0,0 +1,29 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## gcc43.dpatch by Francesco Paolo Lovergine <frankie at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Patch to be compliant with gcc 4.3
+
+ at DPATCH@
+diff -urNad gdal-1.4.1~/frmts/idrisi/IdrisiDataset.cpp gdal-1.4.1/frmts/idrisi/IdrisiDataset.cpp
+--- gdal-1.4.1~/frmts/idrisi/IdrisiDataset.cpp	2007-04-10 17:15:19.000000000 +0200
++++ gdal-1.4.1/frmts/idrisi/IdrisiDataset.cpp	2007-05-18 22:14:49.000000000 +0200
+@@ -34,6 +34,7 @@
+ #include "ogr_spatialref.h"
+ #include "gdal_pam.h"
+ #include "gdal_alg.h"
++#include <climits>
+ 
+ CPL_CVSID("$Id: IdrisiDataset.cpp 10646 2007-01-18 02:38:10Z warmerdam $");
+ 
+diff -urNad gdal-1.4.1~/frmts/ilwis/ilwisdataset.cpp gdal-1.4.1/frmts/ilwis/ilwisdataset.cpp
+--- gdal-1.4.1~/frmts/ilwis/ilwisdataset.cpp	2007-04-10 17:15:31.000000000 +0200
++++ gdal-1.4.1/frmts/ilwis/ilwisdataset.cpp	2007-05-18 22:14:31.000000000 +0200
+@@ -29,6 +29,7 @@
+ 
+ #include "ilwisdataset.h"
+ #include <float.h>
++#include <climits>
+ 
+ // IniFile.cpp: implementation of the IniFile class.
+ //


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