The following commit has been merged in the ubuntu/lucid branch:
commit 993abc2cc7b35af11e6b54e79d5fcfa55f2ec677
Merge: 0f35649df827c040e9a3932829455d35c042e9ef
5ce87928868eab5225d2c972013bf850bf12311d
Author: Jerome Villeneuve Larouche <jlarou...@mapgears.com>
Date: Thu Nov 1 19:12:47 2012 +0000
New Upstream release
Merge branch 'master' into ubuntu/lucid
Conflicts:
debian/changelog
debian/control
debian/rules
diff --combined debian/changelog
index bb8124f,3f407d8..73bc78c
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,21 -1,10 +1,16 @@@
- gdal (1.9.1-2~lucid4) lucid; urgency=medium
++gdal (1.9.2-2~lucid2) lucid; urgency=medium
+
- * Fix gdal internal TIFF symbols issue
++ * Launchpad build for Lucid
+
- -- Jerome Villeneuve Larouche <jlarou...@mapgears.com> Thu, 06 Sep 2012
20:35:34 +0000
++ -- Jerome Villeneuve Larouche <jlarou...@mapgears.com> Thu, 01 Nov 2012
19:07:00 +0000
+
- gdal (1.9.1-2~lucid3) lucid; urgency=low
+ gdal (1.9.2-1) unstable; urgency=low
- * Launchpad release for Lucid
- * Removed dods support in debian/rules
- * Changed dh_python2 for dh_pycentral in debian/rules
- * Removed dh_numpy in debian/rules
- * Lowered Depends version of libnetcdf-dev to 1:3.6.0 (down from 1:4.0.0)
- * Lowered Depends version of python-all-dev to 2.6.5
+ * New Upstream release
- -- Jerome Villeneuve Larouche <jlarou...@mapgears.com> Thu, 31 May 2012
17:51:14 +0000
+ -- Jerome Villeneuve Larouche <jlarou...@mapgears.com> Thu, 01 Nov 2012
18:52:53 +0000
- gdal (1.9.1-1) unstable; urgency=low
+ gdal (1.9.1-2) unstable; urgency=low
[ Jerome Villeneuve Larouche ]
* New upstream release.
diff --combined debian/control
index c3d4dcb,2a96323..e2c70e0
--- a/debian/control
+++ b/debian/control
@@@ -3,18 -3,20 +3,19 @@@ Section: scienc
Priority: extra
Maintainer: Debian GIS Project <pkg-grass-devel@lists.alioth.debian.org>
Uploaders: Francesco Paolo Lovergine <fran...@debian.org>
-Build-Depends: debhelper (>= 8), zlib1g-dev, libnetcdf-dev (>= 1:4.0.0),
+Build-Depends: debhelper (>= 8), zlib1g-dev, libnetcdf-dev (>= 1:3.6.1),
libjasper-dev, libpng-dev, libjpeg-dev, libgif-dev,
libhdf4-alt-dev, libhdf5-serial-dev (>= 1.6.6), libpq-dev, libxerces-c2-dev,
unixodbc-dev (>= 2.2.11),
- python-numpy, doxygen, d-shlibs, libgeos-dev, libmysqlclient-dev,
python-all-dev (>= 2.6.6-3~),
+ python-numpy, doxygen, d-shlibs, libgeos-dev, libmysqlclient-dev,
python-all-dev (>= 2.6.5),
libcurl4-gnutls-dev, libsqlite3-dev, libogdi3.2-dev,
- ruby, ruby1.8-dev, chrpath, swig, patch, libexpat1-dev, libproj-dev,
+ ruby1.8, ruby1.8-dev, chrpath, swig, patch, libexpat1-dev, libproj-dev,
libdap-dev, libxml2-dev, libspatialite-dev (>= 2.4.0~rc2-4), libepsilon-dev
(>= 0.9.1),
- libpoppler-private-dev, liblzma-dev, libopenjpeg-dev, libarmadillo-dev,
libfreexl-dev (>= 1.0.0),
- libkml-dev, liburiparser-dev,
- python3-all-dev, python3-numpy
+ libpoppler-dev, liblzma-dev, libopenjpeg-dev, libarmadillo-dev,
libfreexl-dev (>= 1.0.0),
- libkml-dev, liburiparser-dev
++ libkml-dev, liburiparser-dev, python3-all-dev
Build-Conflicts: python-setuptools
Standards-Version: 3.9.3
XS-Python-Version: all
+ X-Python3-Version: >= 3.2
Homepage: http://www.gdal.org/
Vcs-Browser: http://git.debian.org/?p=pkg-grass/gdal.git
Vcs-Git: git://git.debian.org/git/pkg-grass/gdal.git
@@@ -103,7 -105,7 +104,7 @@@ Package: libgdal-do
Section: doc
Architecture: all
Suggests: libgdal1
- Depends: ${misc:Depends}
+ Depends: ${misc:Depends}
Homepage: http://www.gdal.org/#index_userdocs
Description: Documentation for the Geospatial Data Abstraction Library
GDAL is a translator library for raster geospatial data formats.
@@@ -178,6 -180,33 +179,33 @@@ Description: Python bindings to the Geo
This package contains Python bindings for GDAL/OGR library and
a set of additional command line tools.
+ Package: python3-gdal
+ Section: python
+ Architecture: any
+ Depends: ${shlibs:Depends}, ${python3:Depends}, python3-numpy, ${misc:Depends}
+ Provides: ${python3:Provides}
+ Homepage: http://trac.osgeo.org/gdal/wiki/GdalOgrInPython
+ XB-Python-Version: ${python3:Versions}
+ Description: Python 3 bindings to the Geospatial Data Abstraction Library
+ GDAL is a translator library for raster geospatial data formats.
+ As a library, it presents a single abstract data model to the
+ calling application for all supported formats. The related OGR
+ library (which lives within the GDAL source tree) provides
+ a similar capability for simple features vector data.
+ .
+ GDAL supports 40+ popular data formats, including commonly used
+ ones (GeoTIFF, JPEG, PNG and more) as well as the ones used in
+ GIS and remote sensing software packages (ERDAS Imagine,
+ ESRI Arc/Info, ENVI, PCI Geomatics). Also supported many remote
+ sensing and scientific data distribution formats such as HDF,
+ EOS FAST, NOAA L1B, NetCDF, FITS.
+ .
+ OGR library supports popular vector formats like ESRI Shapefile,
+ TIGER data, S57, MapInfo File, DGN, GML and more.
+ .
+ This package contains Python 3 bindings for GDAL/OGR library and
+ a set of additional command line tools.
+
Package: libgdal-perl
Section: perl
Architecture: any
diff --combined debian/rules
index a10ceb5,ba41a6e..417a96f
--- 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 \
@@@ -81,6 -81,7 +81,6 @@@
--with-ruby \
--with-python \
--with-odbc \
- --with-dods-root=/usr \
--with-static-proj4=yes \
--with-spatialite=/usr \
--with-cfitsio=no \
@@@ -92,27 -93,25 +92,27 @@@
--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
@@@ -202,7 -201,9 +202,7 @@@
dh_compress
dh_fixperms
dh_lintian
- dh_python2 -X.info
- dh_python3 -X.info
- dh_numpy
+ dh_pycentral -X.info
dh_perl
# Adds per arch symbols for compatible archs
ln -f $(CURDIR)/debian/libgdal*.symbols.i386
$(CURDIR)/debian/libgdal1.symbols.kfreebsd-i386
--
GDAL/OGR library and tools
_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
