The following commit has been merged in the master branch:
commit 82da083c47bca4911a1a10bb4d5ed77e37fe8f25
Merge: 2f527b08c7de4af9369a0da6d7311180181840a1 
e7ab310c425bcb5fe5e009eb5eb2afcd31e8a4db
Author: Francesco Paolo Lovergine <fran...@debian.org>
Date:   Mon Apr 8 12:27:06 2013 +0200

    Merge branch 'master' of ssh://git.debian.org/git/pkg-grass/gdal
    
    Conflicts:
        debian/changelog

diff --combined debian/changelog
index 3812596,8440f84..112e0c0
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,17 +1,23 @@@
 -gdal (1.9.2-1~exp2) UNRELEASED; urgency=low
++gdal (1.9.2-1~exp3) experimental; urgency=low
+ 
+   * Moved to new LIBKML driver instead of the old KML one. It has a much
+     better support for complex KML files.
+   * Merged NMU 1.9.0-3.1:
+     Fix "FTBFS when ruby1.9.1 installed": force building with ruby1.8:
+     set variables in debian/rules and new patch force-ruby1.8 to ruby1.8.
+     Thanks to C├ędric Boutillier for reviewing and testing this patch.
+     (Closes: #684433)
+   * Added libarmadillo support.
 -  * Restored hidden symbols to better manage conflicts in linking both 
 -    libgeotiff and gdal. Fix working for Orfeotoolbox.
+ 
 - -- Francesco Paolo Lovergine <fran...@debian.org>  Sun, 04 Mar 2012 11:39:57 
+0100
++ -- Francesco Paolo Lovergine <fran...@debian.org>  Sun, 04 Apr 2013 11:39:57 
+0100
++
 +gdal (1.9.2-1~exp2) experimental; urgency=low
 +
 +  * Reintroduced internal symbols hiding for better compatibility 
 +    against mixing external geotiff and gdal. See Orfeotoolbox case:
 +    See #558733 again.
 +
 + -- Francesco Paolo Lovergine <fran...@debian.org>  Fri, 29 Mar 2013 14:07:43 
+0100
  
  gdal (1.9.2-1~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

Reply via email to