[SCM] gdal branch, master, updated. upstream/1.8.0-15-gafdcfa0
The following commit has been merged in the master branch: commit 6e145681a6284524352462bc0a048690c64042a6 Author: Francesco Paolo Lovergine fran...@debian.org Date: Wed Mar 16 15:54:32 2011 +0100 Verbose listing diff --git a/debian/rules b/debian/rules index fe678e4..c388ee0 100755 --- a/debian/rules +++ b/debian/rules @@ -157,12 +157,14 @@ install: build $(MAKE) install-man DESTDIR=$(CURDIR)/debian/tmp \ INST_DOCS=\$$(prefix)/share/doc/libgdal-doc\ INST_MAN=\$$(prefix)/share/man - + # install python stuff previuosly built and pre-installed cp -a $(CURDIR)/debian/python-tmp/usr/lib/* $(CURDIR)/debian/tmp/usr/lib/. install -o root -g root -d $(CURDIR)/debian/tmp/usr/bin install -o root -g root -m 755 $(CURDIR)/swig/python/scripts/*.py $(CURDIR)/debian/tmp/usr/bin/. + ls -R $(CURDIR)/debian/tmp/ /tmp/gdal_list.txt + # removing license file rm -f $(CURDIR)/debian/tmp/usr/share/gdal/1.8/LICENSE.TXT # removing empty packlist MakeMaker files -- GDAL/OGR library and tools ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[SCM] gdal branch, master, updated. upstream/1.8.0-15-gafdcfa0
The following commit has been merged in the master branch: commit 0db2161d1668059e053a3e6cf67c17e39659c93a Author: Francesco Paolo Lovergine fran...@debian.org Date: Wed Mar 16 16:34:53 2011 +0100 Better list diff --git a/debian/rules b/debian/rules index c388ee0..5e8fd56 100755 --- a/debian/rules +++ b/debian/rules @@ -163,7 +163,7 @@ install: build install -o root -g root -d $(CURDIR)/debian/tmp/usr/bin install -o root -g root -m 755 $(CURDIR)/swig/python/scripts/*.py $(CURDIR)/debian/tmp/usr/bin/. - ls -R $(CURDIR)/debian/tmp/ /tmp/gdal_list.txt + ls -R $(CURDIR)/debian/tmp/ # removing license file rm -f $(CURDIR)/debian/tmp/usr/share/gdal/1.8/LICENSE.TXT -- GDAL/OGR library and tools ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[SCM] gdal branch, master, updated. upstream/1.8.0-15-gafdcfa0
The following commit has been merged in the master branch:
commit 0ec24654d9d1da12611d436e20275b5c6ec80989
Author: Francesco Paolo Lovergine fran...@debian.org
Date: Wed Mar 16 18:01:15 2011 +0100
Fixed perl path used by current swing binding.
diff --git a/debian/rules b/debian/rules
index 5e8fd56..8be1294 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,6 +12,9 @@ PYVERS=$(shell pyversions -v -r debian/control)
PYDEF=$(shell pyversions -dv)
RUBYDEF=$(shell ruby --version|cut -d' ' -f2|cut -d. -f1,2)
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')
@@ -168,15 +171,15 @@ install: build
# removing license file
rm -f $(CURDIR)/debian/tmp/usr/share/gdal/1.8/LICENSE.TXT
# removing empty packlist MakeMaker files
- -find $(CURDIR)/debian/tmp/usr/local/lib/perl -type f -name .packlist
-exec rm -f {} \;
+ -find $(CURDIR)/debian/tmp$(PERL_PATH) -type f -name .packlist -exec rm
-f {} \;
# removing embedded rpath in perl shlibs
- -find $(CURDIR)/debian/tmp/usr/local/lib/perl -type f -name *.so
-exec chrpath --delete {} \;
+ -find $(CURDIR)/debian/tmp/$(PERL_PATH) -type f -name *.so -exec
chrpath --delete {} \;
# moves ruby/perl stuff the right dirs
install -o root -g root -d $(CURDIR)/debian/tmp/usr/lib/perl5/auto
install -o root -g root -d $(CURDIR)/debian/tmp/usr/lib/ruby/$(RUBYDEF)
- mv $(CURDIR)/debian/tmp/usr/local/lib/perl/$(PERLDEF)/auto/*
$(CURDIR)/debian/tmp/usr/lib/perl5/auto/.
- mv $(CURDIR)/debian/tmp/usr/local/lib/perl/$(PERLDEF)/Geo
$(CURDIR)/debian/tmp/usr/lib/perl5/.
+ mv $(CURDIR)/debian/tmp$(PERL_PATH)/auto/*
$(CURDIR)/debian/tmp/usr/lib/perl5/auto/.
+ mv $(CURDIR)/debian/tmp$(PERL_PATH)/lib/perl/$(PERLDEF)/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
--
GDAL/OGR library and tools
___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[SCM] gdal branch, master, updated. upstream/1.8.0-15-gafdcfa0
The following commit has been merged in the master branch: commit afdcfa00514ec14b67f1340537c3ff21c307aee8 Author: Francesco Paolo Lovergine fran...@debian.org Date: Wed Mar 16 18:06:05 2011 +0100 Removed explicit listing. diff --git a/debian/rules b/debian/rules index 8be1294..4d38cf2 100755 --- a/debian/rules +++ b/debian/rules @@ -166,8 +166,6 @@ install: build install -o root -g root -d $(CURDIR)/debian/tmp/usr/bin install -o root -g root -m 755 $(CURDIR)/swig/python/scripts/*.py $(CURDIR)/debian/tmp/usr/bin/. - ls -R $(CURDIR)/debian/tmp/ - # removing license file rm -f $(CURDIR)/debian/tmp/usr/share/gdal/1.8/LICENSE.TXT # removing empty packlist MakeMaker files -- GDAL/OGR library and tools ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
