[SCM] librasterlite branch, master, updated. debian/1.1_svn11-2-21-gbf44c23

[David Paleino]

The following commit has been merged in the master branch:
commit b3a9ab93b0dc24789e4a2759c93959dd9ffd1c20
Author: David Paleino <dapal at debian.org>
Date:   Sun Dec 2 09:39:03 2012 +0100

    Patches refreshed

diff --git a/debian/patches/01-fix_build.patch b/debian/patches/01-fix_build.patch
index 7c4e340..80a2860 100644
--- a/debian/patches/01-fix_build.patch
+++ b/debian/patches/01-fix_build.patch
@@ -3,47 +3,46 @@ Subject: fix compile- and link-time issues
 Forwarded: no
 
 ---
- lib/Makefile.am |    6 +++---
- src/Makefile.am |    7 ++++---
- 2 files changed, 7 insertions(+), 6 deletions(-)
+ lib/Makefile.am |    4 +++-
+ src/Makefile.am |    5 ++++-
+ 2 files changed, 7 insertions(+), 2 deletions(-)
 
 --- librasterlite.orig/lib/Makefile.am
 +++ librasterlite/lib/Makefile.am
-@@ -4,6 +4,7 @@ AM_CFLAGS = -D_LARGE_FILE=1 -D_FILE_OFFS
+@@ -3,6 +3,8 @@ AM_CFLAGS = $(GCOV_FLAGS)
+ 
  INCLUDES = @CFLAGS@
  INCLUDES += -I$(top_srcdir)/headers
- INCLUDES += -I/usr/include/
++INCLUDES += -I/usr/include/
 +INCLUDES += -I/usr/include/geotiff/
  
  lib_LTLIBRARIES = librasterlite.la 
  
-@@ -22,6 +23,5 @@ librasterlite_la_SOURCES = \
+@@ -21,6 +23,6 @@ librasterlite_la_SOURCES = \
  librasterlite_la_LDFLAGS = -version-info 1:0:1 -no-undefined
  
- librasterlite_la_LIBADD = \
--	-lepsilon \
--	-lgeotiff -ltiff -ljpeg -lpng -lspatialite -lproj
--
-+	-lepsilon -lsqlite3 \
-+	-lgeotiff -ltiff -ljpeg -lpng -lspatialite
+ librasterlite_la_LIBADD = @LIBSPATIALITE_LIBS@ @LIBPNG_LIBS@ \
+-	-lgeotiff -ltiff -ljpeg -lspatialite -lproj
++	-lgeotiff -ltiff -ljpeg -lspatialite
+ 
+ MOSTLYCLEANFILES = *.gcna *.gcno *.gcda
 --- librasterlite.orig/src/Makefile.am
 +++ librasterlite/src/Makefile.am
-@@ -10,6 +10,7 @@ bin_PROGRAMS =rasterlite_load \
+@@ -7,6 +7,8 @@ bin_PROGRAMS =rasterlite_load \
+ 
  INCLUDES = @CFLAGS@
  INCLUDES += -I$(top_srcdir)/headers
- INCLUDES += -I/usr/include/
++INCLUDES += -I/usr/include/
 +INCLUDES += -I/usr/include/geotiff/
  
  rasterlite_load_SOURCES = rasterlite_load.c
  rasterlite_pyramid_SOURCES = rasterlite_pyramid.c
-@@ -17,7 +18,7 @@ rasterlite_topmost_SOURCES = rasterlite_
- rasterlite_grid_SOURCES = rasterlite_grid.c
- rasterlite_tool_SOURCES = rasterlite_tool.c
- 
--LDADD = ../lib/.libs/librasterlite.a \
--        -lepsilon \
--        -lgeotiff -ltiff -ljpeg -lpng -lspatialite -lproj
-+LDADD = ../lib/.libs/librasterlite.la \
-+        -lsqlite3 -lm \
+@@ -16,6 +18,7 @@ rasterlite_tool_SOURCES = rasterlite_too
+ 
+ LDADD = ../lib/.libs/librasterlite.a \
+ 	@LIBSPATIALITE_LIBS@ @LIBPNG_LIBS@ \
+-        -lgeotiff -ltiff -ljpeg -lspatialite -lproj
++	    -lsqlite3 -lm \
 +        -lgeotiff -ltiff -lspatialite
  
+ MOSTLYCLEANFILES = *.gcna *.gcno *.gcda
diff --git a/debian/patches/02-fix_typos.patch b/debian/patches/02-fix_typos.patch
index 4dc807a..d26e7df 100644
--- a/debian/patches/02-fix_typos.patch
+++ b/debian/patches/02-fix_typos.patch
@@ -8,7 +8,7 @@ Forwarded: no
 
 --- librasterlite.orig/src/rasterlite_pyramid.c
 +++ librasterlite/src/rasterlite_pyramid.c
-@@ -1020,7 +1020,7 @@ build_pyramid_level (sqlite3 * handle, c
+@@ -1029,7 +1029,7 @@ build_pyramid_level (sqlite3 * handle, c
  	  goto error2;
        }
  
diff --git a/debian/patches/03-fix_library_version.patch b/debian/patches/03-fix_library_version.patch
index f0f9704..57068d2 100644
--- a/debian/patches/03-fix_library_version.patch
+++ b/debian/patches/03-fix_library_version.patch
@@ -10,11 +10,11 @@ Forwarded: no
 --- librasterlite.orig/lib/Makefile.am
 +++ librasterlite/lib/Makefile.am
 @@ -20,7 +20,7 @@ librasterlite_la_SOURCES = \
-      rasterlite_wavelet.c \
+      rasterlite_version.c \
       rasterlite.c
  
 -librasterlite_la_LDFLAGS = -version-info 1:0:1 -no-undefined
 +librasterlite_la_LDFLAGS = -version-info 2:0:1 -no-undefined
  
- librasterlite_la_LIBADD = \
- 	-lepsilon -lsqlite3 \
+ librasterlite_la_LIBADD = @LIBSPATIALITE_LIBS@ @LIBPNG_LIBS@ \
+ 	-lgeotiff -ltiff -ljpeg -lspatialite

-- 
library supporting raster data sources for spatialite