[SCM] gdal branch, master, updated. upstream/1.8.0-26-g6057817

[Francesco Paolo Lovergine]

The following commit has been merged in the master branch:
commit a47089916e864cc9a74ddac7344b4468746ef4ed
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date:   Thu May 12 11:48:58 2011 +0200

    Fixed for sqlite3 linking.

diff --git a/debian/changelog b/debian/changelog
index 625ad8c..e184060 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+gdal (1.8.0-2) experimental; urgency=low
+
+  * Patch: symver. Added symbol versioning (GDAL_X.Y) for all symbols 
+    exported by GDAL.
+    (closes: #558733)
+  * Patch: spatialite. Added explicit linking to sqlite3 for spatialite.
+    This is Debian specific, because Debian spatialite does not embed Sqlite
+    functions as in upstream release.
+
+ -- Francesco Paolo Lovergine <frankie at debian.org>  Thu, 12 May 2011 11:12:36 +0200
+
 gdal (1.8.0-1) experimental; urgency=low
 
   * New upstream release.
diff --git a/debian/patches/series b/debian/patches/series
index 1cae244..e29d991 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,3 +10,4 @@ gdal-grass
 ecw-plugin
 mrsid-plugin
 symver
+spatialite
diff --git a/debian/patches/spatialite b/debian/patches/spatialite
new file mode 100644
index 0000000..dee9478
--- /dev/null
+++ b/debian/patches/spatialite
@@ -0,0 +1,22 @@
+Index: gdal/configure
+===================================================================
+--- gdal.orig/configure	2011-05-12 11:09:37.000000000 +0200
++++ gdal/configure	2011-05-12 11:12:03.000000000 +0200
+@@ -22282,7 +22282,7 @@
+ 
+     if test "$SPATIALITE_INIT_FOUND" = "yes"; then
+         HAVE_SPATIALITE=yes
+-        LIBS="$LIBS -lspatialite"
++        LIBS="$LIBS -lspatialite -lsqlite3"
+         HAVE_SQLITE3=yes
+     fi
+ else
+@@ -22341,7 +22341,7 @@
+         # as there's a spatialite.h file in it, which we don't want to include.
+         # We want to include include/spatialite.h instead !
+         SQLITE3_CFLAGS="-I$with_spatialite/include"
+-        LIBS="$LIBS -L$with_spatialite/lib -lspatialite"
++        LIBS="$LIBS -L$with_spatialite/lib -lspatialite -lsqlite3"
+         HAVE_SQLITE3=yes
+     else
+         { $as_echo "$as_me:${as_lineno-$LINENO}: result: disabled" >&5

-- 
GDAL/OGR library and tools