[SCM] gdal branch, master, updated. upstream/1.10.0-200-g009bec6

Bas Couwenberg sebastic at xs4all.nl
Mon Oct 14 03:20:45 UTC 2013


The following commit has been merged in the master branch:
commit 9754c0f96aee8139b5c46617a34ddc6b7d525c83
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sun Oct 13 14:43:52 2013 +0200

    Add lintian override for spelling error via debian/rules.

diff --git a/debian/libgdal1h.lintian-overrides b/debian/libgdal1h.lintian-overrides
deleted file mode 100644
index b63a7b1..0000000
--- a/debian/libgdal1h.lintian-overrides
+++ /dev/null
@@ -1,2 +0,0 @@
-# False positive on: {136, "Socialist Republic of Viet Nam"},
-libgdal1h: spelling-error-in-binary usr/lib/libgdal.so.1.17.1 Nam Name
diff --git a/debian/rules b/debian/rules
index 72b7ba1..8a1a09c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -192,12 +192,19 @@ install: build
 	mv $(CURDIR)/debian/tmp$(PERL_PATH)/auto/* $(CURDIR)/debian/tmp/usr/lib/perl5/auto/.
 	mv $(CURDIR)/debian/tmp$(PERL_PATH)/Geo $(CURDIR)/debian/tmp/usr/lib/perl5/.
 	mv $(CURDIR)/debian/tmp/usr/local/lib/site_ruby/$(RUBYDEF)/* $(CURDIR)/debian/tmp/usr/lib/ruby/$(RUBYDEF)/.
+
 	# copy sample programs for python-gdal
 	install -o root -g root -d $(CURDIR)/debian/tmp/usr/share/doc/python-gdal/examples
 	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 "# Used for BigTIFF support (#501127)" > $(CURDIR)/debian/libgdal1h.lintian-overrides
 	echo "libgdal1h: embedded-library usr/lib/libgdal.so.$$(basename debian/tmp/usr/lib/libgdal.so.*.*.*|cut -d. -f3,4,5): tiff" \
-		>$(CURDIR)/debian/libgdal1h.lintian-overrides
+		>> $(CURDIR)/debian/libgdal1h.lintian-overrides
+	echo >> $(CURDIR)/debian/libgdal1h.lintian-overrides
+	echo "# False positive on: {136, "Socialist Republic of Viet Nam"}," >> $(CURDIR)/debian/libgdal1h.lintian-overrides
+	echo "libgdal1h: spelling-error-in-binary usr/lib/libgdal.so.$$(basename debian/tmp/usr/lib/libgdal.so.*.*.*|cut -d. -f3,4,5) Nam Name" \
+		>> $(CURDIR)/debian/libgdal1h.lintian-overrides
 
 binary-common:
 	dh_testdir

-- 
GDAL/OGR library and tools



More information about the Pkg-grass-devel mailing list