This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository gdal.
commit 1ec819446fa115d71d37a777623a1c329f460e58 Author: Bas Couwenberg <sebas...@xs4all.nl> Date: Sun Jun 28 13:42:34 2015 +0200 Remove trailing whitespace to fix syntax error in symbols files. --- debian/changelog | 1 + debian/gdal-symbols.pl | 4 ++-- debian/libgdal1h.lintian-overrides | 11 ++++++++++- debian/libgdal1h.symbols.amd64 | 2 +- debian/libgdal1h.symbols.armel | 2 +- debian/libgdal1h.symbols.armhf | 2 +- debian/libgdal1h.symbols.i386 | 2 +- debian/libgdal1h.symbols.ia64 | 2 +- debian/libgdal1h.symbols.mips | 2 +- debian/libgdal1h.symbols.mipsel | 2 +- debian/libgdal1h.symbols.powerpc | 2 +- debian/libgdal1h.symbols.s390x | 2 +- debian/libgdal1h.symbols.sparc | 2 +- debian/rules | 15 --------------- 14 files changed, 23 insertions(+), 28 deletions(-) diff --git a/debian/changelog b/debian/changelog index df7fe5d..2cd5814 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,7 @@ gdal (1.10.1+dfsg-9) UNRELEASED; urgency=medium * Drop get-orig-source script in favor of uscan + Files-Excluded. * Use uscan in get-orig-source target. * Update Vcs-Browser URL to use cgit instead of gitweb. + * Remove trailing whitespace to fix syntax error in symbols files. -- Bas Couwenberg <sebas...@debian.org> Sun, 28 Jun 2015 12:01:44 +0200 diff --git a/debian/gdal-symbols.pl b/debian/gdal-symbols.pl index 1a9990c..526c671 100755 --- a/debian/gdal-symbols.pl +++ b/debian/gdal-symbols.pl @@ -10,7 +10,7 @@ # diffutils patch coreutils # # Copyright (C) 2013-2014, Bas Couwenberg <sebas...@debian.org> -# +# # This library is free software; you can redistribute it and/or modify # it under the same terms as Perl itself, either Perl version 5.8.5 or, # at your option, any later version of Perl 5 you may have available. @@ -439,7 +439,7 @@ sub create_new_symbols { `cat $output | $cfg{cppfilt} > $filt 2>&1`; - # libgdal.so.1 libgdal1h #MINVER# + # libgdal.so.1 libgdal1h #MINVER# # #include "libgdal1h.symbols.common" my $data = ''; diff --git a/debian/libgdal1h.lintian-overrides b/debian/libgdal1h.lintian-overrides index 116bbb9..817e5c6 100644 --- a/debian/libgdal1h.lintian-overrides +++ b/debian/libgdal1h.lintian-overrides @@ -1,2 +1,11 @@ # Package name should be libgdal1, but because of hidden symbols is libgdal1h -libgdal1h: syntax-error-in-symbols-file 1 +# TIFF/GEOTIFF symbols are renamed to definitively solve problem of +# symbol collisions for programs that both links geotiff/tiff libraries. +libgdal1h: package-name-doesnt-match-sonames libgdal1 + +# Used for BigTIFF support (#501127) +libgdal1h: embedded-library *: tiff + +# False positive on: {136, "Socialist Republic of Viet Nam"}, +libgdal1h: spelling-error-in-binary * Nam Name + diff --git a/debian/libgdal1h.symbols.amd64 b/debian/libgdal1h.symbols.amd64 index d8aeec6..7dc0c66 100644 --- a/debian/libgdal1h.symbols.amd64 +++ b/debian/libgdal1h.symbols.amd64 @@ -1,4 +1,4 @@ -libgdal.so.1 libgdal1h #MINVER# +libgdal.so.1 libgdal1h #MINVER# #include "libgdal1h.symbols.common" (c++)"PamGetProxy(char const*)@GDAL_1.8" 1.8.0 (c++)"CPLURLAddKVP(char const*, char const*, char const*)@GDAL_1.8" 1.9.0 diff --git a/debian/libgdal1h.symbols.armel b/debian/libgdal1h.symbols.armel index d972881..e8bb28f 100644 --- a/debian/libgdal1h.symbols.armel +++ b/debian/libgdal1h.symbols.armel @@ -1,4 +1,4 @@ -libgdal.so.1 libgdal1h #MINVER# +libgdal.so.1 libgdal1h #MINVER# #include "libgdal1h.symbols.common" (c++)"PamGetProxy(char const*)@GDAL_1.8" 1.8.0 (c++)"CPLURLAddKVP(char const*, char const*, char const*)@GDAL_1.8" 1.9.0 diff --git a/debian/libgdal1h.symbols.armhf b/debian/libgdal1h.symbols.armhf index d972881..e8bb28f 100644 --- a/debian/libgdal1h.symbols.armhf +++ b/debian/libgdal1h.symbols.armhf @@ -1,4 +1,4 @@ -libgdal.so.1 libgdal1h #MINVER# +libgdal.so.1 libgdal1h #MINVER# #include "libgdal1h.symbols.common" (c++)"PamGetProxy(char const*)@GDAL_1.8" 1.8.0 (c++)"CPLURLAddKVP(char const*, char const*, char const*)@GDAL_1.8" 1.9.0 diff --git a/debian/libgdal1h.symbols.i386 b/debian/libgdal1h.symbols.i386 index a6f439b..09a073b 100644 --- a/debian/libgdal1h.symbols.i386 +++ b/debian/libgdal1h.symbols.i386 @@ -1,4 +1,4 @@ -libgdal.so.1 libgdal1h #MINVER# +libgdal.so.1 libgdal1h #MINVER# #include "libgdal1h.symbols.common" (c++)"PamGetProxy(char const*)@GDAL_1.8" 1.9.0 (c++)"CPLURLAddKVP(char const*, char const*, char const*)@GDAL_1.8" 1.9.0 diff --git a/debian/libgdal1h.symbols.ia64 b/debian/libgdal1h.symbols.ia64 index 8f5e157..63045fb 100644 --- a/debian/libgdal1h.symbols.ia64 +++ b/debian/libgdal1h.symbols.ia64 @@ -1,4 +1,4 @@ -libgdal.so.1 libgdal1h #MINVER# +libgdal.so.1 libgdal1h #MINVER# #include "libgdal1h.symbols.common" (c++)"PamGetProxy(char const*)@GDAL_1.8" 1.9.0 (c++)"CPLURLAddKVP(char const*, char const*, char const*)@GDAL_1.8" 1.9.0 diff --git a/debian/libgdal1h.symbols.mips b/debian/libgdal1h.symbols.mips index f5343c2..0ab1fcc 100644 --- a/debian/libgdal1h.symbols.mips +++ b/debian/libgdal1h.symbols.mips @@ -1,4 +1,4 @@ -libgdal.so.1 libgdal1h #MINVER# +libgdal.so.1 libgdal1h #MINVER# #include "libgdal1h.symbols.common" (c++)"PamGetProxy(char const*)@GDAL_1.8" 1.9.0 (c++)"CPLURLAddKVP(char const*, char const*, char const*)@GDAL_1.8" 1.9.0 diff --git a/debian/libgdal1h.symbols.mipsel b/debian/libgdal1h.symbols.mipsel index f5343c2..0ab1fcc 100644 --- a/debian/libgdal1h.symbols.mipsel +++ b/debian/libgdal1h.symbols.mipsel @@ -1,4 +1,4 @@ -libgdal.so.1 libgdal1h #MINVER# +libgdal.so.1 libgdal1h #MINVER# #include "libgdal1h.symbols.common" (c++)"PamGetProxy(char const*)@GDAL_1.8" 1.9.0 (c++)"CPLURLAddKVP(char const*, char const*, char const*)@GDAL_1.8" 1.9.0 diff --git a/debian/libgdal1h.symbols.powerpc b/debian/libgdal1h.symbols.powerpc index 73f7b60..f649b6d 100644 --- a/debian/libgdal1h.symbols.powerpc +++ b/debian/libgdal1h.symbols.powerpc @@ -1,4 +1,4 @@ -libgdal.so.1 libgdal1h #MINVER# +libgdal.so.1 libgdal1h #MINVER# #include "libgdal1h.symbols.common" (c++)"PamGetProxy(char const*)@GDAL_1.8" 1.8.0 (c++)"CPLURLAddKVP(char const*, char const*, char const*)@GDAL_1.8" 1.9.0 diff --git a/debian/libgdal1h.symbols.s390x b/debian/libgdal1h.symbols.s390x index 3dbfcc6..d998bf7 100644 --- a/debian/libgdal1h.symbols.s390x +++ b/debian/libgdal1h.symbols.s390x @@ -1,4 +1,4 @@ -libgdal.so.1 libgdal1h #MINVER# +libgdal.so.1 libgdal1h #MINVER# #include "libgdal1h.symbols.common" (c++)"PamGetProxy(char const*)@GDAL_1.8" 1.9.0 (c++)"CPLURLAddKVP(char const*, char const*, char const*)@GDAL_1.8" 1.9.0 diff --git a/debian/libgdal1h.symbols.sparc b/debian/libgdal1h.symbols.sparc index 0000bf5..c9117de 100644 --- a/debian/libgdal1h.symbols.sparc +++ b/debian/libgdal1h.symbols.sparc @@ -1,4 +1,4 @@ -libgdal.so.1 libgdal1h #MINVER# +libgdal.so.1 libgdal1h #MINVER# #include "libgdal1h.symbols.common" (c++)"PamGetProxy(char const*)@GDAL_1.8" 1.8.0 (c++)"CPLURLAddKVP(char const*, char const*, char const*)@GDAL_1.8" 1.9.0 diff --git a/debian/rules b/debian/rules index d1e3f9a..6ce5a51 100755 --- a/debian/rules +++ b/debian/rules @@ -178,21 +178,6 @@ override_dh_auto_install: 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 "# TIFF/GEOTIFF symbols are renamed to definitively solve problem of" >> $(CURDIR)/debian/libgdal1h.lintian-overrides - echo "# symbol collisions for programs that both links geotiff/tiff libraries." >> $(CURDIR)/debian/libgdal1h.lintian-overrides - echo "libgdal1h: package-name-doesnt-match-sonames libgdal1" >> $(CURDIR)/debian/libgdal1h.lintian-overrides - - echo >> $(CURDIR)/debian/libgdal1h.lintian-overrides - 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 - - 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 - override_dh_install: dh_install --autodest --list-missing -- 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