The following commit has been merged in the 1.7 branch:
commit 489e30ea63c84d1215490318f4a8cfa86a95f54f
Author: Francesco Paolo Lovergine <fran...@debian.org>
Date: Wed Aug 31 12:25:19 2011 +0200
Fixed against use of libdap 3.10 and later versions.
diff --git a/debian/changelog b/debian/changelog
index ca3bdef..5841307 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+gdal (1.7.3-6) unstable; urgency=low
+
+ * Added a dods patch to work only with libdap >= 3.10. Upstream recent
+ versions manage multi-versioning and the dropped AISConnect class,
+ but we are currently only interested in supporting wheezy libdap.
+ (closes: #638367, #639066, #639179)
+ * Now forces build-dep on libdap >= 3.10 as required.
+
+ -- Francesco Paolo Lovergine <fran...@debian.org> Wed, 31 Aug 2011 12:18:54
+0200
+
gdal (1.7.3-5) unstable; urgency=low
* Migrating to libjpeg-dev build-dep and dep.
diff --git a/debian/control b/debian/control
index c6a3408..27c4d4d 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Build-Depends: debhelper (>= 8), zlib1g-dev, libnetcdf-dev (>=
1:4.0.0),
python-dev, python-numpy, doxygen, d-shlibs, libgeos-dev, libmysqlclient-dev,
python-all-dev (>= 2.3.5-11~),
python-central (>= 0.5), libcurl4-gnutls-dev, libsqlite3-dev, libogdi3.2-dev,
ruby, ruby1.8-dev, chrpath, swig, libtool (>= 1.5.24-2), patch,
libexpat1-dev, libproj-dev,
- libdap-dev, libxml2-dev, libspatialite-dev (>= 2.4.0~rc2-4), libepsilon-dev
(>= 0.9.1)
+ libdap-dev (>= 3.10), libxml2-dev, libspatialite-dev (>= 2.4.0~rc2-4),
libepsilon-dev (>= 0.9.1)
Build-Conflicts: python-setuptools
Standards-Version: 3.9.2
XS-Python-Version: all
diff --git a/debian/patches/dods b/debian/patches/dods
new file mode 100644
index 0000000..13a5b23
--- /dev/null
+++ b/debian/patches/dods
@@ -0,0 +1,38 @@
+Index: gdal/frmts/dods/dodsdataset2.cpp
+===================================================================
+--- gdal.orig/frmts/dods/dodsdataset2.cpp 2011-08-31 11:51:34.000000000
+0200
++++ gdal/frmts/dods/dodsdataset2.cpp 2011-08-31 12:09:07.000000000 +0200
+@@ -50,7 +50,15 @@
+ #include <Sequence.h>
+ #include <Grid.h>
+
++#define LIBDAP_310 /* This is supposed to build with OpeNDAP 3.10+ a better
general fix is present in recent upstream sources */
++
++#ifdef LIBDAP_310
++/* AISConnect.h/AISConnect class was renamed to Connect.h/Connect in libdap
3.10 */
++#include <Connect.h>
++#else
+ #include <AISConnect.h>
++#endif
++
+ #include <DDS.h>
+ #include <DAS.h>
+ #include <BaseTypeFactory.h>
+Index: gdal/ogr/ogrsf_frmts/dods/ogr_dods.h
+===================================================================
+--- gdal.orig/ogr/ogrsf_frmts/dods/ogr_dods.h 2011-08-31 12:12:46.000000000
+0200
++++ gdal/ogr/ogrsf_frmts/dods/ogr_dods.h 2011-08-31 12:14:43.000000000
+0200
+@@ -61,7 +61,13 @@
+ #include <Sequence.h>
+ #include <Grid.h>
+
++#define LIBDAP_310 /* This is supposed to be linked only against 3.10+ a
better fix is included upstream */
++#ifdef LIBDAP_310
++#include <Connect.h>
++#else
+ #include <AISConnect.h>
++#endif
++
+ #include <DDS.h>
+ #include <DAS.h>
+ #include <BaseTypeFactory.h>
diff --git a/debian/patches/series b/debian/patches/series
index 50efd52..ce9dbbe 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,3 +10,4 @@ gdal-grass
ecw-plugin
mrsid-plugin
epsilon
+dods
--
GDAL/OGR library and tools
_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
