[SCM] mapserver branch, master, updated. upstream/6.0.1-25-g98327ed

[Francesco Paolo Lovergine]

The following commit has been merged in the master branch:
commit cb9074597eacb393e68ad187d38cfb86e0815c04
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date:   Mon Mar 5 12:44:03 2012 +0100

    Fixed FTBS and geos configuration.

diff --git a/debian/changelog b/debian/changelog
index 5b4af4e..58a839d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,10 @@ mapserver (6.0.1-3) unstable; urgency=low
 
   * Let the configure script search in the system directory for jpeg stuff.
     (closes: #661914)
+  * Added fixgeos patch to use correcly the geos-config script.
+  * Minimum version for geos set to 3.3.1.
 
- -- Francesco Paolo Lovergine <frankie at debian.org>  Mon, 05 Mar 2012 11:53:32 +0100
+ -- Francesco Paolo Lovergine <frankie at debian.org>  Mon, 05 Mar 2012 12:43:32 +0100
 
 mapserver (6.0.1-2) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index c49b0e7..fafe3e6 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: Francesco Paolo Lovergine <frankie at debian.org>, Alan Boudreault <abou
 Standards-Version: 3.9.2
 Build-Depends: debhelper (>= 8), libcurl4-gnutls-dev, libpng12-dev, zlib1g-dev (>= 1.1.4),
  libgd2-xpm-dev (>= 2.0.1-10), libfreetype6-dev (>= 2.0.9), libjpeg-dev, libgdal1-dev (>=1.4.0), libproj-dev,
- libpq-dev, php5-dev, swig, python-all (>= 2.6.6-3~), python-all-dev (>= 2.6.6-3~), libgeos-dev (>= 2.2.3-2),
+ libpq-dev, php5-dev, swig, python-all (>= 2.6.6-3~), python-all-dev (>= 2.6.6-3~), libgeos-dev (>= 3.3.1-1~),
  ruby1.8, ruby1.8-dev, ruby1.9.1, ruby1.9.1-dev,
  sharutils, libsdl1.2-dev, libfreetype6-dev, libx11-dev,
  libfcgi-dev, libxml2-dev, libogdi3.2-dev, libxslt1-dev, libpam0g-dev, libreadline-dev, 
diff --git a/debian/patches/fixgeos b/debian/patches/fixgeos
new file mode 100644
index 0000000..bf29841
--- /dev/null
+++ b/debian/patches/fixgeos
@@ -0,0 +1,26 @@
+Index: mapserver/configure
+===================================================================
+--- mapserver.orig/configure	2012-03-05 11:50:29.000000000 +0100
++++ mapserver/configure	2012-03-05 12:41:30.000000000 +0100
+@@ -11567,7 +11567,7 @@
+ 
+   GEOS_INCDIR=`$GEOS_CONFIG --includes`
+   GEOS_INC="-I$GEOS_INCDIR"
+-  GEOS_LIB="`$GEOS_CONFIG --libs`_c"
++  GEOS_LIB=`$GEOS_CONFIG --clibs`
+ 
+   GEOS_ENABLED=$GEOS_ENABLED
+ 
+Index: mapserver/configure.in
+===================================================================
+--- mapserver.orig/configure.in	2012-03-05 11:50:29.000000000 +0100
++++ mapserver/configure.in	2012-03-05 12:41:00.000000000 +0100
+@@ -1342,7 +1342,7 @@
+ 
+   GEOS_INCDIR=`$GEOS_CONFIG --includes`
+   GEOS_INC="-I$GEOS_INCDIR"
+-  GEOS_LIB="`$GEOS_CONFIG --libs`_c"
++  GEOS_LIB=`$GEOS_CONFIG --clibs`
+ 
+   AC_SUBST(GEOS_ENABLED,$GEOS_ENABLED)
+   AC_SUBST(GEOS_INC,    $GEOS_INC)
diff --git a/debian/patches/series b/debian/patches/series
index e69de29..3900795 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -0,0 +1 @@
+fixgeos

-- 
Mapserver