[SCM] mapserver branch, ubuntu/oneiric, updated. upstream/6.0.1-35-g57b125f

[Jerome Villeneuve Larouche]

The following commit has been merged in the ubuntu/oneiric branch:
commit 57b125fb6e3b8078b1899de8f353438cef688533
Author: Jerome Villeneuve Larouche <jlarouche at mapgears.com>
Date:   Fri Jun 8 17:54:54 2012 +0000

    Added back fixgeos patch

diff --git a/debian/changelog b/debian/changelog
index 4e9ba2f..128629f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mapserver (6.0.3-2~oneiric4) oneiric; urgency=low
+
+  * Launchpad build for Oneiric
+  * Added back fixgeos patch
+
+ -- Jerome Villeneuve Larouche <jlarouche at mapgears.com>  Fri, 08 Jun 2012 17:53:12 +0000
+
 mapserver (6.0.3-2~oneiric2) oneiric; urgency=medium
 
   * Fix bad dependency: libgdal1 -> libgdal.
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 4c45ff9..5ae8d3a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 php54
+fixgeos

-- 
Mapserver