This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch experimental-2.0
in repository gdal.
commit 02c95fcacdfa28563e1e40ca80cdcfbb07ecc921
Author: Bas Couwenberg <sebas...@xs4all.nl>
Date: Sun Jun 14 02:41:20 2015 +0200
Use packaged libgeotiff & libtiff instead of internal copies.
---
debian/changelog | 1 +
debian/control | 4 ++++
debian/rules | 13 ++-----------
3 files changed, 7 insertions(+), 11 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 180d4d0..8c016ec 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ gdal (2.0.0~rc1+dfsg-1) UNRELEASED; urgency=medium
* Use uscan in get-orig-source target.
* Drop patches applied upstream, refresh remaining patches.
* Rename libgdal1h to libgdal20 to match SONAME.
+ * Use packaged libgeotiff & libtiff instead of internal copies.
-- Bas Couwenberg <sebas...@debian.org> Sat, 13 Jun 2015 23:40:47 +0200
diff --git a/debian/control b/debian/control
index 001f690..1e640b5 100644
--- a/debian/control
+++ b/debian/control
@@ -14,6 +14,8 @@ Build-Depends: debhelper (>= 9),
libpng-dev,
libjpeg-dev,
libgif-dev,
+ libgeotiff-dev,
+ libtiff-dev,
libwebp-dev,
libhdf4-alt-dev,
libhdf5-dev (>= 1.8.8),
@@ -124,6 +126,8 @@ Depends: libgdal20 (= ${binary:Version}),
libpng-dev,
libjpeg-dev,
libgif-dev,
+ libgeotiff-dev,
+ libtiff-dev,
libwebp-dev,
libhdf4-alt-dev [!arm64 !ppc64 !ppc64el],
libhdf5-dev,
diff --git a/debian/rules b/debian/rules
index e1f7856..fac763d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -91,8 +91,8 @@ override_dh_auto_configure:
--with-hide-internal-symbols=yes \
--with-rename-internal-libtiff-symbols=yes \
--with-rename-internal-libgeotiff-symbols=yes \
- --with-libtiff=internal \
- --with-geotiff=internal \
+ --with-libtiff=yes \
+ --with-geotiff=yes \
--with-webp \
--with-jasper \
--with-netcdf \
@@ -187,15 +187,6 @@ override_dh_auto_install:
install -o root -g root -m 755 $(CURDIR)/swig/python/samples/*.py
$(CURDIR)/debian/tmp/usr/share/doc/python-gdal/examples/.
# create lintian overrides file
- echo "# TIFF/GEOTIFF symbols are renamed to definitively solve problem
of" >> $(CURDIR)/debian/libgdal20.lintian-overrides
- echo "# symbol collisions for programs that both links geotiff/tiff
libraries." >> $(CURDIR)/debian/libgdal20.lintian-overrides
- echo "libgdal20: package-name-doesnt-match-sonames libgdal1" >>
$(CURDIR)/debian/libgdal20.lintian-overrides
-
- echo >> $(CURDIR)/debian/libgdal20.lintian-overrides
- echo "# Used for BigTIFF support (#501127)" >>
$(CURDIR)/debian/libgdal20.lintian-overrides
- echo "libgdal20: embedded-library usr/lib/libgdal.so.$$(basename
debian/tmp/usr/lib/libgdal.so.*.*.*|cut -d. -f3,4,5): tiff" \
- >> $(CURDIR)/debian/libgdal20.lintian-overrides
-
echo >> $(CURDIR)/debian/libgdal20.lintian-overrides
echo "# False positive on: {136, "Socialist Republic of Viet Nam"}," >>
$(CURDIR)/debian/libgdal20.lintian-overrides
echo "libgdal20: spelling-error-in-binary
usr/lib/libgdal.so.$$(basename debian/tmp/usr/lib/libgdal.so.*.*.*|cut -d.
-f3,4,5) Nam Name" \
--
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
