The following commit has been merged in the master branch: commit d7016f1c0c247b6a71fd7e39a70d7456f6653281 Author: Francesco Paolo Lovergine <fran...@debian.org> Date: Tue Apr 26 16:11:53 2011 +0200
Added one new binary and some minor changes to paths. diff --git a/debian/changelog b/debian/changelog index 4692570..b1f9ec2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,8 +7,13 @@ gdal (1.8.0-1) experimental; urgency=low the GDAL LICENSE file. * Swig generated stuff for perl is now removed just before building, not at clean time to be more nice against git-bp. + * Added gdallocationinfo installation in gdal-bin. + * Policy bumped to 3.9.2, no changes required. + * Fixed manpages oddities. + (closes: #615535) + * Added some more cleanup instructions. - -- Francesco Paolo Lovergine <fran...@debian.org> Wed, 16 Mar 2011 09:46:02 +0100 + -- Francesco Paolo Lovergine <fran...@debian.org> Tue, 26 Apr 2011 16:11:03 +0200 gdal (1.7.3-2) unstable; urgency=low diff --git a/debian/control b/debian/control index b87e1a6..77416b2 100644 --- a/debian/control +++ b/debian/control @@ -11,7 +11,7 @@ Build-Depends: debhelper (>= 8), zlib1g-dev, libnetcdf-dev (>= 1:4.0.0), ruby, ruby1.8-dev, chrpath, swig, libtool (>= 1.5.24-2), patch, libexpat1-dev, libproj-dev, libdap-dev, libxml2-dev, libspatialite-dev (>= 2.4.0~rc2-4), libepsilon-dev Build-Conflicts: python-setuptools -Standards-Version: 3.9.1 +Standards-Version: 3.9.2 XS-Python-Version: all Homepage: http://www.gdal.org/ Vcs-Browser: http://git.debian.org/?p=pkg-grass/gdal.git diff --git a/debian/gdal-bin.install b/debian/gdal-bin.install index e62c547..881c3b0 100644 --- a/debian/gdal-bin.install +++ b/debian/gdal-bin.install @@ -14,6 +14,7 @@ usr/bin/gdal_contour usr/bin/ogr* usr/bin/gdalbuildvrt usr/bin/testepsg +usr/bin/gdallocationinfo usr/share/man/man1/gdal_rasterize.1 usr/share/man/man1/gdal_translate.1 usr/share/man/man1/gdal_utilities.1 @@ -30,3 +31,4 @@ usr/share/man/man1/gdaltindex.1 usr/share/man/man1/gdaltransform.1 usr/share/man/man1/nearblack.1 usr/share/man/man1/gdaldem.1 +usr/share/man/man1/gdallocationinfo.1 diff --git a/debian/rules b/debian/rules index 02c0579..d2143b3 100755 --- a/debian/rules +++ b/debian/rules @@ -91,20 +91,6 @@ configure-stamp: 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 $@ build: configure-stamp build-stamp @@ -143,7 +129,9 @@ clean: rm -f GDALmake.opt-* rm -rf $(CURDIR)/man/man1 rm -rf $(CURDIR)/debian/tmp $(CURDIR)/debian/python-tmp - rm -rf $(CURDIR)/html + rm -rf $(CURDIR)/html $(CURDIR)/doc/br/html $(CURDIR)/doc/ru/html + rm -rf $(CURDIR)/frmts/o/.libs + rm -f $(CURDIR)/islibdappost310.* dh_clean @@ -179,7 +167,7 @@ install: build 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$(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$(PERL_PATH)/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