[SCM] geos branch, master, updated. upstream/3.2.2-40-g86ad878

[Francesco Paolo Lovergine]

The following commit has been merged in the master branch:
commit ea73a63690bdababd3f0c73a7bb4a2fc3566625d
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date:   Wed Nov 30 18:12:08 2011 +0100

    Preparing 3.3.1

diff --git a/debian/changelog b/debian/changelog
index d70d870..71c3858 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+geos (3.3.1-4) unstable; urgency=low
+
+  * New upstream major release.
+    (closes: #648611)
+  * Changed the C/C++ chain for development. See NEWS file for an explanation.
+
+ -- Francesco Paolo Lovergine <frankie at debian.org>  Wed, 30 Nov 2011 17:01:19 +0100
+
 geos (3.2.2-3) unstable; urgency=low
 
   * New patch: swig. Fixed for strong version detection in ac_pkg_swig.m4.
diff --git a/debian/control b/debian/control
index 3662ee9..c4c9a4f 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,20 @@ Vcs-Git: git://git.debian.org/git/pkg-grass/geos
 Package: libgeos-dev
 Section: libdevel
 Architecture: any
-Depends: libgeos-3.2.2 (= ${binary:Version}), libgeos-c1 (= ${binary:Version}), ${misc:Depends}
+Depends: libgeos-c1 (= ${binary:Version}), ${misc:Depends}
+Suggests: libgdal-doc
+Description: Geometry engine for GIS - Development files
+ GEOS provides a spatial object model and fundamental geometric
+ functions. It implements the geometry model defined in the
+ OpenGIS Consortium Simple Features Specification for SQL. 
+ .
+ This package contains the headers and libraries needed to 
+ develop programs using GEOS.
+
+Package: libgeos++-dev
+Section: libdevel
+Architecture: any
+Depends: libgeos-3.3.1 (= ${binary:Version}), ${misc:Depends}
 Suggests: libgdal-doc
 Description: Geometry engine for GIS - Development files
  GEOS provides a spatial object model and fundamental geometric
@@ -43,7 +56,7 @@ Description: Geometry engine for Geographic Information Systems - C Library
  This package contains the C library. A C++ library is provided
  by the libgeos* package.
 
-Package: libgeos-3.2.2
+Package: libgeos-3.3.1
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -80,7 +93,7 @@ Description: Documentation for the GEOS GIS geometry engine library
 Package: libgeos-ruby1.8
 Section: ruby
 Architecture: any
-Depends: libgeos-3.2.2 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: GEOS bindings for Ruby
  GEOS provides a spatial object model and fundamental geometric
  functions. It implements the geometry model defined in the
@@ -92,7 +105,7 @@ Package: libgeos-dbg
 Architecture: any
 Section: debug
 Priority: extra
-Depends: libgeos-3.2.2 (= ${binary:Version}), libgeos-c1 (= ${binary:Version}), ${misc:Depends}
+Depends: libgeos-3.3.1 (= ${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
diff --git a/debian/control.in b/debian/control.in
index 2cc578a..92579b0 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -12,7 +12,20 @@ Vcs-Git: git://git.debian.org/git/pkg-grass/geos
 Package: libgeos-dev
 Section: libdevel
 Architecture: any
-Depends: libgeos- at VERSION@ (= ${binary:Version}), libgeos-c1 (= ${binary:Version}), ${misc:Depends}
+Depends: libgeos-c1 (= ${binary:Version}), ${misc:Depends}
+Suggests: libgdal-doc
+Description: Geometry engine for GIS - Development files
+ GEOS provides a spatial object model and fundamental geometric
+ functions. It implements the geometry model defined in the
+ OpenGIS Consortium Simple Features Specification for SQL. 
+ .
+ This package contains the headers and libraries needed to 
+ develop programs using GEOS.
+
+Package: libgeos++-dev
+Section: libdevel
+Architecture: any
+Depends: libgeos- at VERSION@ (= ${binary:Version}), ${misc:Depends}
 Suggests: libgdal-doc
 Description: Geometry engine for GIS - Development files
  GEOS provides a spatial object model and fundamental geometric
@@ -80,7 +93,7 @@ Description: Documentation for the GEOS GIS geometry engine library
 Package: libgeos-ruby1.8
 Section: ruby
 Architecture: any
-Depends: libgeos- at VERSION@ (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: GEOS bindings for Ruby
  GEOS provides a spatial object model and fundamental geometric
  functions. It implements the geometry model defined in the
diff --git a/debian/libgeos-dev.install b/debian/libgeos-dev.install
index 10e67e1..640cea9 100644
--- a/debian/libgeos-dev.install
+++ b/debian/libgeos-dev.install
@@ -1,4 +1,4 @@
 usr/bin/geos-config
 usr/include/*
-usr/lib/*.a
-usr/lib/*.so
+usr/lib/libgeos_c.a
+usr/lib/libgeos_c.so

-- 
Geometry engine for Geographic Information Systems