The following commit has been merged in the master branch: commit 87ab2ae819c0a2a3781d4fa06b72611c1c286ea4 Merge: 1dc4d2c2ac13101eeda38fa7cb6a43e4bda8d3b1 009bec6d4aea465e5b9ec75b757612be8e583ba3 Author: Francesco Paolo Lovergine <fran...@debian.org> Date: Wed Nov 6 10:31:40 2013 +0100
Merge branch 'master' of ssh://git.debian.org/git/pkg-grass/gdal Conflicts: debian/changelog diff --combined debian/changelog index eb27a8c,72254b9..424ea82 --- a/debian/changelog +++ b/debian/changelog @@@ -1,8 -1,38 +1,42 @@@ - gdal (1.10.0-0~exp4) UNRELEASED; urgency=low + gdal (1.10.1+dfsg-0~exp1) experimental; urgency=low - * Added some missing manpages to python-gdal. ++ [ Bas Couwenberg ] + * New upstream release. + * Add myself to Uploaders. + * Update watch file. + * Remove data files with unclear rights. + (closes: #721343) + * Refresh patches. + * Use canonical URLs for Vcs-* fields. + * Update copyright. + * Refer to quilt instead of dpatch, and fix typos in README.source. + * Add patches to fix various typos. + * Add lintian overrides for hyphen-used-as-minus-sign and + manpage-has-errors-from-man, man pages are automatically generated + with sphinx. + * Use versioned Breaks/Replaces instead of Conflicts/Replaces. + * Bump dephelper compatibility to 9. + * Install java files with mode 644. + * Exclude libgdal-java from dh_makeshlibs, doesn't install in default paths. + * Add doc-base configuration for libgdal-doc. + * Only install NEWS.Debian in libgdal-dev. + (closes: #677693) + * Reinstate doc patch, refresh and update to fix more links. + (closes: #471198) + * Drop temporary fix for #564243, doxygen doesn't generate files with extra + underscores anymore. + * Add patch to add a brief description to {gdal,ogr}_utilities documentation. + (closes: #421653) + * Drop ruby extension for ruby1.8 removal transition. See also: #684433. + (closes: #722383) + * Use minimal dh rules with dh-python, and dh-autoreconf for retooling. + * Add patch to use hardening flags for java and perl bindings. + * Install python scripts without .py extension. - -- Francesco Paolo Lovergine <fran...@debian.org> Tue, 02 Jul 2013 12:18:14 +0200 ++ [ Francesco Paolo Lovergine ] ++ * Added a missing manpages to python-gdal. ++ + -- Bas Couwenberg <sebas...@xs4all.nl> Thu, 03 Oct 2013 23:19:27 +0200 gdal (1.10.0-0~exp3) experimental; urgency=low diff --combined debian/python-gdal.install index 538e90a,799be9f..840bfda --- a/debian/python-gdal.install +++ b/debian/python-gdal.install @@@ -1,20 -1,35 +1,50 @@@ usr/lib/python2* - usr/bin/*.py + usr/bin/epsg_tr + usr/bin/esri2wkt + usr/bin/gcps2vec + usr/bin/gcps2wld + usr/bin/gdal2tiles + usr/bin/gdal2xyz + usr/bin/gdalchksum + usr/bin/gdalident + usr/bin/gdalimport + usr/bin/gdalmove + usr/bin/gdal_auth + usr/bin/gdal_calc + usr/bin/gdal_edit + usr/bin/gdal_fillnodata + usr/bin/gdal_merge + usr/bin/gdal_polygonize + usr/bin/gdal_proximity + usr/bin/gdal_retile + usr/bin/gdal_sieve + usr/bin/mkgraticule + usr/bin/pct2rgb + usr/bin/rgb2pct + usr/share/doc/python-gdal/examples/ + usr/share/man/man1/gdal2tiles.1 + usr/share/man/man1/gdalmove.1 + usr/share/man/man1/gdal_edit.1 + usr/share/man/man1/gdal_fillnodata.1 usr/share/man/man1/gdal_merge.1 + usr/share/man/man1/gdal_polygonize.1 + usr/share/man/man1/gdal_proximity.1 + usr/share/man/man1/gdal_retile.1 + usr/share/man/man1/gdal_sieve.1 usr/share/man/man1/pct2rgb.1 usr/share/man/man1/rgb2pct.1 +usr/share/man/man1/gdalmove.1 +usr/share/man/man1/gdal_sieve.1 +usr/share/man/man1/gdal_retile.1 +usr/share/man/man1/gdal_proximity.1 +usr/share/man/man1/gdal_polygonize.1 +usr/share/man/man1/gdal_fillnodata.1 +usr/share/man/man1/gdal_edit.1 +usr/share/man/man1/gdal_calc.1 +usr/share/man/man1/gdal_auth.1 +usr/share/man/man1/gdal2xyz.1 +usr/share/man/man1/gdal2tiles.1 +usr/share/man/man1/gcps2wld.1 +usr/share/man/man1/gcps2vec.1 +usr/share/man/man1/esri2wkt.1 +usr/share/man/man1/epsg_tr.1 -- 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