[SCM] mapserver branch, ubuntu/precise, updated. upstream/6.0.1-35-g31f6653

[Alan Boudreault]

The following commit has been merged in the ubuntu/precise branch:
commit 31f6653bb0e25bc6d8a5c4c497198138e9928346
Author: Alan Boudreault <aboudreault at mapgears.com>
Date:   Tue May 22 22:24:04 2012 +0000

    Remove unuseful patch fixgeos

diff --git a/debian/patches/fixgeos b/debian/patches/fixgeos
deleted file mode 100644
index bf29841..0000000
--- a/debian/patches/fixgeos
+++ /dev/null
@@ -1,26 +0,0 @@
-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)

-- 
Mapserver