[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 a94199bc372e7846ba697167ef80079e4ea81968
Author: David Paleino <dapal at debian.org>
Date:   Sun Dec 2 09:38:42 2012 +0100

    Dropped 00-systemwide_libepsilon.patch: libepsilon isn't anymore embedded.

diff --git a/debian/changelog b/debian/changelog
index d0f1704..d8fa728 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
 librasterlite (1.1~svn11-3) UNRELEASED; urgency=low
 
   * Updated debian/watch.
+  * Dropped 00-systemwide_libepsilon.patch: libepsilon isn't anymore
+    embedded.
 
- -- David Paleino <dapal at debian.org>  Sun, 02 Dec 2012 09:22:29 +0100
+ -- David Paleino <dapal at debian.org>  Sun, 02 Dec 2012 09:38:12 +0100
 
 librasterlite (1.1~svn11-2) unstable; urgency=low
 
diff --git a/debian/patches/00-systemwide_libepsilon.patch b/debian/patches/00-systemwide_libepsilon.patch
deleted file mode 100644
index ec6b17d..0000000
--- a/debian/patches/00-systemwide_libepsilon.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From: David Paleino <dapal at debian.org>
-Subject: use system-wide libepsilon
-Forwarded: not-needed
-
----
- Makefile.am     |    2 +-
- configure.ac    |    1 -
- lib/Makefile.am |    4 ++--
- src/Makefile.am |    3 ++-
- 4 files changed, 5 insertions(+), 5 deletions(-)
-
---- librasterlite.orig/Makefile.am
-+++ librasterlite/Makefile.am
-@@ -1,4 +1,4 @@
--SUBDIRS = headers epsilon lib src 
-+SUBDIRS = headers lib src
- 
- AUTOMAKE_OPTIONS = dist-zip
- 
---- librasterlite.orig/lib/Makefile.am
-+++ librasterlite/lib/Makefile.am
-@@ -3,7 +3,7 @@ AM_CFLAGS = -D_LARGE_FILE=1 -D_FILE_OFFS
- 
- INCLUDES = @CFLAGS@
- INCLUDES += -I$(top_srcdir)/headers
--INCLUDES += -I$(top_srcdir)/epsilon
-+INCLUDES += -I/usr/include/
- 
- lib_LTLIBRARIES = librasterlite.la 
- 
-@@ -22,6 +22,6 @@ librasterlite_la_SOURCES = \
- librasterlite_la_LDFLAGS = -version-info 1:0:1 -no-undefined
- 
- librasterlite_la_LIBADD = \
--	../epsilon/libepsilon.la \
-+	-lepsilon \
- 	-lgeotiff -ltiff -ljpeg -lpng -lspatialite -lproj
- 
---- librasterlite.orig/src/Makefile.am
-+++ librasterlite/src/Makefile.am
-@@ -9,7 +9,7 @@ bin_PROGRAMS =rasterlite_load \
- 
- INCLUDES = @CFLAGS@
- INCLUDES += -I$(top_srcdir)/headers
--INCLUDES += -I$(top_srcdir)/epsilon
-+INCLUDES += -I/usr/include/
- 
- rasterlite_load_SOURCES = rasterlite_load.c
- rasterlite_pyramid_SOURCES = rasterlite_pyramid.c
-@@ -18,5 +18,6 @@ rasterlite_grid_SOURCES = rasterlite_gri
- rasterlite_tool_SOURCES = rasterlite_tool.c
- 
- LDADD = ../lib/.libs/librasterlite.a \
-+        -lepsilon \
-         -lgeotiff -ltiff -ljpeg -lpng -lspatialite -lproj
- 
---- librasterlite.orig/configure.ac
-+++ librasterlite/configure.ac
-@@ -50,7 +50,6 @@ AC_CHECK_FUNCS([memset sqrt strcasecmp s
- 
- AC_CONFIG_FILES([Makefile \
- 		headers/Makefile \
--		epsilon/Makefile \
- 		lib/Makefile \
- 		src/Makefile \
- 		rasterlite.pc])
diff --git a/debian/patches/series b/debian/patches/series
index 8eb800a..1cac149 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-00-systemwide_libepsilon.patch
 01-fix_build.patch
 02-fix_typos.patch
 03-fix_library_version.patch

-- 
library supporting raster data sources for spatialite