This is an automated email from the git hooks/post-receive script. sebastic-guest pushed a commit to branch experimental in repository gdal.
commit 34d73ee296f4f1cb56acc4098a6e77dc67e237d1 Author: Bas Couwenberg <[email protected]> Date: Tue Jul 8 20:44:21 2014 +0200 Merge changes from 1.10.1+dfsg-6 to include patch by gregor herrmann. --- debian/changelog | 15 +++++++++++++++ debian/libgdal-perl.install | 8 +++----- debian/patches/perl-vendor | 28 ++++++++++++++++++++++++++++ debian/patches/series | 1 + debian/rules | 17 ----------------- 5 files changed, 47 insertions(+), 22 deletions(-) diff --git a/debian/changelog b/debian/changelog index b323441..5822a91 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,7 @@ gdal (1.11.0+dfsg1-1~exp2) UNRELEASED; urgency=low s390x. * Bump repacked upstream version, repacking was fixed to not delete the .gitignore file included by upstream. + * Merge changes from 1.10.1+dfsg-6 to include patch by gregor herrmann. -- Bas Couwenberg <[email protected]> Thu, 08 May 2014 22:59:02 +0200 @@ -32,6 +33,20 @@ gdal (1.11.0+dfsg-1~exp1) experimental; urgency=low -- Bas Couwenberg <[email protected]> Sun, 04 May 2014 18:13:46 +0200 +gdal (1.10.1+dfsg-6) unstable; urgency=medium + + [ gregor herrmann ] + * Fix "hardcodes /usr/lib/perl5": + - add patch perl-vendor which passes INSTALLDIRS=vendor to Makefile.PL + which nicely drops perl files into suitable directories + - remove all perl juggling around from debian/rules as a result of the + patch + - make debian/libgdal-perl.install executable and use $Config{vendorarch} + there to install the perl files from the expected location + (Closes: #752473) + + -- Bas Couwenberg <[email protected]> Tue, 08 Jul 2014 20:44:25 +0200 + gdal (1.10.1+dfsg-5) unstable; urgency=medium * Don't run dh for custom targets. diff --git a/debian/libgdal-perl.install b/debian/libgdal-perl.install old mode 100644 new mode 100755 index ac6d89b..105d79d --- a/debian/libgdal-perl.install +++ b/debian/libgdal-perl.install @@ -1,5 +1,3 @@ -usr/lib/perl5/auto/Geo/OGR -usr/lib/perl5/auto/Geo/OSR -usr/lib/perl5/auto/Geo/GDAL -usr/lib/perl5/Geo/*.pm -usr/lib/perl5/Geo/GDAL/Const.pm +#!/usr/bin/perl -w +use Config; +print substr($Config{vendorarch}, 1) . "\n"; diff --git a/debian/patches/perl-vendor b/debian/patches/perl-vendor new file mode 100644 index 0000000..abfd771 --- /dev/null +++ b/debian/patches/perl-vendor @@ -0,0 +1,28 @@ +Description: pass INSTALLDIRS=vendor to Makefile.PL to get stuff into the right place +Origin: vendor +Forwarded: no +Author: gregor herrmann <[email protected]> +Last-Update: 2014-07-08 + +--- a/swig/perl/Makefile ++++ b/swig/perl/Makefile +@@ -7,7 +7,7 @@ build: Makefile_Geo__GDAL + $(MAKE) -f Makefile_Geo__OSR + + Makefile_Geo__GDAL: +- perl Makefile.PL INSTALL_BASE=$(INST_PREFIX) ++ perl Makefile.PL INSTALLDIRS=vendor + + test: build + $(MAKE) -f Makefile_Geo__GDAL test +--- a/swig/perl/GNUmakefile ++++ b/swig/perl/GNUmakefile +@@ -26,7 +26,7 @@ build: gdal_wrap.cc Makefile_Geo__GDAL + gdal_wrap.cc: generate + + Makefile_Geo__GDAL: +- perl Makefile.PL INSTALL_BASE=$(INST_PREFIX) ++ perl Makefile.PL INSTALLDIRS=vendor + + test: build + $(MAKE) -f Makefile_Geo__GDAL test diff --git a/debian/patches/series b/debian/patches/series index 538eb35..391702a 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -27,3 +27,4 @@ supress-typo doc-brief hardening recommanded-typo +perl-vendor diff --git a/debian/rules b/debian/rules index 275e5c1..102199a 100755 --- a/debian/rules +++ b/debian/rules @@ -18,9 +18,6 @@ CXXFLAGS := $(filter-out -Werror=format-security, $(CXXFLAGS)) PYVERS=$(shell pyversions -v -r debian/control) $(shell py3versions -v -r) PYDEF=$(shell pyversions -dv) PERLDEF=$(shell perl -V:version|cut -d\' -f2) -PERL_VENDOR_ARCH=$(shell perl -V:vendorarch|cut -d\' -f2) -PERL_ARCH_NAME=$(shell perl -V:archname|cut -d\' -f2) -PERL_PATH="$(PERL_VENDOR_ARCH)/$(PERL_ARCH_NAME)" SWIGVER=$(shell swig -version |grep Version|cut -d' ' -f3|sed -e 's/\.//g') GDALVER=$(shell cat VERSION|sed -e 's/\./ /g') @@ -175,23 +172,9 @@ override_dh_auto_install: # removing la file rm -f $(CURDIR)/debian/tmp/usr/lib/libgdal.la - # removing perllocal.pod - rm -f $(CURDIR)/debian/tmp$(PERL_PATH)/perllocal.pod - - # removing empty packlist MakeMaker files - -find $(CURDIR)/debian/tmp$(PERL_PATH) -type f -name .packlist -exec rm -f {} \; - - # removing embedded rpath in perl shlibs - -find $(CURDIR)/debian/tmp$(PERL_PATH) -type f -name "*.so" -exec chrpath --delete {} \; - # removing embedded rpath in main lib -find $(CURDIR)/debian/tmp/usr/lib -type f -name "*.so*" -exec chrpath --delete {} \; - # moves perl stuff the right dirs - install -o root -g root -d $(CURDIR)/debian/tmp/usr/lib/perl5/auto - 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/. - # 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/. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/gdal.git _______________________________________________ Pkg-grass-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
