[SCM] spatialite-gui branch, master, updated. debian/1.2.1-2-3-gc4e004c

[Francesco Paolo Lovergine]

The following commit has been merged in the master branch:
commit 7c8b83324e6fa9866c98834353a9ca17a9586de2
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date:   Tue Mar 13 00:24:43 2012 +0100

    Fixed #663646

diff --git a/debian/changelog b/debian/changelog
index 080c0b7..2a240a4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+spatialite-gui (1.2.1-3) unstable; urgency=low
+
+  * Fixed FTBS due to relinking in Makefile-linux and the new geos lib.
+    (closes: #663646)
+
+ -- Francesco Paolo Lovergine <frankie at debian.org>  Tue, 13 Mar 2012 00:20:05 +0100
+
 spatialite-gui (1.2.1-2) unstable; urgency=low
 
   * Fix package description, be more verbose.
diff --git a/debian/patches/00-fix_build.patch b/debian/patches/00-fix_build.patch
index bba6641..6cd8505 100644
--- a/debian/patches/00-fix_build.patch
+++ b/debian/patches/00-fix_build.patch
@@ -6,9 +6,11 @@ Forwarded: no
  Makefile-linux |   14 ++++++--------
  1 file changed, 6 insertions(+), 8 deletions(-)
 
---- spatialite-gui.orig/Makefile-linux
-+++ spatialite-gui/Makefile-linux
-@@ -6,24 +6,22 @@ SRC = Main.cpp TableTree.cpp QueryView.c
+Index: spatialite-gui/Makefile-linux
+===================================================================
+--- spatialite-gui.orig/Makefile-linux	2012-03-13 00:18:41.000000000 +0100
++++ spatialite-gui/Makefile-linux	2012-03-13 00:19:51.000000000 +0100
+@@ -6,24 +6,22 @@
  	MetadataInit.cpp
  OBJ = Main.o TableTree.o QueryView.o ResultSetView.o BlobExplorer.o Dialogs.o \
  	Shapefiles.o Network.o Exif.o TextCsv.o Objects.o MetadataInit.o 
@@ -20,7 +22,7 @@ Forwarded: no
  CXXFLAGS = $(shell wx-config --cxxflags) 
 -LIB = $(shell wx-config --libs) -lgeotiff 
 +LIB = $(shell wx-config --libs) \
-+	-lspatialite -lgeos_c -lgeos -lproj -lrasterlite -lsqlite3
++	-lspatialite -lrasterlite -lsqlite3
  EXTRAFLAGS = -Wall -Wextra -Wno-ctor-dtor-privacy \
 -	-fno-strict-aliasing -I/usr/local/include -D_LARGE_FILE=1 \
 +	-fno-strict-aliasing -I/usr/include -D_LARGE_FILE=1 \

-- 
user-friendly graphical user interface for spatialite