The following commit has been merged in the master branch:
commit 75719df948a066ebdebb37155fea19f645c5c177
Merge: 70c720e18f002d5cd2cc8e8acfd2c8c813df9998 
722309c27556c36862610937210aeca5516de9de
Author: Francesco Paolo Lovergine <fran...@debian.org>
Date:   Wed May 23 17:40:27 2012 +0200

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

diff --combined debian/changelog
index 4ac3fbe,f38f0a4..ed73c87
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,16 +1,20 @@@
  geos (3.3.3-1) unstable; urgency=low
  
 -  * New upstream release
 +  * New upstream bugfixing version. This is useful because correctly
 +    support new topology-enabled for Postgis 2.0.
 +  * Policy bumped to 3.9.3, no changes required.
 +  * Debhelper level set to 9.
 +  * Patch geos-config revised, partially merged upstream.
  
 - -- Jerome Villeneuve Larouche <jlarou...@mapgears.com>  Thu, 17 May 2012 
17:36:39 +0000
 + -- Francesco Paolo Lovergine <fran...@debian.org>  Wed, 23 May 2012 15:30:33 
+0200
  
+ geos (3.3.2-1) unstable; urgency=low
+ 
+   * New upstream release.
+   * Dropped geos-config patch, merged upstream.
+ 
+  -- Francesco Paolo Lovergine <fran...@debian.org>  Sun, 26 Feb 2012 23:29:37 
+0100
+ 
  geos (3.3.1-1) unstable; urgency=low
  
    * New upstream major release.

-- 
Geometry engine for Geographic Information Systems

_______________________________________________
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