The following commit has been merged in the master branch:
commit 757fd47599055811e9eba953c3c13245201bcf0b
Merge: 7009f1cdca2f35c8c4fb5e40a5d3e6cd7699f99f 
7b959ee6de0aa3c98e07e7dfc1a02b9b0656593a
Author: David Paleino <da...@debian.org>
Date:   Mon Nov 21 12:07:21 2011 +0100

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

diff --combined debian/changelog
index d14ba14,ddfe221..dca5bad
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,9 +1,15 @@@
 -spatialite (3.0.0~beta20110817-3) unstable; urgency=low
 +spatialite (3.0.0~beta20110817-3) UNRELEASED; urgency=low
  
++  [ Francesco Paolo Lovergine ]
+   * Fixed linking order for sqlite3 in debian patch 00-systemlibs.patch.
+     (closes: #638929)
+ 
 - -- Francesco Paolo Lovergine <fran...@debian.org>  Thu, 03 Nov 2011 15:39:36 
+0100
++  [ David Paleino ]
 +  * Conditionally disable full EPSG initialization (for srs_init.c)
 +    on powerpc, and document what projections are available on that
 +    architecture (Closes: #649302)
 +
 + -- David Paleino <da...@debian.org>  Mon, 21 Nov 2011 11:36:43 +0100
  
  spatialite (3.0.0~beta20110817-2) unstable; urgency=low
  

-- 
geospatial extension for SQLite

_______________________________________________
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