The following commit has been merged in the master branch: commit 8c436afd940b390494ac3b3bf923dd1b739f9976 Merge: 150d9b02cc521fc5844495880f61fde0ea6d57af d1ddee88eeedac0f87e3fc4ea117a138fbb43af6 Author: Francesco Paolo Lovergine <fran...@debian.org> Date: Tue Jun 5 16:13:23 2012 +0200
Merging a.valentino changes for python3 Merge commit 'd1ddee88eeedac0f87e3fc4ea117a138fbb43af6' Conflicts: debian/changelog debian/control diff --combined debian/changelog index 518e1cb,e2603ab..da69ca4 --- a/debian/changelog +++ b/debian/changelog @@@ -1,25 -1,18 +1,35 @@@ ++<<<<<<< HEAD +gdal (1.9.1-2) unstable; urgency=low ++======= + gdal (1.9.0-3) UNRELEASED; urgency=low + + * New package for Python 3 bindings + + -- Antonio Valentino <antonio.valent...@tiscali.it> Wed, 30 May 2012 19:15:21 +0200 + + gdal (1.9.0-2) unstable; urgency=low ++>>>>>>> d1ddee88eeedac0f87e3fc4ea117a138fbb43af6 + * Fixed debian/control to b-depend on ruby 1.8. + (closes: #675972) + * Now depending on poppler-private dev package. + (closes: #672405) + + -- Francesco Paolo Lovergine <fran...@debian.org> Tue, 05 Jun 2012 14:08:23 +0200 + +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. * Added build-{arch|indep} targets in debian/rules. - -- Francesco Paolo Lovergine <fran...@debian.org> Wed, 09 May 2012 13:00:22 +0200 + -- Jerome Villeneuve Larouche <jlarou...@mapgears.com> Fri, 25 May 2012 13:04:34 +0000 gdal (1.9.0-1) unstable; urgency=low diff --combined debian/control index 57c2165,22b2a33..2a96323 --- a/debian/control +++ b/debian/control @@@ -6,15 -6,17 +6,17 @@@ Uploaders: Francesco Paolo Lovergine <f Build-Depends: debhelper (>= 8), zlib1g-dev, libnetcdf-dev (>= 1:4.0.0), 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.6-3~), 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-dev, liblzma-dev, libopenjpeg-dev, libarmadillo-dev, libfreexl-dev (>= 1.0.0), + libpoppler-private-dev, liblzma-dev, libopenjpeg-dev, libarmadillo-dev, libfreexl-dev (>= 1.0.0), - libkml-dev, liburiparser-dev + libkml-dev, liburiparser-dev, + python3-all-dev, python3-numpy 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 +105,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 +180,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 -- 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