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

[Francesco Lovergine]

Author: frankie
Date: 2007-04-24 08:08:13 +0000 (Tue, 24 Apr 2007)
New Revision: 777

Added:
   packages/gdal/trunk/debian/patches/ogdi.dpatch
Modified:
   packages/gdal/trunk/debian/control
   packages/gdal/trunk/debian/patches/00list
Log:
Added OGDI support


Modified: packages/gdal/trunk/debian/control
===================================================================
--- packages/gdal/trunk/debian/control	2007-04-24 07:52:15 UTC (rev 776)
+++ packages/gdal/trunk/debian/control	2007-04-24 08:08:13 UTC (rev 777)
@@ -3,7 +3,12 @@
 Priority: extra
 Maintainer: Debian GIS Project <pkg-grass-devel at lists.alioth.debian.org>
 Uploaders: Steve Halasz <debian at adkgis.org>, Francesco Paolo Lovergine <frankie at debian.org>, Petter Reinholdtsen <pere at debian.org>, Fabio Tranchitella <kobold at debian.org>, Paul Wise <pabs at debian.org>
-Build-Depends: debhelper (>= 5.0.37.2), zlib1g-dev, libcfitsio3-dev|libcfitsio-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), libcurl3-dev|libcurl-dev, libsqlite3-dev 
+Build-Depends: debhelper (>= 5.0.37.2), zlib1g-dev, libcfitsio3-dev|libcfitsio-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), 
+ libcurl3-dev|libcurl-dev, libsqlite3-dev, libogdi3.2-dev
 Standards-Version: 3.7.2
 XS-Python-Version: all
 

Modified: packages/gdal/trunk/debian/patches/00list
===================================================================
--- packages/gdal/trunk/debian/patches/00list	2007-04-24 07:52:15 UTC (rev 776)
+++ packages/gdal/trunk/debian/patches/00list	2007-04-24 08:08:13 UTC (rev 777)
@@ -1 +1,2 @@
 libname
+ogdi

Added: packages/gdal/trunk/debian/patches/ogdi.dpatch
===================================================================
--- packages/gdal/trunk/debian/patches/ogdi.dpatch	2007-04-24 07:52:15 UTC (rev 776)
+++ packages/gdal/trunk/debian/patches/ogdi.dpatch	2007-04-24 08:08:13 UTC (rev 777)
@@ -0,0 +1,40 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## ogdi.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.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
+@@ -23968,7 +23968,7 @@
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-logdi31  $LIBS"
++LIBS="-logdi  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -24034,16 +24034,16 @@
+ 
+ 
+   if test "$HAVE_OGDI" = "yes" ; then
+-    LIBS="-logdi31 $LIBS"
++    LIBS="-logdi $LIBS"
+   fi
+ 
+ else
+ 
+   HAVE_OGDI=yes
+-  LIBS="-L$with_ogdi -L$with_ogdi/lib -logdi31 $LIBS"
+-  OGDI_INCLUDE="-I$with_ogdi -I$with_ogdi/include"
++  LIBS="-logdi $LIBS"
++  OGDI_INCLUDE="-I/usr/include/ogdi"
+ 
+-  echo "using libogdi31 from $with_ogdi."
++  echo "using libogdi from $with_ogdi."
+ 
+ fi
+ 


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