[SCM] spatialite branch, master, updated. debian/4.0.0-1-16-g407ea2f

[Bas Couwenberg]

The following commit has been merged in the master branch:
commit 404ad23e81dc383cd07f8cb2c47eedf90f2583c9
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sun Sep 29 22:11:22 2013 +0200

    Refresh patches.

diff --git a/debian/patches/00-add_automake_foreign.patch b/debian/patches/00-add_automake_foreign.patch
index 5be4c64..144847e 100644
--- a/debian/patches/00-add_automake_foreign.patch
+++ b/debian/patches/00-add_automake_foreign.patch
@@ -8,8 +8,8 @@ Forwarded: no
  Makefile.in |    2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)
 
---- spatialite.orig/Makefile.am
-+++ spatialite/Makefile.am
+--- a/Makefile.am
++++ b/Makefile.am
 @@ -1,6 +1,6 @@
  ACLOCAL_AMFLAGS = -I m4
  
@@ -18,9 +18,9 @@ Forwarded: no
  
  EXTRA_DIST = makefile.vc nmake.opt Android.mk mainpage.doxy README.coverage \
  	spatialite-sql-latest.html config-msvc.h
---- spatialite.orig/Makefile.in
-+++ spatialite/Makefile.in
-@@ -285,7 +285,7 @@ top_build_prefix = @top_build_prefix@
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -292,7 +292,7 @@ top_build_prefix = @top_build_prefix@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
  ACLOCAL_AMFLAGS = -I m4
diff --git a/debian/patches/07-fix_spatialite_pc.patch b/debian/patches/07-fix_spatialite_pc.patch
index 573f4d6..403f560 100644
--- a/debian/patches/07-fix_spatialite_pc.patch
+++ b/debian/patches/07-fix_spatialite_pc.patch
@@ -3,14 +3,12 @@ Subject: avoid relinking sqlite3 and math libraries
 Origin: vendor
 Forwarded: no
 
-Index: spatialite/spatialite.pc.in
-===================================================================
---- spatialite.orig/spatialite.pc.in	2012-02-23 13:42:29.000000000 +0100
-+++ spatialite/spatialite.pc.in	2012-02-29 14:07:47.000000000 +0100
-@@ -8,5 +8,5 @@
+--- a/spatialite.pc.in
++++ b/spatialite.pc.in
+@@ -8,5 +8,5 @@ includedir=@includedir@
  Name: spatialite
  Description: Spatial SQL database engine based on SQLite
  Version: @VERSION@
--Libs: -L${libdir} -lspatialite -lsqlite3 -lm
-+Libs: -L${libdir} -lspatialite
+-Libs: -L${libdir} -lspatialite -lsqlite3 -lm -lz 
++Libs: -L${libdir} -lspatialite -lz 
  Cflags: -I${includedir}

-- 
geospatial extension for SQLite