This is an automated email from the git hooks/post-receive script.
sebastic-guest pushed a commit to branch experimental
in repository gdal.
commit 24f5e49d3d237fdc87b3c594cd08fc33f71f139a
Author: Bas Couwenberg <sebas...@xs4all.nl>
Date: Fri Aug 1 00:02:11 2014 +0200
Merge changes from 1.10.1+dfsg-8 to support new hdf5 packaging layout.
---
debian/changelog | 14 ++++++++++++++
debian/rules | 7 +++++++
2 files changed, 21 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index 05746fb..fffde1f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+gdal (1.11.0+dfsg1-1~exp4) UNRELEASED; urgency=medium
+
+ * Merge changes from 1.10.1+dfsg-8 to support new hdf5 packaging layout.
+
+ -- Bas Couwenberg <sebas...@xs4all.nl> Fri, 01 Aug 2014 00:07:07 +0200
+
gdal (1.11.0+dfsg1-1~exp3) experimental; urgency=medium
* Merge changes from 1.10.1+dfsg-7 to include patch by Breno Leitao.
@@ -39,6 +45,14 @@ gdal (1.11.0+dfsg-1~exp1) experimental; urgency=low
-- Bas Couwenberg <sebas...@xs4all.nl> Sun, 04 May 2014 18:13:46 +0200
+gdal (1.10.1+dfsg-8) unstable; urgency=medium
+
+ * Support hdf5 1.8.13 new packaging layout.
+ Thanks to Gilles Filippini for the patch.
+ (closes: #756662)
+
+ -- Bas Couwenberg <sebas...@xs4all.nl> Fri, 01 Aug 2014 00:02:15 +0200
+
gdal (1.10.1+dfsg-7) unstable; urgency=medium
* Also use autotools_dev to update config.sub and config.guess.
diff --git a/debian/rules b/debian/rules
index 1b74c97..b154b51 100755
--- a/debian/rules
+++ b/debian/rules
@@ -25,6 +25,12 @@ GDAL_MAJOR=$(word 1,$(GDALVER))
GDAL_MINOR=$(word 2,$(GDALVER))
GDAL_PATCH=$(word 3,$(GDALVER))
+ifneq ($(wildcard /usr/lib/$(DEB_HOST_MULTIARCH)/hdf5/serial/libhdf5.so),)
+ WITH_HDF5:=--with-hdf5=/usr/lib/$(DEB_HOST_MULTIARCH)/hdf5/serial
+else
+ WITH_HDF5:=
+endif
+
versions:
@echo Gdal version: $(GDAL_MAJOR).$(GDAL_MINOR).$(GDAL_PATCH)
@echo Swig version: $(SWIGVER)
@@ -93,6 +99,7 @@ override_dh_auto_configure:
--with-webp \
--with-jasper \
--with-netcdf \
+ $(WITH_HDF5) \
--with-xerces \
--with-geos \
--with-sqlite3 \
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-grass/gdal.git
_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
