The following commit has been merged in the master branch: commit 6207bebccc707a43fd48bdcfbe5e754e17d092b4 Merge: 84eb55bb5770c03144692d03762681f5a01c9382 2589cfc6b2dd490024418c6960ffb821911206db Author: Francesco P. Lovergine <france...@lovergine.com> Date: Sat Feb 25 15:58:26 2012 +0100
Merge branch 'master' of ssh://git.debian.org/git/pkg-grass/gdal Conflicts: debian/libgdal1.symbols.common diff --combined debian/changelog index 2b8ef2e,a32bd99..4b54c52 --- a/debian/changelog +++ b/debian/changelog @@@ -1,10 -1,45 +1,50 @@@ + gdal (1.9.0-1~exp3) experimental; urgency=low + + * Added b-deps and enabled a few new supports: + Poppler, Armadillo, OpenJPEG, FreeXL and libZMA. + + -- Francesco Paolo Lovergine <fran...@debian.org> Thu, 23 Feb 2012 12:40:19 +0100 + + gdal (1.9.0-1~exp2) experimental; urgency=low + + * Fixed mipsel, mips, powerpc and s390 files for syntax errors that caused + FTBS on all those archs. + * Updated sparc, amd64 and ia64 symbol files to 1.9 series. + * Updated README.source to document symbol versioning and script. + + -- Francesco Paolo Lovergine <fran...@debian.org> Thu, 23 Feb 2012 11:53:59 +0100 + + gdal (1.9.0-1~exp1) experimental; urgency=low + + * New upstream release. + * New tool: gdalsrsinfo. + * Dropped patch epsilon. + * All patches refreshed for current version. + * Regenerating all symfiles from scratch. But for the usual stock of + internal C++ changes (with both adding and removing of methods) a couple + of TIFF related C functions have been dropped: + TIFFFindFieldInfo + TIFFFindFieldInfoByName + which is due to Tiff/GeoTiff resyncing against upstream. This is ignored, + but we already introduced a SONAME change, and it will not impact sid + builds and library use. + * Removed superfluous break/replaces against libgdal1-<version> package. + + -- Francesco Paolo Lovergine <fran...@debian.org> Tue, 21 Feb 2012 15:28:45 +0100 + + gdal (1.8.1-2~exp3) experimental; urgency=low + + * Fixed .common symbol file to drop conditionals. + + -- Francesco Paolo Lovergine <fran...@debian.org> Wed, 23 Nov 2011 14:23:29 +0100 + gdal (1.8.1-2~exp2) experimental; urgency=low +<<<<<<< HEAD + * Now including per arch symbol files truly. + + -- Francesco Paolo Lovergine <fran...@debian.org> Wed, 28 Sep 2011 20:07:22 +0200 +======= * Changed organization of symbol files in one common file and multiple .symbols.arch file. * Now normalized to conventional GDAL library name and dropping the Debian @@@ -17,7 -52,6 +57,7 @@@ * Now avoid installing superfluous stuff in libgdal-perl. Thanks lintian. -- Francesco Paolo Lovergine <fran...@debian.org> Tue, 11 Oct 2011 14:41:31 +0200 +>>>>>>> 72ed289fc96f87ebdc3af15373cb4d3dc2d855bf gdal (1.8.1-2~exp1) experimental; urgency=low -- 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