[SCM] geos branch, master, updated. upstream/3.3.2-61-g75719df

[Francesco Paolo Lovergine]

The following commit has been merged in the master branch:
commit 70c720e18f002d5cd2cc8e8acfd2c8c813df9998
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date:   Wed May 23 15:39:19 2012 +0200

    Updated patchset

diff --git a/debian/changelog b/debian/changelog
index 47b9b64..4ac3fbe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ geos (3.3.3-1) unstable; urgency=low
     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.
 
  -- Francesco Paolo Lovergine <frankie at debian.org>  Wed, 23 May 2012 15:30:33 +0200
 
diff --git a/debian/patches/geos-config b/debian/patches/geos-config
index ca1adee..5fb9af5 100644
--- a/debian/patches/geos-config
+++ b/debian/patches/geos-config
@@ -1,24 +1,13 @@
 Index: geos/tools/geos-config.in
 ===================================================================
---- geos.orig/tools/geos-config.in	2012-02-21 23:31:52.000000000 +0100
-+++ geos/tools/geos-config.in	2012-02-21 23:33:29.000000000 +0100
-@@ -11,6 +11,7 @@
-      [--prefix]
-      [--version]
-      [--libs]
-+     [--clibs]
-      [--cflags]
-      [--ldflags]
-      [--includes]
-@@ -37,7 +38,10 @@
+--- geos.orig/tools/geos-config.in	2012-05-23 15:30:18.000000000 +0200
++++ geos/tools/geos-config.in	2012-05-23 15:37:54.000000000 +0200
+@@ -38,7 +38,7 @@
      echo -I${prefix}/include 
        ;;
      --libs)
 -      echo -L${libdir} -lgeos
 +      echo -L${libdir} -lgeos- at VERSION@
-+      ;;
-+    --clibs)
-+      echo -L${libdir} -lgeos_c
        ;;
-     --ldflags)
-       echo -L${libdir}
+     --clibs)
+       echo -L${libdir} -lgeos_c

-- 
Geometry engine for Geographic Information Systems