[SCM] librasterlite branch, master, updated. debian/1.1d-1-17-g98dcec4
Bas Couwenberg
sebastic at xs4all.nl
Wed Oct 2 16:05:59 UTC 2013
The following commit has been merged in the master branch:
commit 834a66d8d479cc1ed0b16e75e6be51b10e65c765
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Tue Oct 1 22:41:40 2013 +0200
Refresh patches.
diff --git a/debian/changelog b/debian/changelog
index 24fde3b..a7ce1a8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ librasterlite (1.1g-1) UNRELEASED; urgency=low
* New upstream version.
* Add myself to Uploaders.
* Update watch file, incorporate sepwatch changes and handle common mistakes.
+ * Refresh patches.
-- Bas Couwenberg <sebastic at xs4all.nl> Tue, 01 Oct 2013 22:27:37 +0200
diff --git a/debian/patches/01-fix_build.patch b/debian/patches/01-fix_build.patch
index 99d363c..8a0c7bb 100644
--- a/debian/patches/01-fix_build.patch
+++ b/debian/patches/01-fix_build.patch
@@ -9,8 +9,8 @@ Forwarded: no
src/Makefile.am | 5 ++++-
4 files changed, 10 insertions(+), 5 deletions(-)
---- librasterlite.orig/lib/Makefile.am
-+++ librasterlite/lib/Makefile.am
+--- a/lib/Makefile.am
++++ b/lib/Makefile.am
@@ -3,6 +3,8 @@ AM_CFLAGS = $(GCOV_FLAGS)
INCLUDES = @CFLAGS@
@@ -21,15 +21,15 @@ Forwarded: no
lib_LTLIBRARIES = librasterlite.la
@@ -21,6 +23,6 @@ librasterlite_la_SOURCES = \
- librasterlite_la_LDFLAGS = -version-info 1:0:1 -no-undefined
+ librasterlite_la_LDFLAGS = -version-info 2:0:0 -no-undefined
librasterlite_la_LIBADD = @LIBSPATIALITE_LIBS@ @LIBPNG_LIBS@ \
- -lgeotiff -ltiff -ljpeg -lspatialite -lproj
+ -lgeotiff -ltiff -ljpeg -lspatialite -lsqlite3
MOSTLYCLEANFILES = *.gcna *.gcno *.gcda
---- librasterlite.orig/src/Makefile.am
-+++ librasterlite/src/Makefile.am
+--- a/src/Makefile.am
++++ b/src/Makefile.am
@@ -7,6 +7,8 @@ bin_PROGRAMS =rasterlite_load \
INCLUDES = @CFLAGS@
@@ -48,8 +48,8 @@ Forwarded: no
+ -lgeotiff -ltiff -lspatialite
MOSTLYCLEANFILES = *.gcna *.gcno *.gcda
---- librasterlite.orig/Makefile.am
-+++ librasterlite/Makefile.am
+--- a/Makefile.am
++++ b/Makefile.am
@@ -2,7 +2,7 @@ ACLOCAL_AMFLAGS = -I m4
SUBDIRS = headers lib src test
@@ -59,8 +59,8 @@ Forwarded: no
EXTRA_DIST = Makefile-static-MinGW Makefile-static-Linux \
Makefile-static-MacOsX makefile.vc nmake.opt
---- librasterlite.orig/configure.ac
-+++ librasterlite/configure.ac
+--- a/configure.ac
++++ b/configure.ac
@@ -79,11 +79,11 @@ AC_CHECK_LIB(tiff,TIFFClientOpen,,AC_MSG
AC_CHECK_LIB(proj,pj_init_plus,,AC_MSG_ERROR(['libproj' is required but it doesn't seem to be installed on this system.]),-lm)
AC_CHECK_LIB(geotiff,GTIFSetFromProj4,,AC_MSG_ERROR(['libgeotiff' [>= v.1.2.5] is required but it doesn't seem to be installed on this system.]),-lm)
diff --git a/debian/patches/02-fix_typos.patch b/debian/patches/02-fix_typos.patch
index d26e7df..f95e758 100644
--- a/debian/patches/02-fix_typos.patch
+++ b/debian/patches/02-fix_typos.patch
@@ -6,8 +6,8 @@ Forwarded: no
src/rasterlite_pyramid.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---- librasterlite.orig/src/rasterlite_pyramid.c
-+++ librasterlite/src/rasterlite_pyramid.c
+--- a/src/rasterlite_pyramid.c
++++ b/src/rasterlite_pyramid.c
@@ -1029,7 +1029,7 @@ build_pyramid_level (sqlite3 * handle, c
goto error2;
}
--
library supporting raster data sources for spatialite
More information about the Pkg-grass-devel
mailing list