--- gdal-1.5.2.orig/debian/NEWS +++ gdal-1.5.2/debian/NEWS @@ -0,0 +1,11 @@ +gdal (1.5.0-3) unstable; urgency=low + + GDAL deprecated the old-style Python binding starting from 1.5 branch, so + it has been dropped in Debian. Generally you should not experience big + problems, because almost all API functions are supported by the new + Swig-based binding. If not, consider that you need to upgrade to the + current interface. + The old bindings use Numeric, the new SWIG-based use NumPy, for all + the rest refer to GDAL documentation. + + -- Francesco Paolo Lovergine Tue, 29 Jan 2008 12:37:07 +0100 --- gdal-1.5.2.orig/debian/TODO +++ gdal-1.5.2/debian/TODO @@ -0,0 +1,9 @@ +Debian maintainers TODO list +---------------------------- + +* C# binding needs probably to be investigated. It is currently not too stabilized. + Tcl/Tk binding could be also considered as external project, but its status needs + to be checked as well. I would avoid both PHP and Java bindings because not yet + mature. + + -- Francesco Paolo Lovergine Fri Mar 14 14:34:05 CET 2008 --- gdal-1.5.2.orig/debian/control +++ gdal-1.5.2/debian/control @@ -0,0 +1,206 @@ +Source: gdal +Section: science +Priority: extra +Maintainer: Debian GIS Project +Uploaders: Steve Halasz , Francesco Paolo Lovergine , Petter Reinholdtsen , Fabio Tranchitella , Paul Wise +Build-Depends: debhelper (>= 5.0.37.2), zlib1g-dev, netcdfg-dev, + libtiff4-dev, libjasper-dev|libjasper-1.701-dev, libpng12-dev, libjpeg62-dev, libungif4-dev, + libhdf4g-dev, libhdf5-serial-dev, libpq-dev, libxerces27-dev, unixodbc-dev (>=2.2.11), + python-dev, python-numpy, doxygen, d-shlibs, libgeos-dev, dpatch, libmysqlclient15-dev, python-all-dev (>= 2.3.5-11~), + python-central (>=0.5), libcurl3-dev|libcurl-dev, libsqlite3-dev, libogdi3.2-dev, + ruby, ruby1.8-dev, chrpath, swig, libtool (>=1.5.24-1), patch, libexpat1-dev +Standards-Version: 3.8.0 +XS-Python-Version: all +Homepage: http://www.gdal.org/ +Vcs-Browser: http://svn.debian.org/viewsvn/pkg-grass/packages/gdal/trunk +Vcs-Svn: svn://svn.debian.org/svn/pkg-grass/packages/gdal/trunk + +Package: libgdal1-1.5.0 +Section: libs +Architecture: any +Depends: ${shlibs:Depends} +Recommends: proj +Conflicts: libgdal1, libgdal1c2, libgdal1c2a, libgdal1-1.3.1, libgdal1-1.3.2 +Replaces: libgdal1, libgdal1c2, libgdal1c2a, libgdal1-1.3.1, libgdal1-1.3.2 +Description: 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 many 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 the shared library. + +Package: libgdal1-dev +Section: libdevel +Architecture: any +Depends: libgdal1-1.5.0 (=${binary:Version}), libc6-dev, netcdfg-dev, libtiff4-dev, + libjasper-dev|libjasper-1.701-dev, libpng12-dev, libjpeg62-dev, libungif4-dev, libhdf4g-dev, + libpq-dev | postgresql-dev, libxerces27-dev, unixodbc-dev, libsqlite3-dev, libgeos-dev, + libmysqlclient15-dev, libhdf5-serial-dev, libltdl3-dev, libcurl4-dev|libcurl3-dev +Suggests: libgdal-doc +Provides: libgdal-dev +Replaces: libgdal1-1.3.1-dev, libgdal1-1.3.2-dev +Conflicts: libgdal1-1.3.2-dev, libgdal1-1.3.1-dev +Description: Geospatial Data Abstraction Library - Development files + 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 many 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 the files needed to develop a software that + will use the GDAL/OGR (headers, static objects, configuration script). + +Package: libgdal-doc +Section: doc +Architecture: all +Suggests: libgdal1-1.5.0 (=${binary:Version}) +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. + 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 documentation for GDAL/OGR API. + +Package: gdal-bin +Section: science +Architecture: any +Depends: ${shlibs:Depends} +Homepage: http://www.gdal.org/gdal_utilities.html +Suggests: python-gdal +Description: Geospatial Data Abstraction Library - Utility programs + 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 utility programs, based on GDAL/OGR library, + namely gdal_translate, gdalinfo, gdaladdo, gdalwarp, ogr2ogr, ogrinfo, + ogrtindex. + +Package: python-gdal +Section: python +Architecture: any +Depends: ${shlibs:Depends}, ${python:Depends}, python-numpy +Provides: ${python:Provides} +Homepage: http://trac.osgeo.org/gdal/wiki/GdalOgrInPython +XB-Python-Version: ${python:Versions} +Description: Python 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 bindings for GDAL/OGR library and + a set of additional command line tools. + +Package: libgdal-perl +Section: perl +Architecture: any +Depends: ${shlibs:Depends}, ${perl:Depends} +Homepage: http://map.hut.fi/doc/Geo-GDAL/html/ +Description: Perl 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 Perl bindings for GDAL/OGR library. + +Package: libgdal-ruby1.8 +Section: interpreters +Architecture: any +Depends: ${shlibs:Depends} +Description: Ruby 1.8 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 ruby 1.8 bindings for GDAL/OGR library. + +Package: libgdal-ruby +Section: interpreters +Architecture: any +Depends: libgdal-ruby1.8 +Description: Ruby bindings to the Geospatial Data Abstraction Library + This is a dummy package which depends on current ruby version + to support GDAL/OGR library binding upgrades. --- gdal-1.5.2.orig/debian/rules +++ gdal-1.5.2/debian/rules @@ -0,0 +1,168 @@ +#!/usr/bin/make -f +# -*- makefile -*- +# +# Original debian package by Alessandro Amici 2002-2003. +# Currently maintained by DebianGis contributors. +# Based on: GNU copyright 1997 to 1999 by Joey Hess. + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +# dpatch targets +include /usr/share/dpatch/dpatch.make + +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) + +gdal-grass: configure gdal-grass-dist clean +gdal-grass-dist: + ln -fs $(CURDIR)/GDALmake.opt-$(PYDEF) $(CURDIR)/GDALmake.opt + [ -e $(CURDIR)/GDALmake.opt ] && $(MAKE) -C $(CURDIR)/frmts/grass dist + mv $(CURDIR)/frmts/grass/gdal-grass-*.tar.gz $(CURDIR)/.. + rm -f $(CURDIR)/GDALmake.opt + +configure: configure-stamp +configure-stamp: patch-stamp + dh_testdir + + for V in $(PYVERS); do \ + PYTHON=/usr/bin/python$$V ./configure --prefix=/usr \ + --mandir=\$$\{prefix\}/share/man \ + --includedir=\$$\{prefix\}/include/gdal \ + --with-threads \ + --with-grass=no \ + --with-geotiff=internal \ + --with-jasper \ + --with-netcdf \ + --with-xerces \ + --with-geos \ + --with-sqlite \ + --with-curl \ + --with-pg \ + --with-ogdi \ + --with-mysql \ + --with-perl \ + --with-ruby \ + --with-python \ + --with-cfitsio=no; \ + mv GDALmake.opt GDALmake.opt-$$V; \ + done + + # Overrides the generated libtool with official one, due to + # breakage in upstream version. + cp /usr/bin/libtool $(CURDIR)/libtool + + # Patch the generated libtool to avoid passing -rpath when linking, + # and to explicitly link libraries against the libraries they + # depend on. + sed < libtool > libtool-2 \ + -e 's/^hardcode_libdir_flag_spec.*$$/hardcode_libdir_flag_spec=" -D__LIBTOOL_IS_A_FOOL__ "/' \ + -e '/^archive_cmds="/s/"$$/ \\$$deplibs"/' \ + -e 's/^hardcode_into_libs.*$$/hardcode_into_libs=no/' + mv libtool-2 libtool + chmod 755 libtool + + touch configure-stamp + +build: configure-stamp build-stamp +build-stamp: + dh_testdir + + cp `ls GDALmake.opt-*|tail -1` GDALmake.opt + $(MAKE) lib-target apps-target + $(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 + for V in $(PYVERS); do \ + cp GDALmake.opt-$$V GDALmake.opt; \ + $(MAKE) -C $(CURDIR)/swig/python clean; \ + $(MAKE) -C $(CURDIR)/swig/python build; \ + $(MAKE) -C $(CURDIR)/swig/python install DESTDIR=$(CURDIR)/debian/python-tmp; \ + echo "Patching ogr.py" ; \ + patch $(CURDIR)/debian/python-tmp/usr/lib/python$$V/site-packages/osgeo/ogr.py $(CURDIR)/debian/ogr.py.diff; \ + done + $(MAKE) docs + $(MAKE) man + + touch build-stamp + +clean: clean-unpatched unpatch +clean-unpatched: + dh_testdir + dh_testroot + + [ ! -f GDALmake.opt ] || $(MAKE) distclean + rm -rf $(CURDIR)/swig/ruby/.libs $(CURDIR)/swig/perl/*.bs + rm -rf $(CURDIR)/swig/perl/*.c $(CURDIR)/swig/perl/*.cpp + rm -f GDALmake.opt-* + rm -rf $(CURDIR)/man/man1 + rm -rf $(CURDIR)/debian/tmp $(CURDIR)/debian/python-tmp + + dh_clean build-stamp configure-stamp + +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + + cp `ls GDALmake.opt-*|tail -1` GDALmake.opt + $(MAKE) install BINDINGS="perl ruby" DESTDIR=$(CURDIR)/debian/tmp \ + INST_DATA="\$$(prefix)/share/gdal15" + $(MAKE) install-docs DESTDIR=$(CURDIR)/debian/tmp \ + "INST_DOCS=\$$(prefix)/share/doc/libgdal-doc"\ + "INST_MAN=\$$(prefix)/share/man" + $(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/. + + # removing license file + rm -f $(CURDIR)/debian/tmp/usr/share/gdal15/LICENSE.TXT + # removing empty packlist MakeMaker files + -find $(CURDIR)/debian/tmp/usr/local/lib/perl -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 {} \; + + # 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/usr/local/lib/site_ruby/$(RUBYDEF)/* $(CURDIR)/debian/tmp/usr/lib/ruby/$(RUBYDEF)/. + +binary-common: + dh_testdir + dh_testroot + dh_movefiles + dh_installdocs + dh_installchangelogs NEWS + dh_link + dh_strip + dh_compress + dh_fixperms + dh_pycentral -X.info + rm -f $(CURDIR)/debian/python-gdal/usr/share/pycentral/python-gdal/site-packages/GDAL-1.5.0.egg-info + dh_perl + dh_makeshlibs + dh_installdeb + dh_shlibdeps -L libgdal1-1.5.0 -l debian/libgdal1-1.5.0/usr/lib + dh_gencontrol + dh_md5sums + dh_builddeb + +binary-arch: build install + $(MAKE) -f debian/rules DH_OPTIONS=-a binary-common + +binary-indep: build install + $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common + +binary: binary-arch binary-indep +.PHONY: build clean binary-arch binary-indep binary-common binary install patch unpatch clean-unpatched gdal-grass-dist --- gdal-1.5.2.orig/debian/watch +++ gdal-1.5.2/debian/watch @@ -0,0 +1,2 @@ +version=2 +ftp://ftp.remotesensing.org/pub/gdal/gdal-([0-9].*)\.tar\.gz debian uupdate --- gdal-1.5.2.orig/debian/libgdal1-dev.files +++ gdal-1.5.2/debian/libgdal1-dev.files @@ -0,0 +1,6 @@ +usr/bin/gdal-config +usr/include +usr/lib/libgdal1.5.0.a +usr/lib/libgdal1.5.0.la +usr/lib/libgdal1.5.0.so +usr/share/man/man1/gdal-config.1 --- gdal-1.5.2.orig/debian/libgdal-ruby1.8.files +++ gdal-1.5.2/debian/libgdal-ruby1.8.files @@ -0,0 +1 @@ +usr/lib/ruby/* --- gdal-1.5.2.orig/debian/ogr.py.diff +++ gdal-1.5.2/debian/ogr.py.diff @@ -0,0 +1,54 @@ +This is a patch suggested in #473912 (i.e. fix for upstream bug #2187). +It is merged in 1.5.2 AFAIK. + +diff -urNad gdal-1.5.1~/swig/python/osgeo/ogr.py gdal-1.5.1/swig/python/osgeo/ogr.py +--- gdal-1.5.1~/swig/python/osgeo/ogr.py 2008-04-19 19:46:19.000000000 +0200 ++++ gdal-1.5.1/swig/python/osgeo/ogr.py 2008-05-06 16:50:37.000000000 +0200 +@@ -6,6 +6,8 @@ + + import _ogr + import new ++import types ++ + new_instancemethod = new.instancemethod + try: + _swig_property = property +@@ -38,14 +40,12 @@ + except: strthis = "" + return "<%s.%s; %s >" % (self.__class__.__module__, self.__class__.__name__, strthis,) + +-import types + try: + _object = types.ObjectType + _newclass = 1 + except AttributeError: + class _object : pass + _newclass = 0 +-del types + + + wkb25Bit = _ogr.wkb25Bit +@@ -561,7 +561,6 @@ + ] would return the first layer on the datasource. + aname'] would return the layer named "aname". + :4] would return a list of the first four layers.""" +- import types + if isinstance(value, types.SliceType): + output = [] + for i in xrange(value.start,value.stop,value.step): +@@ -581,7 +580,6 @@ + + def GetLayer(self,iLayer=0): + """Return the layer given an index or a name""" +- import types + if isinstance(iLayer, types.StringTypes): + return self.GetLayerByName(str(iLayer)) + elif isinstance(iLayer, types.IntType): +@@ -1829,7 +1827,6 @@ + raise AttributeError, name + + def GetField(self, fld_index): +- import types + if isinstance(fld_index, types.StringType): + fld_index = self.GetFieldIndex(fld_index) + if (fld_index < 0) or (fld_index > self.GetFieldCount()): --- gdal-1.5.2.orig/debian/changelog +++ gdal-1.5.2/debian/changelog @@ -0,0 +1,591 @@ +gdal (1.5.2-3~bpo40+1) etch-backports; urgency=low + + * Backported to etch. + * Moved libcurl4-dev -> libcurl3-dev in build-dep. + * Using bpo libtool to respect versioning restriction and changed minimal + version to match that available in bpo. + * In build-deps: + o Moved libnetcdf-dev -> netcdfg-dev + o Moved libgif-dev -> libungif4-dev + o Moved libxerces-c2-dev -> libxerces27-dev + * Does not regenerate python swig stuff in debian/rules + due to incompatibilities among etch swig version and gdal. + + -- Francesco Paolo Lovergine Tue, 28 Oct 2008 17:59:53 +0100 + +gdal (1.5.2-3) unstable; urgency=low + + * [PATCH] sincos.dpatch: the sincos() function is already defined + in libm. Hopefully this is the only case of a redefinition + of a standard weak function. This is exploited casually only in + case of an optimization because of the reason exposed in + http://www.nabble.com/Re%3A-g.region--g-crashes-in-a-latlon-location-p18579971.html + (closes: #489124) + + -- Francesco Paolo Lovergine Tue, 22 Jul 2008 10:30:00 +0200 + +gdal (1.5.2-2) unstable; urgency=low + + * Updated build-deps: + netcdfg-dev -> libnetcdf-dev + libungif4-dev -> libgif-dev + * Policy bumped to 3.8.0. + * Added build-dep on libexpat1-dev to enable use of Expat library. + * Long descriptions revised. + * [PATCH] New eoverflow.dpatch. + It fixes largefile breakage introduced in recent versions. + See http://trac.osgeo.org/gdal/ticket/2437. + + -- Francesco Paolo Lovergine Wed, 02 Jul 2008 17:27:38 +0200 + +gdal (1.5.2-1) unstable; urgency=low + + * New upstream release. This is a bug fix release. + (closes: #485582) + * Patchset updated: removed max.dpatch, merged upstream. + * Added a gdal-grass stanza in debian/rules to generate the gdal-grass + tarball on fly. + * Added a Suggests for python-gdal in gdal-bin stanza within debian/control. + + -- Francesco Paolo Lovergine Tue, 10 Jun 2008 16:08:05 +0200 + +gdal (1.5.1-5) unstable; urgency=low + + * Installs gdal2tiles.py and other python scripts, previously missing. + Due to dependency from python-gdal extensions, scripts are installed in + that package instead of gdal-bin. + (closes: #484559) + * Removed ogr.py.dpatch for #473912. Fix needs to be applied on fly to + be effective. It also causes a twice build FTBS. Added patch build-dep + to apply ogr.py.diff in debian/rules. + (closes: #473912) + + -- Francesco Paolo Lovergine Fri, 06 Jun 2008 23:15:12 +0200 + +gdal (1.5.1-4) unstable; urgency=medium + + * [PATCH] ogr.py.dpatch added to manage #2187 upstream issue. Thanks Steko. + (closes: #473912) + * [PATCH] gdalpaths.dpatch added to use the same plugins directory + used currently in gdal-grass. It would require a much better approach + upstream. See #2371 upstream bug. Also changed path for share dir path + to /usr/share/gdal15. + (closes: #481263) + + -- Francesco Paolo Lovergine Sun, 18 May 2008 09:55:57 +0200 + +gdal (1.5.1-3) unstable; urgency=low + + * Removed old-python stuff still around in debian/rules. + * [PATCH] pythonmakefile.dpatch to fix wrong interpreter override in 1.5.1 + See #2333 on gdal trac. + (closes: #476657) + * Revised the build/install rules to manage better Swig stuff and + specifically Python bindings. + + -- Francesco Paolo Lovergine Sat, 19 Apr 2008 20:51:48 +0200 + +gdal (1.5.1-2) unstable; urgency=low + + * Moved libxerces27-dev dependency to libxerces-c2-dev in debian/control as + requested by xerces maintainer for migration. + * [PATCH] max.dpatch to fix max/min macros re-definition on some archs + which breaks C++ building. This is taken from GDAL patchest 13700+13701 in trunk. + Thanks DronK. + (closes: #474415) + + -- Francesco Paolo Lovergine Mon, 07 Apr 2008 12:58:56 +0200 + +gdal (1.5.1-1) unstable; urgency=low + + * New upstream release with useful bugfixes. No API/ABI changes, so + retaining package versions. + (closes: #464452) + * Moved build-dep libcurl-dev -> libcurl3-dev in debian/control for etch backports. + * Patch swig.dpatch removed (merged upstream). + * Patch gcc32.dpatch removed (merged upstream). + + -- Francesco Paolo Lovergine Wed, 26 Mar 2008 23:23:00 +0100 + +gdal (1.5.0-4) unstable; urgency=low + + * Fixed removing of .info file in python-central area + * Fixed gcc43.dpatch to manage namespace issue. This is not accepted upstream. + (closes: #462709) + * Updated debian/TODO. + * Forcing regeneration of perl wrappers with current Swig in debian/rules + as suggested by Pabs. + (closes: #466785) + + -- Francesco Paolo Lovergine Fri, 14 Mar 2008 15:57:34 +0100 + +gdal (1.5.0-3) unstable; urgency=low + + * [debian/rules] Removing LICENSE.TXT placed in the data dir. + * [debian/rules] Added explicit python-binding generation previously missing + Now installs files from new locations because 1.5 moved to ng-python + (swig-based) support. (closes: #463077) + * Patch swig.dpatch changed to use the correct python interpreter at building + time as found at configuration time. Old pymod fix removed. + * [debian/control] Changed python-numeric -> python-numpy build-dep due to + new-generation python support. + * [debian/rules] Added missing dh_perl call. + (closes: #463086) + * [debian/rules] Added a info file exclusion at dh_pycentral call. + * [debian/rules] Now removing info file installed in pycentral area. + * Added gcc43.dpatch: remove transform() call. + See http://trac.osgeo.org/gdal/changeset/13615?format=diff&new=13615 for fix. + (closes: #462709) + + -- Francesco Paolo Lovergine Thu, 31 Jan 2008 14:23:29 +0100 + +gdal (1.5.0-2) unstable; urgency=low + + * Moved /usr/share/gdal -> /usr/share/gdal15 in order to avoid conflicting + with previous upstream version. + (closes: #462525) + + -- Francesco Paolo Lovergine Fri, 25 Jan 2008 14:25:21 +0100 + +gdal (1.5.0-1) unstable; urgency=low + + * New upstream release + * Added Vcs-* fields to debian/control + * Policy bumped to 3.7.3 (no changes) + * Ruby stuff does not build correctly with upstream libtool stuff, so + overriding in debian/rules. + See http://trac.osgeo.org/gdal/ticket/2138 for reference about the issue. + * Added a (versioned for safety) build-dep on libtool. + * A group of new binaries added to gdal-bin stuff. + * [PATCH] man.dpatch: + Man pages are not generated by upstream makefile, added .PHONY entry + and explicit generation. + * Minor changes for files installation due to changes upstream. + * Changed man pages removing style at clean time in debian/rules. + + -- Francesco Paolo Lovergine Wed, 09 Jan 2008 09:57:10 +0100 + +gdal (1.4.4-1) unstable; urgency=low + + * New upstream version, which fixes an ABI breakage. + (closes: #452355) + * Changed swig.dpatch because partially merged upstream. + * Removed gcc43.dpatch because merged upstream. + * Added missing swig build-dep. + + -- Francesco Paolo Lovergine Tue, 04 Dec 2007 11:10:37 +0100 + +gdal (1.4.3-1) unstable; urgency=low + + * New upstream release. + This is a bug fixing release without API changes, so retaining current + naming scheme as for previous 1.4 series releases. + * Uses PIC building in Ruby bindings and properly fails in case of + building problems to avoid creating empty packages. Changed rubymakefile.dpatch + for that. + (closes: #450882) + + -- Francesco Paolo Lovergine Thu, 15 Nov 2007 17:19:50 +0100 + +gdal (1.4.2-3) unstable; urgency=low + + * Fixed debian-rules-ignores-make-clean-error lintian warning + * Removes embedded rpath in perl extensions and MakeMaker .packlist files. + + -- Francesco Paolo Lovergine Fri, 19 Oct 2007 23:46:07 +0200 + +gdal (1.4.2-2) unstable; urgency=low + + [ Paul Wise ] + * Switch to new Homepage field + + [ Francesco Paolo Lovergine ] + * Migrated obsolete ${Source-Version} to ${binary:Version} in debian/control + * Added perl and ruby binding and a couple of new binary packages for that. + (closes: #393167) + * Build-deps updated. + * Missing gdal_rasterize binary and python tools added to *.files + * Missing man pages added to *.files + * Added build dependency for install target in rules. + * Fixed swig/perl/Makefile.PL on fly via libname.dpatch to build correctly perl binding. + * Added debian/TODO file + * Added patch rubymakefile.dpatch to fix ruby module building. + + -- Francesco Paolo Lovergine Tue, 16 Oct 2007 12:16:16 +0200 + +gdal (1.4.2-1) unstable; urgency=low + + * New upstream version. Still an upstream fix without API changes. + * Removed obsolete postgresql-dev dependency. + (closes: #429974) + + -- Francesco Paolo Lovergine Mon, 03 Sep 2007 17:09:40 +0200 + +gdal (1.4.1-6) unstable; urgency=low + + * New patch gcc43.dpatch, to be compliant with gcc 4.3. Thanks Martin Michlmayr. + (closes: #419827) + * Revised libgdal1-dev dependencies due to libtool .la file. Thanks Kurt Roeckx. + (closes: #421992) + * Removed fake libsqlite0-dev build-dep. + + -- Francesco Paolo Lovergine Fri, 18 May 2007 22:28:24 +0200 + +gdal (1.4.1-5) unstable; urgency=low + + * libcfitsio3 library is now GPL on Debian, so disabled due to incompatibility with GDAL copyright. + (closes: #422537) + * Added a libhdf5-serial-dev dependency for libgdal1-dev. + (closes: #421992) + * Re-introduced libcurl4-dev build-dep, now in unstable. + * Added doc.dpatch for cross-linking html documentation in libgdal-doc. + (closes: #421655) + + -- Francesco Paolo Lovergine Sat, 12 May 2007 16:33:56 +0200 + +gdal (1.4.1-4) unstable; urgency=medium + + * New patch swig.dpatch to use a swig 1.1 version for gdal_warp.c. + (closes: #420706) + * New build also resolves the indirect dependency issue with libgnutls + (closes: #421434) + + -- Francesco Paolo Lovergine Mon, 30 Apr 2007 11:34:37 +0200 + +gdal (1.4.1-3) unstable; urgency=medium + + * Added OGDI support: new patch ogdi.dpatch + * This build should finally link current jasper 1.900.1 + + -- Francesco Paolo Lovergine Sat, 28 Apr 2007 08:54:51 +0200 + +gdal (1.4.1-2) unstable; urgency=high + + * Fixed rules file for libgdal-1.4.0 + + -- Francesco Paolo Lovergine Sat, 21 Apr 2007 20:36:47 +0200 + +gdal (1.4.1-1) unstable; urgency=low + + * New upstream version. Package names are not changed in respect with 1.4.0 + and in derogation with current gdal migration policy for debian-gis + because there are not changes to C/C++ API. + + -- Francesco Paolo Lovergine Sun, 8 Apr 2007 11:31:07 +0200 + +gdal (1.4.0-2) unstable; urgency=low + + * Moved header files under /usr/include/gdal. + * Added missing libjasper-dev dependency to libgdal1-dev. + * Added an alternate libcurl-dev build-dep. + + -- Francesco Paolo Lovergine Sun, 8 Apr 2007 11:18:33 +0200 + +gdal (1.4.0-1) experimental; urgency=low + + * New upstream version. Moved to libgdal1-dev package, which allows rebuilds + of dependent packages without source changes. It is currently superfluous + changing the -dev package at every new release because we do not support + many different versions of the gdal lib. + * libname patch updated. + * Removed obsolete patches. + * debian/rules: removed previous hack for gdal-config. Now DESTDIR is managed correctly + in building scripts. + * Moved to libcfitsio3-dev|libcfitsio-dev build-dep to retain source back-compatibility with + etch and preferring the current library version. + (closes: #413126) + * Added missing sqlite3 and curl4 libraries support. + * Moved to libjasper-dev|libjasper-1.701-dev to retain source compatibility + with the old library version. + * Added libhd5-serial-dev build-dep to support both HDF4/5. + + -- Francesco Paolo Lovergine Mon, 5 Mar 2007 15:27:09 +0100 + +gdal (1.3.2-5) UNRELEASED; urgency=low + + * debian/watch: fixed. + + -- Fabio Tranchitella Fri, 9 Feb 2007 12:18:49 +0100 + +gdal (1.3.2-4) unstable; urgency=medium + + * Now copies build-time gdal-config at install-time. + (closes: #385747) + * Removed Jon Saints and added Paul Wise to Uploaders. + + -- Francesco Paolo Lovergine Tue, 30 Jan 2007 17:45:14 +0100 + +gdal (1.3.2-3) unstable; urgency=high + + * Urgency high: this release fixes two RC bugs. + * debian/rules: moved dh_pycentral before dh_builddeb, this adds postinst + and prerm maintainer scripts. (Closes: #385460) + * debian/control: added missing depends for libgeos-dev, + libmysqlclient15-dev for libgdal1-1.3.2-dev. (Closes: #401162) + + -- Fabio Tranchitella Fri, 22 Dec 2006 16:57:54 +0100 + +gdal (1.3.2-2) unstable; urgency=low + + * Added missing gdal1-1.3.1(-dev) conflicts/replaces to debian/control to + prevent dist-upgrade errors. + + -- Francesco Paolo Lovergine Tue, 8 Aug 2006 14:08:32 +0200 + +gdal (1.3.2-1) unstable; urgency=low + + [ Francesco P. Lovergine ] + + The "doing-it-yourself-is-better" release. + + * New upstream release. + (closes: #370441) + As stated previously, changed package name for + a smooth C++ transition in case of (undocumented) API/ABI changes. + Changed control and other files as consequence for 1.3.1 -> 1.3.2 transition. + - Patch revised: + libname.dpatch + - Patches removed: + 351372_mipsel_ftbfs.dpatch (applied upstream) + 357189_gcc4.1_ftbfs.dpatch (idem) + 360389_amd64_ftbfs.dpatch (better done by upstream) + - New patch: + ogrili2layer.cpp.dpatch (gcc 4.1 STL compatibility) + * Policy bumped to 3.7.2. No changes. + * Removed a couple of old *.docs and *.files files in debian dir. + * Added mysql support. + * Moved to new python policy. Note that python-gdal provides both modules + and an extension, so quite a few changes are required all around. + See http://wiki.debian.org/DebianPython/NewPolicy for information about + the matter. + -- NOTE FOR BACKPORTERS: DO NOT EVEN TRY THAT, WITHOUT BACKPORTING ALL THE NEW PYTHON FRAMEWORK -- + (Closes: #373433) + + -- Francesco Paolo Lovergine Tue, 20 Jun 2006 15:06:13 +0200 + +gdal (1.3.1-6) unstable; urgency=high + + * Switch from libxerces26-dev to libxerces27-dev (Closes: #368914) + + -- Paul Wise Sat, 27 May 2006 12:55:30 +0800 + +gdal (1.3.1-5) unstable; urgency=low + + [ Paul Wise ] + * Fix GCC 4.1 FTBFS with patch from Martin Michlmayr. Closes: #357189 + + [ Francesco Paolo Lovergine ] + * Fix Unix ODBC FTBS with patch by me. Closes: #360389 + * Added versioned build-dep on unixodbc-dev for safety, just in case. + + -- Francesco Paolo Lovergine Tue, 4 Apr 2006 00:14:56 +0200 + +gdal (1.3.1-4) unstable; urgency=low + + [ Paul Wise ] + * Fix FTBFS on mipsel with patch from upstream. Closes: #351372 + + [ Petter Reinholdtsen ] + * Add myself as uploader. + * Acknowledge NMU. (Closes: #321587) + + -- Petter Reinholdtsen Fri, 10 Feb 2006 22:46:34 +0100 + +gdal (1.3.1-3) unstable; urgency=high + + [ Francesco Paolo Lovergine ] + * Revised rules to use binary-indep for its -doc package. + * Rebuilt to link the correct netcdf packages, which apparently did break + something and renders libgdal and all its rdepends uninstallable. + Sigh, netcdfg3 moved to libnetcdf3 but I would appreciate notifications + to all interested parties or proper mass bug filling... + + -- Francesco Paolo Lovergine Wed, 1 Feb 2006 15:08:30 +0100 + +gdal (1.3.1-2) unstable; urgency=low + + [ Petter Reinholdtsen ] + * Add Francesco Paolo Lovergine as uploader, to make sure the next + upload isn't seen as a non-maintainer upload. + + [ Francesco Paolo Lovergine ] + * Missed patched reverting, anyway moving to dpatch which is more robust for + patch management in case of build failures and re-builds. + (closes: #349562). Changed control and rules files as consequence. + + -- Francesco Paolo Lovergine Tue, 24 Jan 2006 10:56:55 +0100 + +gdal (1.3.1-1) unstable; urgency=low + + [ Steve Halasz ] + * Switch to team maintenance by the Debian GIS Project. + This is _not_ hijacking, Silke is no more active on this package + and passed the package to the team. + * New upstream release + - Don't crash on shapefiles without features (Closes: #309165) + * Build-dep on libpq-dev | postgresql-dev for postgresql transition + * Remove build-dep on postgresql-client + * Make libgdal-dev depend on a number of -dev packages so that + packages depending on libgdal-dev don't have to depend on them + * Change library package names to libgdal1-1.3.1 / libgdal1-1.3.1-dev + to reflect C++ ABI change that will be expected with every new + version. The C API is stable (SONAME 1), but unfortunately both + C and C++ API are merged in the same library by upstream. + See http://lists.alioth.debian.org/pipermail/pkg-grass-general/2005-December/001565.html + for a few details about the C++ API and ABI saga. + + [ Paul Wise ] + * Add homepages to the package descriptions + + [ Francesco Paolo Lovergine ] + * Added 02_libname.patch to add the version to the lib name. This will + allow cohexistence of more version of the library without glitches. + + -- Francesco Paolo Lovergine Sat, 21 Jan 2006 13:14:06 +0100 + +gdal (1.2.6-1.3) unstable; urgency=medium + + * Non-maintainer upload. + * Medium-urgency upload for RC bugfix. + * Change package name from libgdal1c2 to libgdal1c2a for the C++ mt + allocator ABI change, and conflict/replace libgdal1c2 accordingly. + Closes: #339163. + * Build-depend on libgeos-dev (>= 2.1.4-2) to get the matching ABI. + + -- Steve Langasek Tue, 29 Nov 2005 05:06:47 -0800 + +gdal (1.2.6-1.2) unstable; urgency=low + + * Fix broken library building introduced by my last NMU. (Closes: #322664) + * Moved GCC 4 patch into debian/patches/01_gcc4.patch, based on + patch from Stephan Hermann and Ubuntu. Updated rules to use it. + * Add Conflicts and Replaces on libgdal1 for libgdal1c2 to ease upgrades. + + -- Petter Reinholdtsen Fri, 12 Aug 2005 08:11:40 +0200 + +gdal (1.2.6-1.1) unstable; urgency=low + + * Non-maintainer upload to move to new C++ ABI. (Closes: #321587) + * Rename library package from libgdal1 to libgdal1c2. + * Add forward declaration of ILWISDataset in + frmts/ilwis/ilwisdataset.h to make GCC 4.0 happy. + + -- Petter Reinholdtsen Sat, 6 Aug 2005 11:57:48 +0200 + +gdal (1.2.6-1) unstable; urgency=high + + * New upstream release + * Made python-gdal explicitly dependend on current gdal-version + (Closes: #291361) + * Added pct2rgb.py and gdal_merge.py to python-gdal + * Changed xerces dependency from libxerces21 to libxerces26 + (Closes: #301710 and Closes: #301650) + * Added link from /usr/include/gdal to /usr/include (Closes:#286709). + * Already in 1.2.5.-1: Added geos-support + + -- Silke Reimer Mon, 4 Apr 2005 19:04:21 +0200 + +gdal (1.2.5-1) unstable; urgency=low + + * New upstream release (Closes: #280343) + * Added gdaltindex and gdal_contour in debian/gdal-bin.files + (Closes: #278539) + + -- Silke Reimer Thu, 25 Nov 2004 18:06:07 +0100 + +gdal (1.2.1-1) unstable; urgency=low + + * New upstream release (Closes: #258367) + * Added flag -V'libgdal1 (>=1.2.0) to solve incompatibility between + libgdal1-1.2.x and libgdal-1.2+cvs031111 (Closes: #254344) + * Add support for jpeg2000 (jasper), netcdf and sqlite. + * Move tiff support to external library (finally added to debian!)(Thanks + Alessandro for your hint!) + * debian/control + * debian/changelog + + -- Silke Reimer Thu, 25 Nov 2004 18:05:53 +0100 + +gdal (1.2.0-1) unstable; urgency=low + + * New upstream release + * Use manpages from upstream + * Changed package requirements for libgdal1-dev: added virtual package + libgdal-dev, added dependency on libc6-dev and unixodbc-dev + + -- Silke Reimer (MoinMoin) Mon, 8 Mar 2004 18:05:58 +0100 + +gdal (1.2+cvs.031111-1) unstable; urgency=low + + * New upstream cvs snapshot. This should fix the building failure + on arm, powerpc, mipsel and s390 due to "invalid conversion from + `int8*' to `const char*'" + * add odbc support to debian package. + * switch on xerces support. + + + -- Silke Reimer (MoinMoin) Wed, 12 Nov 2003 10:21:13 +0100 + +gdal (1.2+cvs.031016-1) unstable; urgency=low + + * Take maintainership + * added man pages + * added libtool patch to debian/rules to avoid linking with rpath + * changed last line of pymod/GNUmakefile because otherwise all + files within pymod would be deleted when building package with + fakeroot + + -- Silke Reimer (MoinMoin) Fri, 17 Oct 2003 11:14:34 +0200 + +gdal (1.2+0pre1) unstable; urgency=low + + * New upstream cvs snapshot with proper soname versioning. + Getting ready for the upcoming 1.2.0. + * Add xerces support. + * Get the package generally in shape for being sponsored into Debian. + * Hand package maintainership over to Silke. + + -- Alessandro Amici (devel) Fri, 26 Sep 2003 00:43:14 +0200 + +gdal (1.1.9-1) unstable; urgency=low + + * New upstream release with a lot of new formats and features. + * Fix the --libs option of the installed gdal-config. + * Many correctness and style fixes to debian/rules. The aim is to have + the source package to build cleanly on woody as well. + * Change the build dependencies to present a woody alternative to sid-only + packages. + + -- Alessandro Amici (devel) Mon, 28 Jul 2003 23:18:55 +0200 + +gdal (1.1.8+030610-1) unstable; urgency=low + + * New cvs snapshot with improved handling of html documentation. + * Split libgdal-doc out of libgdal1-dev. + * Add html documentation for ogr. + * Add postgresql support. + * Set python dependencies to python2.2 (and add python2.2-numeric) + * Recommend proj (accessed via dlopen). + + -- Alessandro Amici (devel) Tue, 10 Jun 2003 16:18:17 +0200 + +gdal (1.1.8+030521-1) unstable; urgency=low + + * New cvs snapshot with support for custom shared library soname. + * Build the gdal shared library with debian compliant file name and soname. + See the README.Debian for reasons and caveats. + * Rename the main packages to libgdal1 (OK, I learned the hard way how + important package names are!). + * Change the upstream version definition to $(version)+$(cvsdate). + + -- Alessandro Amici (devel) Thu, 22 May 2003 19:33:54 +0200 + +gdal (1.1.8-030518+1) unstable; urgency=low + + * Initial release. + * libgdal.1.1.so is not a standard shared library. + * Man pages are missing. + * A few files are missing from the html documentation. + + -- Alessandro Amici (devel) Sun, 18 May 2003 18:05:12 +0200 + --- gdal-1.5.2.orig/debian/libgdal1-1.5.0.docs +++ gdal-1.5.2/debian/libgdal1-1.5.0.docs @@ -0,0 +1 @@ +NEWS --- gdal-1.5.2.orig/debian/libgdal-perl.files +++ gdal-1.5.2/debian/libgdal-perl.files @@ -0,0 +1 @@ +usr/lib/perl5 --- gdal-1.5.2.orig/debian/compat +++ gdal-1.5.2/debian/compat @@ -0,0 +1 @@ +4 --- gdal-1.5.2.orig/debian/libgdal-doc.files +++ gdal-1.5.2/debian/libgdal-doc.files @@ -0,0 +1,2 @@ +usr/share/doc/libgdal-doc/gdal +usr/share/doc/libgdal-doc/ogr --- gdal-1.5.2.orig/debian/gdal-bin.files +++ gdal-1.5.2/debian/gdal-bin.files @@ -0,0 +1,28 @@ +usr/bin/gdal_grid +usr/bin/gdalenhance +usr/bin/gdalmanage +usr/bin/gdaltransform +usr/bin/nearblack +usr/bin/gdal_translate +usr/bin/gdal_rasterize +usr/bin/gdalinfo +usr/bin/gdaladdo +usr/bin/gdalwarp +usr/bin/gdaltindex +usr/bin/gdal_contour +usr/bin/ogr* +usr/share/man/man1/gdal_rasterize.1 +usr/share/man/man1/gdal_translate.1 +usr/share/man/man1/gdal_utilities.1 +usr/share/man/man1/gdalinfo.1 +usr/share/man/man1/gdaladdo.1 +usr/share/man/man1/gdalwarp.1 +usr/share/man/man1/gdaltindex.1 +usr/share/man/man1/gdal_contour.1 +usr/share/man/man1/ogr*.1 +usr/share/man/man1/gdal2tiles.1 +usr/share/man/man1/gdal_grid.1 +usr/share/man/man1/gdal_retile.1 +usr/share/man/man1/gdaltindex.1 +usr/share/man/man1/gdaltransform.1 +usr/share/man/man1/nearblack.1 --- gdal-1.5.2.orig/debian/python-gdal.files +++ gdal-1.5.2/debian/python-gdal.files @@ -0,0 +1,5 @@ +usr/lib/python* +usr/bin/*.py +usr/share/man/man1/gdal_merge.1 +usr/share/man/man1/pct2rgb.1 +usr/share/man/man1/rgb2pct.1 --- gdal-1.5.2.orig/debian/pycompat +++ gdal-1.5.2/debian/pycompat @@ -0,0 +1 @@ +2 --- gdal-1.5.2.orig/debian/patches/sincos.dpatch +++ gdal-1.5.2/debian/patches/sincos.dpatch @@ -0,0 +1,19 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## sincos.dpatch by Francesco Paolo Lovergine +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad gdal-1.5.2~/frmts/hdf4/hdf-eos/GDapi.c gdal-1.5.2/frmts/hdf4/hdf-eos/GDapi.c +--- gdal-1.5.2~/frmts/hdf4/hdf-eos/GDapi.c 2007-11-14 16:12:27.000000000 +0100 ++++ gdal-1.5.2/frmts/hdf4/hdf-eos/GDapi.c 2008-07-22 13:28:47.000000000 +0200 +@@ -6258,7 +6258,7 @@ + + + +-#if !defined(HP9000) && !defined(DEC_ALPHA) ++#if 0 + void + sincos(double val, double *sin_val, double *cos_val) + { --- gdal-1.5.2.orig/debian/patches/pythonmakefile.dpatch +++ gdal-1.5.2/debian/patches/pythonmakefile.dpatch @@ -0,0 +1,19 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## python.dpatch by Francesco Paolo Lovergine +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad gdal-1.5.1~/swig/python/GNUmakefile gdal-1.5.1/swig/python/GNUmakefile +--- gdal-1.5.1~/swig/python/GNUmakefile 2008-04-19 13:12:54.000000000 +0200 ++++ gdal-1.5.1/swig/python/GNUmakefile 2008-04-19 13:21:27.000000000 +0200 +@@ -2,7 +2,7 @@ + + include ../../GDALmake.opt + +-ifndef $(PYTHON) ++ifndef PYTHON + PYTHON=python + endif + --- gdal-1.5.2.orig/debian/patches/gdalpaths.dpatch +++ gdal-1.5.2/debian/patches/gdalpaths.dpatch @@ -0,0 +1,43 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## pluginspath.dpatch by Francesco Paolo Lovergine +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad gdal-1.5.1~/gcore/gdaldrivermanager.cpp gdal-1.5.1/gcore/gdaldrivermanager.cpp +--- gdal-1.5.1~/gcore/gdaldrivermanager.cpp 2007-08-13 17:02:33.000000000 +0200 ++++ gdal-1.5.1/gcore/gdaldrivermanager.cpp 2008-05-15 16:35:29.000000000 +0200 +@@ -550,7 +550,7 @@ + #ifdef MACOSX_FRAMEWORK + GDAL_PREFIX "/PlugIns"); + #else +- GDAL_PREFIX "/lib/gdalplugins" ); ++ GDAL_PREFIX "/lib/gdal15plugins" ); + #endif + #else + char szExecPath[1024]; +diff -urNad gdal-1.5.1~/ogr/ogrsf_frmts/generic/ogrsfdriverregistrar.cpp gdal-1.5.1/ogr/ogrsf_frmts/generic/ogrsfdriverregistrar.cpp +--- gdal-1.5.1~/ogr/ogrsf_frmts/generic/ogrsfdriverregistrar.cpp 2007-09-04 16:51:00.000000000 +0200 ++++ gdal-1.5.1/ogr/ogrsf_frmts/generic/ogrsfdriverregistrar.cpp 2008-05-15 16:35:43.000000000 +0200 +@@ -638,7 +638,7 @@ + #ifdef MACOSX_FRAMEWORK + GDAL_PREFIX "/PlugIns"); + #else +- GDAL_PREFIX "/lib/gdalplugins" ); ++ GDAL_PREFIX "/lib/gdal15plugins" ); + #endif + #else + char szExecPath[1024]; +diff -urNad gdal-1.5.1~/port/cpl_findfile.cpp gdal-1.5.1/port/cpl_findfile.cpp +--- gdal-1.5.1~/port/cpl_findfile.cpp 2007-04-03 19:49:14.000000000 +0200 ++++ gdal-1.5.1/port/cpl_findfile.cpp 2008-05-15 16:37:29.000000000 +0200 +@@ -61,7 +61,7 @@ + #ifdef MACOSX_FRAMEWORK + CPLPushFinderLocation( GDAL_PREFIX "/Resources/gdal" ); + #else +- CPLPushFinderLocation( GDAL_PREFIX "/share/gdal" ); ++ CPLPushFinderLocation( GDAL_PREFIX "/share/gdal15" ); + #endif + #else + CPLPushFinderLocation( "/usr/local/share/gdal" ); --- gdal-1.5.2.orig/debian/patches/libname.dpatch +++ gdal-1.5.2/debian/patches/libname.dpatch @@ -0,0 +1,80 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## libname.dpatch by Francesco Paolo Lovergine +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad gdal-1.5.1~/GDALmake.opt.in gdal-1.5.1/GDALmake.opt.in +--- gdal-1.5.1~/GDALmake.opt.in 2008-03-26 14:22:16.000000000 +0100 ++++ gdal-1.5.1/GDALmake.opt.in 2008-03-26 14:22:31.000000000 +0100 +@@ -81,7 +81,7 @@ + -I$(GDAL_ROOT)/ogr -I$(GDAL_ROOT)/ogr/ogrsf_frmts + + # libtool targets and help variables +-LIBGDAL := libgdal.la ++LIBGDAL := libgdal1.5.0.la + LIBGDAL_CURRENT := 13 + LIBGDAL_REVISION := 1 + LIBGDAL_AGE := 12 +@@ -94,9 +94,9 @@ + GDAL_VERSION_MINOR = @GDAL_VERSION_MINOR@ + GDAL_VERSION_REV = @GDAL_VERSION_REV@ + +-GDAL_LIB = $(GDAL_ROOT)/libgdal.a +-GDAL_SLIB = $(GDAL_ROOT)/libgdal.$(SO_EXT) +-GDAL_SLIB_LINK = -L$(GDAL_ROOT) -lgdal ++GDAL_LIB = $(GDAL_ROOT)/libgdal1.5.0.a ++GDAL_SLIB = $(GDAL_ROOT)/libgdal1.5.0.$(SO_EXT) ++GDAL_SLIB_LINK = -L$(GDAL_ROOT) -lgdal1.5.0 + + # Mac OS X Framework definition + MACOSX_FRAMEWORK = @MACOSX_FRAMEWORK@ +@@ -323,9 +323,9 @@ + ifeq ($(HAVE_LIBTOOL), yes) + CONFIG_LIBS = $(GDAL_ROOT)/$(LIBGDAL) + ifeq ($(MACOSX_FRAMEWORK),yes) +-CONFIG_LIBS_INS = -L$(INST_LIB)/unix/lib -lgdal ++CONFIG_LIBS_INS = -L$(INST_LIB)/unix/lib -lgdal1.5.0 + else +-CONFIG_LIBS_INS = -L$(INST_LIB) -lgdal ++CONFIG_LIBS_INS = -L$(INST_LIB) -lgdal1.5.0 + endif + EXE_DEP_LIBS = $(GDAL_ROOT)/$(LIBGDAL) + SO_EXT = la +@@ -334,9 +334,9 @@ + ifeq ($(HAVE_LD_SHARED),yes) + CONFIG_LIBS = $(GDAL_SLIB_LINK) $(LIBS) + ifeq ($(MACOSX_FRAMEWORK),yes) +-CONFIG_LIBS_INS = -L$(INST_LIB)/unix/lib -lgdal ++CONFIG_LIBS_INS = -L$(INST_LIB)/unix/lib -lgdal1.5.0 + else +-CONFIG_LIBS_INS = -L$(INST_LIB) -lgdal ++CONFIG_LIBS_INS = -L$(INST_LIB) -lgdal1.5.0 + endif + EXE_DEP_LIBS = $(GDAL_SLIB) + else +diff -urNad gdal-1.5.1~/swig/perl/Makefile.PL gdal-1.5.1/swig/perl/Makefile.PL +--- gdal-1.5.1~/swig/perl/Makefile.PL 2008-03-26 14:22:16.000000000 +0100 ++++ gdal-1.5.1/swig/perl/Makefile.PL 2008-03-26 14:22:31.000000000 +0100 +@@ -2,7 +2,7 @@ + + $libdir = $ENV{'PREFIX'} ? "-L$ENV{'PREFIX'}/lib" : ''; + +-$ext = $^O eq 'MSWin32' ? '.dll' : ''; # works with MinGW but probably not with ActivePerl ++$ext = $^O eq 'MSWin32' ? '.dll' : '1.5.0'; # works with MinGW but probably not with ActivePerl + + # for old-style, use gdal, gdalconst,ogr, and osr as keys + +diff -urNad gdal-1.5.1~/swig/python/setup.cfg gdal-1.5.1/swig/python/setup.cfg +--- gdal-1.5.1~/swig/python/setup.cfg 2008-03-26 14:22:16.000000000 +0100 ++++ gdal-1.5.1/swig/python/setup.cfg 2008-03-26 14:24:35.000000000 +0100 +@@ -1,7 +1,7 @@ + [build_ext] + include-dirs = ../../port:../../gcore:../../alg:../../ogr/:/usr/local/include:/usr/include + library-dirs = ../../.libs:../../:/usr/local/lib:/usr/lib +-libraries = gdal ++libraries = gdal1.5.0 + gdal_config=gdal-config + + # setup.cfg settings for building on win32 with msvc --- gdal-1.5.2.orig/debian/patches/00list +++ gdal-1.5.2/debian/patches/00list @@ -0,0 +1,9 @@ +libname +ogdi +doc +rubymakefile +man +pythonmakefile +gdalpaths +eoverflow +sincos --- gdal-1.5.2.orig/debian/patches/eoverflow.dpatch +++ gdal-1.5.2/debian/patches/eoverflow.dpatch @@ -0,0 +1,35 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## eoverflow.dpatch by Francesco Paolo Lovergine +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad gdal-1.5.2~/gcore/gdalopeninfo.cpp gdal-1.5.2/gcore/gdalopeninfo.cpp +--- gdal-1.5.2~/gcore/gdalopeninfo.cpp 2008-02-23 11:28:24.000000000 +0100 ++++ gdal-1.5.2/gcore/gdalopeninfo.cpp 2008-07-02 17:40:52.000000000 +0200 +@@ -94,10 +94,21 @@ + nHeaderBytes = (int) VSIFRead( pabyHeader, 1, 1024, fp ); + + VSIRewind( fp ); +- } ++ } ++ /* XXX: ENOENT is used to catch the case of virtual filesystem ++ * when we do not have a real file with such a name. Under some ++ * circumstances EINVAL reported instead of ENOENT in Windows ++ * (for filenames containing colon, e.g. "smth://name"). ++ * See also: #2437 */ + else if( errno == 27 /* "File to large" */ +- || errno == ENOENT +- || errno == 79 /* EOVERFLOW - value too large */ ) ++ || errno == ENOENT || errno == EINVAL ++#ifdef EOVERFLOW ++ || errno == EOVERFLOW ++#else ++ || errno == 75 /* Linux EOVERFLOW */ ++ || errno == 79 /* Solaris EOVERFLOW */ ++#endif ++ ) + { + fp = VSIFOpenL( pszFilename, "rb" ); + if( fp != NULL ) --- gdal-1.5.2.orig/debian/patches/rubymakefile.dpatch +++ gdal-1.5.2/debian/patches/rubymakefile.dpatch @@ -0,0 +1,42 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## rubymakefile.dpatch by Francesco Paolo Lovergine +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad gdal-1.4.3~/swig/ruby/RubyMakefile.mk gdal-1.4.3/swig/ruby/RubyMakefile.mk +--- gdal-1.4.3~/swig/ruby/RubyMakefile.mk 2007-11-15 18:06:32.000000000 +0100 ++++ gdal-1.4.3/swig/ruby/RubyMakefile.mk 2007-11-16 10:52:00.000000000 +0100 +@@ -25,7 +25,9 @@ + INSTALL_DIR := $(RUBY_EXTENSIONS_DIR)/gdal + + RUBY_INCLUDE = -I$(RUBY_INCLUDE_DIR) +-LDFLAGS += -shared -L$(RUBY_LIB_DIR) ++LDFLAGS += -fPIC -DPIC -shared -L$(RUBY_LIB_DIR) ++CFLAGS += -fPIC -DPIC ++CXXFLAGS += -fPIC -DPIC + RUBY_LIB := -l$(RUBY_SO_NAME) + + build: $(RUBY_MODULES) +@@ -41,17 +43,17 @@ + $(INSTALL_DIR): + mkdir -p $(DESTDIR)$(INSTALL_DIR) + +-install: $(INSTALL_DIR) ++install: $(INSTALL_DIR) $(RUBY_MODULES) + $(INSTALL) $(RUBY_MODULES) $(DESTDIR)$(INSTALL_DIR) + + $(RUBY_MODULES): %.so: %_wrap.o + $(LD) $(LDFLAGS) $(LIBS) $(GDAL_SLIB_LINK) $(RUBY_LIB) $< -o $@ + + %.o: %.cpp +- $(CXX) $(CFLAGS) $(GDAL_INCLUDE) $(RUBY_INCLUDE) -c $< ++ $(CXX) $(CXXFLAGS) $(GDAL_INCLUDE) $(RUBY_INCLUDE) -c $< + + %.o: %.cxx +- $(CXX) $(CFLAGS) $(GDAL_INCLUDE) $(RUBY_INCLUDE) -c $< ++ $(CXX) $(CXXFLAGS) $(GDAL_INCLUDE) $(RUBY_INCLUDE) -c $< + + %.o: %.c + $(CC) $(CFLAGS) $(GDAL_INCLUDE) $(RUBY_INCLUDE) -c $< --- gdal-1.5.2.orig/debian/patches/man.dpatch +++ gdal-1.5.2/debian/patches/man.dpatch @@ -0,0 +1,15 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## man.dpatch by Francesco Paolo Lovergine +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad gdal-1.5.0~/GNUmakefile gdal-1.5.0/GNUmakefile +--- gdal-1.5.0~/GNUmakefile 2008-01-08 16:43:14.000000000 +0100 ++++ gdal-1.5.0/GNUmakefile 2008-01-08 16:45:09.000000000 +0100 +@@ -245,3 +245,4 @@ + + endif # HAVE_LIBTOOL=no + ++.PHONY: man --- gdal-1.5.2.orig/debian/patches/doc.dpatch +++ gdal-1.5.2/debian/patches/doc.dpatch @@ -0,0 +1,31 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## doc.dpatch by Francesco Paolo Lovergine +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad gdal-1.4.1~/doc/index.dox gdal-1.4.1/doc/index.dox +--- gdal-1.4.1~/doc/index.dox 2007-04-10 17:14:06.000000000 +0200 ++++ gdal-1.4.1/doc/index.dox 2007-05-12 16:33:21.000000000 +0200 +@@ -18,7 +18,7 @@ + for data translation and processing. The \link NEWS.html NEWS\endlink + page describes the January 2007 GDAL 1.4.0 release. + +-The related OGR library (which lives within the GDAL source tree) ++The related OGR library (which lives within the GDAL source tree) + provides a similar capability for simple features vector data. + + Master: http://www.gdal.org
+diff -urNad gdal-1.4.1~/ogr/index.dox gdal-1.4.1/ogr/index.dox +--- gdal-1.4.1~/ogr/index.dox 2007-04-10 17:15:08.000000000 +0200 ++++ gdal-1.4.1/ogr/index.dox 2007-05-12 16:33:02.000000000 +0200 +@@ -5,7 +5,7 @@ + formats including ESRI Shapefiles, S-57, SDTS, PostGIS, Oracle Spatial, + and Mapinfo mid/mif and TAB formats.

+ +-OGR is a part of the GDAL library.

++OGR is a part of the GDAL library.

+ +

Resources

+ --- gdal-1.5.2.orig/debian/patches/ogdi.dpatch +++ gdal-1.5.2/debian/patches/ogdi.dpatch @@ -0,0 +1,52 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## ogdi.dpatch by Francesco Paolo Lovergine +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad gdal-1.4.1~/GDALmake.opt.in gdal-1.4.1/GDALmake.opt.in +--- gdal-1.4.1~/GDALmake.opt.in 2007-04-24 12:46:08.000000000 +0200 ++++ gdal-1.4.1/GDALmake.opt.in 2007-04-24 12:46:56.000000000 +0200 +@@ -275,7 +275,7 @@ + # PCRaster support + PCRASTER_SETTING = @PCRASTER_SETTING@ + +-OGDI_INCLUDE = @OGDI_INCLUDE@ ++OGDI_INCLUDE = -I/usr/include/ogdi + + PNG_SETTING = @PNG_SETTING@ + JPEG_SETTING = @JPEG_SETTING@ +diff -urNad gdal-1.4.1~/configure gdal-1.4.1/configure +--- gdal-1.4.1~/configure 2007-04-24 12:45:54.000000000 +0200 ++++ gdal-1.4.1/configure 2007-04-24 12:46:10.000000000 +0200 +@@ -23968,7 +23968,7 @@ + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-logdi31 $LIBS" ++LIBS="-logdi $LIBS" + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -24034,16 +24034,16 @@ + + + if test "$HAVE_OGDI" = "yes" ; then +- LIBS="-logdi31 $LIBS" ++ LIBS="-logdi $LIBS" + fi + + else + + HAVE_OGDI=yes +- LIBS="-L$with_ogdi -L$with_ogdi/lib -logdi31 $LIBS" +- OGDI_INCLUDE="-I$with_ogdi -I$with_ogdi/include" ++ LIBS="-logdi $LIBS" ++ OGDI_INCLUDE="-I/usr/include/ogdi" + +- echo "using libogdi31 from $with_ogdi." ++ echo "using libogdi from $with_ogdi." + + fi + --- gdal-1.5.2.orig/debian/copyright +++ gdal-1.5.2/debian/copyright @@ -0,0 +1,27 @@ + +This package was downloaded from ftp://ftp.remotesensing.org/pub/gdal/ + +Upstream Maintainer: Frank Warmerdam + +Copyright: + + Copyright (c) 2000, Frank Warmerdam + + Permission is hereby granted, free of charge, to any person obtaining a + copy of this software and associated documentation files (the "Software"), + to deal in the Software without restriction, including without limitation + the rights to use, copy, modify, merge, publish, distribute, sublicense, + and/or sell copies of the Software, and to permit persons to whom the + Software is furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included + in all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS + OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + DEALINGS IN THE SOFTWARE. + --- gdal-1.5.2.orig/debian/libgdal1-1.5.0.files +++ gdal-1.5.2/debian/libgdal1-1.5.0.files @@ -0,0 +1,2 @@ +usr/lib/libgdal1.5.0.so.* +usr/share/gdal15