[SCM] mapserver branch, ubuntu/precise, updated. upstream/6.0.1-37-g11fa89e

[Jerome Villeneuve Larouche]

The following commit has been merged in the ubuntu/precise branch:
commit 11fa89eb666e21f7b37f22377bffdcd06d238101
Author: Jerome Villeneuve Larouche <jlarouche at mapgears.com>
Date:   Fri Jun 8 16:00:44 2012 +0000

    Added back fixgeos patch for 6.0.3

diff --git a/debian/changelog b/debian/changelog
index 8cb0102..92e9fab 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,13 @@
-mapserver (6.0.3-2~precise1) precise; urgency=low
+mapserver (6.0.3-2~precise4) precise; urgency=low
 
-  * Launchpad build for precise.
+  [Jerome Villeneuve Larouche]
+  * Launchpad build for Precise
+  * Added back the fixgeos patch
+
+  [Alan Boudreault]
   * Added multi-arch patch.
 
- -- Alan Boudreault <aboudreault at mapgears.com>  Tue, 22 May 2012 17:46:34 +0000
+ -- Jerome Villeneuve Larouche <jlarouche at mapgears.com>  Fri, 08 Jun 2012 13:34:12 +0000
 
 mapserver (6.0.3-1) unstable; urgency=low
 
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 bcbc3a6..f9cdaec 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 php54
 multiarch-libgd
+fixgeos

-- 
Mapserver