[SCM] gdal branch, ubuntu/precise, updated. upstream/1.9.2-122-gcbb5026

Jerome Villeneuve Larouche jlarouche at mapgears.com
Wed Jun 12 17:36:43 UTC 2013 

The following commit has been merged in the ubuntu/precise branch:
commit e62eea58a7abf3a94beedf46e77194dd8ed8ff99
Merge: 6f758e7ff7b1bd6ff37288c05c00d8eaebe67427 ba0203ace228900c755a2566c9781bcae869d044
Author: Jerome Villeneuve Larouche <jlarouche at mapgears.com>
Date:   Thu Nov 1 18:50:58 2012 +0000

    New Upstream release 1.9.2
    Merge branch 'master' into ubuntu/precise
    
    Conflicts:
    	debian/changelog
    	debian/control

diff --combined debian/changelog
index 0759cb0,8a643fe..30b1454
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,42 -1,17 +1,42 @@@
- gdal (1.9.1-2~precise4) precise; urgency=medium
 -gdal (1.9.1-2) unstable; urgency=low
++gdal (1.9.2-2~precise1) precise; urgency=medium
 +
-   * Fix gdal internal TIFF symbols issue
++  * Launchpad build for Precise
 +
-  -- Jerome Villeneuve Larouche <jlarouche at mapgears.com>  Thu, 06 Sep 2012 15:02:07 +0000
++ -- Jerome Villeneuve Larouche <jlarouche at mapgears.com>  Thu, 01 Nov 2012 18:19:35 +0000
 +
- gdal (1.9.1-2~precise3) precise; urgency=low
++gdal (1.9.2-1) unstable; urgency=low
 +
-   * Launchpad build for precise
++  * New upstream release
 +
-  -- Jerome Villeneuve Larouche <jlarouche at mapgears.com>  Thu, 31 May 2012 17:36:09 +0000
++ -- Jerome Villeneuve Larouche <jlarouche at mapgears.com>  Thu, 01 Nov 2012 18:15:24 +0000
 +
 +gdal (1.9.1-1) unstable; urgency=low
  
    [ Jerome Villeneuve Larouche ]
    * New upstream release.
  
    [ Francesco Paolo Lovergine ]
    * Reintroducing libgdal1-dev as a transitional package to allow r-deps
 -    to build in any environment.
 -  * Removed old depndency on libcurl3-dev for libgdal-dev and added a 
 -    preferred dep on libcurl4-gnutls-dev to make lintian happy.
 +  to build in any environment.
 +  * Removed old depndency on libcurl3-dev for libgdal-dev and
 +  added a preferred dep on libcurl4-gnutls-dev to make lintian happy.
    * Added build-{arch|indep} targets in debian/rules.
  
   -- Jerome Villeneuve Larouche <jlarouche at mapgears.com>  Fri, 25 May 2012 13:04:34 +0000
  
 +gdal (1.9.0-2~precise1) precise; urgency=low
 +
 +  * Launchpad build for precise.
 +  * Remove freexl support.
 +
 + -- Alan Boudreault <aboudreault at mapgears.com>  Tue, 08 May 2012 11:42:03 +0000
 +
 +gdal (1.9.0-2~precise1) precise; urgency=low
 +
 +  * Launchpad build for precise.
 +
 + -- Alan Boudreault <aboudreault at mapgears.com>  Tue, 08 May 2012 11:42:03 +0000
 +
  gdal (1.9.0-1) unstable; urgency=low
  
    * Ready for sid, starting transition.
diff --combined debian/rules
index 5440cb2,ba41a6e..d0845e8
--- a/debian/rules
+++ b/debian/rules
@@@ -8,7 -8,7 +8,7 @@@
  # Uncomment this to turn on verbose mode.
  #export DH_VERBOSE=1
  
- PYVERS=$(shell pyversions -v -r debian/control)
+ PYVERS=$(shell pyversions -v -r debian/control) $(shell py3versions -v -r)
  PYDEF=$(shell pyversions -dv)
  RUBYDEF=$(shell ruby --version|cut -d' ' -f2|cut -d. -f1,2)
  PERLDEF=$(shell perl -V:version|cut -d\' -f2)
@@@ -48,7 -48,7 +48,7 @@@ gdal-ecw-dist
  	rm -f $(CURDIR)/GDALmake.opt
  
  gdal-mrsid: configure gdal-mrsid-dist clean
- gdal-mrsid-dist: 
+ gdal-mrsid-dist:
  	ln -fs $(CURDIR)/GDALmake.opt-$(PYDEF) $(CURDIR)/GDALmake.opt
  	[ -e $(CURDIR)/GDALmake.opt ] && $(MAKE) -C $(CURDIR)/frmts/mrsid dist
  	mv $(CURDIR)/frmts/mrsid/libgdal-mrsid-*.tar.gz $(CURDIR)/..
@@@ -57,9 -57,9 +57,9 @@@
  
  
  configure: configure-stamp
- configure-stamp: 
+ configure-stamp:
  	dh_testdir
- 	
+ 
  	for V in $(PYVERS); do \
  		PYTHON=/usr/bin/python$$V ./configure --prefix=/usr \
  			--mandir=\$$\{prefix\}/share/man \
@@@ -89,30 -89,29 +89,30 @@@
  			--with-mrsid=no \
  			--with-poppler=yes \
  			--with-openjpeg=yes \
  			--with-libkml=yes \
  			--with-armadillo=yes \
  			--with-liblzma=yes \
 +			--with-rename-internal-libtiff-symbols=yes \
 +	  		--with-rename-internal-libgeotiff-symbols=yes \
  			--with-epsilon=/usr; \
  		mv GDALmake.opt GDALmake.opt-$$V; \
  	done
- 	
+ 
  	touch $@
  
  build-arch: build
  build-indep: build
  
  build: configure-stamp build-stamp
- build-stamp: 
+ build-stamp:
  	dh_testdir
- 	
+ 
  	cp `ls GDALmake.opt-*|tail -1` GDALmake.opt
- 	$(MAKE) lib-target apps-target 
+ 	$(MAKE) lib-target apps-target
  	rm -rf $(CURDIR)/swig/perl/*.c  $(CURDIR)/swig/perl/*.cpp
  	$(MAKE) -C $(CURDIR)/swig/perl generate build
  	$(MAKE) -C $(CURDIR)/swig/ruby generate build
- 	
+ 
  	# It needs pre-installing just after the building due to intermediate cleaning.
  	# Apply conditionally an on-fly patch for pre 1.3.38 swig versions.
  	for V in $(PYVERS); do \
@@@ -125,15 -124,15 +125,15 @@@
  	mkdir $(CURDIR)/html || true
  	$(MAKE) docs
  	$(MAKE) man
- 	# a temporary workaround for doxygen problem #564243 
+ 	# a temporary workaround for doxygen problem #564243
  	cd man/man1 && \
  			for i in `find . -name "*__*"`; do basename=`basename $$i`; mv $$basename `echo $$basename|sed -e 's/__/_/'`; done
  	touch $@
  
- clean: 
+ clean:
  	dh_testdir
  	dh_testroot
- 	
+ 
  	[ ! -f GDALmake.opt ] || $(MAKE) distclean
  	rm -rf $(CURDIR)/swig/ruby/.libs $(CURDIR)/swig/perl/*.bs
  	rm -rf $(CURDIR)/.libs
@@@ -145,38 -144,38 +145,38 @@@
  	rm -f  $(CURDIR)/islibdappost310.*
  	# Removes per arch symbols for compatible archs
  	rm -f $(CURDIR)/debian/libgdal*.symbols.kfreebsd-i386 $(CURDIR)/debian/libgdal*.symbols.kfreebsd-amd64
- 	dh_clean 
+ 	dh_clean
  
  install: build
  	dh_testdir
  	dh_testroot
  	dh_prep
  	dh_installdirs
- 	
+ 
  	cp `ls GDALmake.opt-*|tail -1` GDALmake.opt
  	$(MAKE) install BINDINGS="perl ruby" DESTDIR=$(CURDIR)/debian/tmp \
- 			INST_DATA="\$$(prefix)/share/gdal/$(GDAL_MAJOR).$(GDAL_MINOR)" 
+ 			INST_DATA="\$$(prefix)/share/gdal/$(GDAL_MAJOR).$(GDAL_MINOR)"
  	$(MAKE) install-docs DESTDIR=$(CURDIR)/debian/tmp \
  		"INST_DOCS=\$$(prefix)/share/doc/libgdal-doc"\
- 		"INST_MAN=\$$(prefix)/share/man" 
+ 		"INST_MAN=\$$(prefix)/share/man"
  	$(MAKE) install-man DESTDIR=$(CURDIR)/debian/tmp \
  		"INST_DOCS=\$$(prefix)/share/doc/libgdal-doc"\
- 		"INST_MAN=\$$(prefix)/share/man" 
- 		
+ 		"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/.                                        
- 	
+ 	install -o root -g root -m 755 $(CURDIR)/swig/python/scripts/*.py $(CURDIR)/debian/tmp/usr/bin/.
+ 
  	# removing license file
  	rm -f $(CURDIR)/debian/tmp/usr/share/gdal/$(GDAL_MAJOR).$(GDAL_MINOR)/LICENSE.TXT
- 	# removing empty packlist MakeMaker files 
+ 	# 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 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)
@@@ -190,7 -189,7 +190,7 @@@
  	echo "libgdal1: embedded-library usr/lib/libgdal.so.$$(basename debian/tmp/usr/lib/libgdal.so.*.*.*|cut -d. -f3,4,5): tiff" \
  		>$(CURDIR)/debian/libgdal1.lintian-overrides
  
- binary-common: 
+ binary-common:
  	dh_testdir
  	dh_testroot
  	dh_install --autodest --list-missing
@@@ -203,6 -202,7 +203,7 @@@
  	dh_fixperms
  	dh_lintian
  	dh_python2 -X.info
+ 	dh_python3 -X.info
  	dh_numpy
  	dh_perl
  	# Adds per arch symbols for compatible archs

-- 
GDAL/OGR library and tools

More information about the Pkg-grass-devel mailing list