[SCM] geos branch, upstream, updated. upstream/3.3.2-56-g722309c

[Francesco Paolo Lovergine]

The following commit has been merged in the upstream branch:
commit 2df4f41a90109c1d687942ba5e1ec5250bc6e3b1
Merge: 248b798c0bb497c450e6bd081fa826be4862644e e6d5a322b03c82337786890c2724ad077a540693
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date:   Sun Feb 26 23:46:19 2012 +0100

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

diff --combined debian/changelog
index ee5cf64,cb85ff8..9da4cb3
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,21 -1,23 +1,30 @@@
 +geos (3.3.2-1) unstable; urgency=low
 +
 +  * New upstream release.
 +  * Dropped geos-config patch, merged upstream.
 +
 + -- Francesco Paolo Lovergine <frankie at debian.org>  Sun, 26 Feb 2012 23:29:37 +0100
 +
- geos (3.3.1-4) unstable; urgency=low
+ geos (3.3.1-1) unstable; urgency=low
  
    * New upstream major release.
      (closes: #648611)
    * Changed the C/C++ chain for development. See NEWS file for an explanation.
+     Thanks strk for a useful discussion about that.
      (closes: #643658)
    * Patches refreshed and merged with upstream changes.
    * Added patch geos-config to fix library paths. This is coherent with
      upstream approach too.
- 
-  -- Francesco Paolo Lovergine <frankie at debian.org>  Tue, 21 Feb 2012 23:33:45 +0100
+   * Moved the C++ headers under libgeos++-dev automagically and added a break 
+     against the old libgeos-dev all-in-one package.
+   * The libgeos++-dev package depends on libgeos-dev for a couple of reasons:
+       - a common header (geos/extern.h)
+       - a program using C++ API could mixup C and C++ APIs so better being
+         safe about that.
+   * Merged NMU change in debian/rules to fix armhf FTBS.
+     (closes: #641387)
+ 
+  -- Francesco Paolo Lovergine <frankie at debian.org>  Wed, 22 Feb 2012 14:20:57 +0100
  
  geos (3.2.2-3) unstable; urgency=low
  
diff --combined debian/control
index 1280b19,fa96776..eb6f2c1
--- a/debian/control
+++ b/debian/control
@@@ -25,8 -25,9 +25,9 @@@ Description: Geometry engine for GIS - 
  Package: libgeos++-dev
  Section: libdevel
  Architecture: any
- Depends: libgeos-3.3.2 (= ${binary:Version}), ${misc:Depends}
 -Depends: libgeos-3.3.1 (= ${binary:Version}), libgeos-dev, ${misc:Depends}
++Depends: libgeos-3.3.2 (= ${binary:Version}), libgeos-dev, ${misc:Depends}
  Suggests: libgdal-doc
+ Breaks: libgeos-dev (<< 3.3.1-1~)
  Description: Geometry engine for GIS - C++ development files
   GEOS provides a spatial object model and fundamental geometric
   functions. It implements the geometry model defined in the
@@@ -58,7 -59,7 +59,7 @@@ Description: Geometry engine for Geogra
   This package contains the C library. A C++ library is provided
   by the libgeos-* package.
  
 -Package: libgeos-3.3.1
 +Package: libgeos-3.3.2
  Section: libs
  Architecture: any
  Depends: ${shlibs:Depends}, ${misc:Depends}
@@@ -77,7 -78,8 +78,8 @@@ Description: Geometry engine for Geogra
     * topological validity checking
   .
   This package contains the C++ library. A stable C library is provided
-  by the libgeos-c* package.
+  by the libgeos-c* package and should be preferred by third-parties
+  programs.
  
  Package: libgeos-doc
  Section: doc
@@@ -107,7 -109,7 +109,7 @@@ Package: libgeos-db
  Architecture: any
  Section: debug
  Priority: extra
 -Depends: libgeos-3.3.1 (= ${binary:Version}), libgeos-c1 (= ${binary:Version}), ${misc:Depends}
 +Depends: libgeos-3.3.2 (= ${binary:Version}), libgeos-c1 (= ${binary:Version}), ${misc:Depends}
  Description: Debugging symbols for the GEOS library
   GEOS provides a spatial object model and fundamental geometric
   functions. It implements the geometry model defined in the

-- 
Geometry engine for Geographic Information Systems