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

[Francesco Lovergine]

Author: frankie
Date: 2007-04-26 09:26:58 +0000 (Thu, 26 Apr 2007)
New Revision: 783

Modified:
   packages/gdal/trunk/debian/changelog
   packages/gdal/trunk/debian/control
   packages/gdal/trunk/debian/patches/ogdi.dpatch
   packages/gdal/trunk/debian/rules
Log:
Fixing libgdal1-dev dependencies and adding OGDI


Modified: packages/gdal/trunk/debian/changelog
===================================================================
--- packages/gdal/trunk/debian/changelog	2007-04-26 09:21:30 UTC (rev 782)
+++ packages/gdal/trunk/debian/changelog	2007-04-26 09:26:58 UTC (rev 783)
@@ -1,8 +1,9 @@
 gdal (1.4.1-3) UNRELEASED; urgency=low
 
-  * Added OGDI support: new patch ogdi.dpatch 
+  * Added OGDI support: new patch ogdi.dpatch
+  * Added a couple of missing dependencies to libgdal1-dev.
 
- -- Francesco Paolo Lovergine <frankie at debian.org>  Tue, 24 Apr 2007 10:08:25 +0200
+ -- Francesco Paolo Lovergine <frankie at debian.org>  Thu, 26 Apr 2007 11:25:37 +0200
 
 gdal (1.4.1-2) unstable; urgency=high
 

Modified: packages/gdal/trunk/debian/control
===================================================================
--- packages/gdal/trunk/debian/control	2007-04-26 09:21:30 UTC (rev 782)
+++ packages/gdal/trunk/debian/control	2007-04-26 09:26:58 UTC (rev 783)
@@ -43,7 +43,10 @@
 Package: libgdal1-dev
 Section: libdevel
 Architecture: any
-Depends: libgdal1-1.4.0 (=${Source-Version}), libc6-dev, libcfitsio-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
+Depends: libgdal1-1.4.0 (=${Source-Version}), libc6-dev, libcfitsio-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, libsqlite3-dev, libhdf5-serial-dev
 Suggests: libgdal-doc
 Provides: libgdal-dev
 Replaces: libgdal1-1.3.1-dev, libgdal1-1.3.2-dev

Modified: packages/gdal/trunk/debian/patches/ogdi.dpatch
===================================================================
--- packages/gdal/trunk/debian/patches/ogdi.dpatch	2007-04-26 09:21:30 UTC (rev 782)
+++ packages/gdal/trunk/debian/patches/ogdi.dpatch	2007-04-26 09:26:58 UTC (rev 783)
@@ -5,9 +5,21 @@
 ## DP: No description.
 
 @DPATCH@
+diff -urNad gdal-1.4.1~/GDALmake.opt.in gdal-1.4.1/GDALmake.opt.in
+--- gdal-1.4.1~/GDALmake.opt.in	2007-04-24 12:46:08.000000000 +0200
++++ gdal-1.4.1/GDALmake.opt.in	2007-04-24 12:46:56.000000000 +0200
+@@ -275,7 +275,7 @@
+ # PCRaster support
+ PCRASTER_SETTING	=	@PCRASTER_SETTING@
+ 
+-OGDI_INCLUDE	=	@OGDI_INCLUDE@
++OGDI_INCLUDE	=	-I/usr/include/ogdi
+ 
+ PNG_SETTING     =	@PNG_SETTING@
+ JPEG_SETTING	=	@JPEG_SETTING@
 diff -urNad gdal-1.4.1~/configure gdal-1.4.1/configure
---- gdal-1.4.1~/configure	2007-04-10 17:16:54.000000000 +0200
-+++ gdal-1.4.1/configure	2007-04-24 10:04:18.000000000 +0200
+--- gdal-1.4.1~/configure	2007-04-24 12:45:54.000000000 +0200
++++ gdal-1.4.1/configure	2007-04-24 12:46:10.000000000 +0200
 @@ -23968,7 +23968,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else

Modified: packages/gdal/trunk/debian/rules
===================================================================
--- packages/gdal/trunk/debian/rules	2007-04-26 09:21:30 UTC (rev 782)
+++ packages/gdal/trunk/debian/rules	2007-04-26 09:26:58 UTC (rev 783)
@@ -31,6 +31,7 @@
 			--with-sqlite \
 			--with-curl \
 			--with-pg \
+			--with-ogdi \
 			--with-mysql; \
 		mv GDALmake.opt GDALmake.opt-$$V; \
 	done