[SCM] spatialite branch, master, updated. debian/3.0.0_beta20110817-3-22-gfb55dcc
Francesco Paolo Lovergine
frankie at debian.org
Fri Mar 2 13:20:14 UTC 2012
The following commit has been merged in the master branch:
commit 2b3175f6f9eec8d0c746b3665597d64f8de99b47
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date: Fri Mar 2 12:02:55 2012 +0100
Updated to new upstream snapshot.
diff --git a/debian/changelog b/debian/changelog
index 14ad99f..617c060 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,12 @@
-spatialite (3.0.1-2) unstable; urgency=low
+spatialite (3.0.2~20120302-1) unstable; urgency=low
+ * New upstream pre-release.
* Added 07-fix_spatialite_pc.patch: now avoid re-linking also in spatialite.pc
file.
- *
+ * Patchset refreshed.
+ * New SONAME set to be compatible with that issued until now.
- -- Francesco Paolo Lovergine <frankie at debian.org> Wed, 29 Feb 2012 14:09:52 +0100
+ -- Francesco Paolo Lovergine <frankie at debian.org> Fri, 02 Mar 2012 12:00:56 +0100
spatialite (3.0.1-1) unstable; urgency=low
diff --git a/debian/patches/00-add_automake_foreign.patch b/debian/patches/00-add_automake_foreign.patch
index 2e3ed66..32f16b6 100644
--- a/debian/patches/00-add_automake_foreign.patch
+++ b/debian/patches/00-add_automake_foreign.patch
@@ -12,26 +12,26 @@ Forwarded: no
Index: spatialite/Makefile.am
===================================================================
---- spatialite.orig/Makefile.am 2012-02-17 16:53:35.000000000 +0100
-+++ spatialite/Makefile.am 2012-02-17 17:02:17.000000000 +0100
+--- spatialite.orig/Makefile.am 2012-03-02 11:53:36.000000000 +0100
++++ spatialite/Makefile.am 2012-03-02 11:55:51.000000000 +0100
@@ -1,6 +1,6 @@
ACLOCAL_AMFLAGS = -I m4
-AUTOMAKE_OPTIONS = dist-zip
+AUTOMAKE_OPTIONS = dist-zip foreign
- EXTRA_DIST = makefile.vc nmake.opt mainpage.doxy README.coverage
+ EXTRA_DIST = makefile.vc nmake.opt Android.mk mainpage.doxy README.coverage
Index: spatialite/Makefile.in
===================================================================
---- spatialite.orig/Makefile.in 2012-02-17 16:53:35.000000000 +0100
-+++ spatialite/Makefile.in 2012-02-17 17:03:14.000000000 +0100
-@@ -254,7 +254,7 @@
+--- spatialite.orig/Makefile.in 2012-03-02 11:53:36.000000000 +0100
++++ spatialite/Makefile.in 2012-03-02 11:56:25.000000000 +0100
+@@ -257,7 +257,7 @@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
ACLOCAL_AMFLAGS = -I m4
-AUTOMAKE_OPTIONS = dist-zip
+AUTOMAKE_OPTIONS = dist-zip foreign
- EXTRA_DIST = makefile.vc nmake.opt mainpage.doxy README.coverage
+ EXTRA_DIST = makefile.vc nmake.opt Android.mk mainpage.doxy README.coverage
SUBDIRS = src test examples
pkgconfigdir = $(libdir)/pkgconfig
diff --git a/debian/patches/04-fix_missing_define.patch b/debian/patches/04-fix_missing_define.patch
index 41dfb1e..c5382a9 100644
--- a/debian/patches/04-fix_missing_define.patch
+++ b/debian/patches/04-fix_missing_define.patch
@@ -1,7 +1,7 @@
Index: spatialite/src/headers/spatialite/gaiaexif.h
===================================================================
---- spatialite.orig/src/headers/spatialite/gaiaexif.h 2012-02-17 16:53:35.000000000 +0100
-+++ spatialite/src/headers/spatialite/gaiaexif.h 2012-02-22 11:10:40.000000000 +0100
+--- spatialite.orig/src/headers/spatialite/gaiaexif.h 2012-03-02 11:56:59.000000000 +0100
++++ spatialite/src/headers/spatialite/gaiaexif.h 2012-03-02 11:57:11.000000000 +0100
@@ -87,6 +87,7 @@
#define GAIA_GEOMETRY_BLOB 8
/** this BLOB does actually contain a TIFF image */
diff --git a/debian/patches/05-dont_relink.patch b/debian/patches/05-dont_relink.patch
index 916722d..e83d21d 100644
--- a/debian/patches/05-dont_relink.patch
+++ b/debian/patches/05-dont_relink.patch
@@ -1,8 +1,8 @@
Index: spatialite/configure
===================================================================
---- spatialite.orig/configure 2012-02-23 13:42:29.000000000 +0100
-+++ spatialite/configure 2012-02-27 12:25:37.000000000 +0100
-@@ -17201,7 +17201,7 @@
+--- spatialite.orig/configure 2012-03-02 11:56:59.000000000 +0100
++++ spatialite/configure 2012-03-02 11:57:28.000000000 +0100
+@@ -17205,7 +17205,7 @@
ac_res="none required"
else
ac_res=-l$ac_lib
@@ -11,7 +11,7 @@ Index: spatialite/configure
fi
if ac_fn_c_try_link "$LINENO"; then :
ac_cv_search_GEOSTopologyPreserveSimplify=$ac_res
-@@ -17271,7 +17271,7 @@
+@@ -17275,7 +17275,7 @@
ac_res="none required"
else
ac_res=-l$ac_lib
@@ -22,9 +22,9 @@ Index: spatialite/configure
ac_cv_search_GEOSCoveredBy=$ac_res
Index: spatialite/configure.ac
===================================================================
---- spatialite.orig/configure.ac 2012-02-23 13:42:29.000000000 +0100
-+++ spatialite/configure.ac 2012-02-27 12:25:14.000000000 +0100
-@@ -124,7 +124,7 @@
+--- spatialite.orig/configure.ac 2012-03-02 11:56:59.000000000 +0100
++++ spatialite/configure.ac 2012-03-02 11:57:28.000000000 +0100
+@@ -128,7 +128,7 @@
if test x"$enable_geos" != "xno"; then
OMIT_GEOS_FLAGS=
AC_CHECK_HEADERS(geos_c.h,, [AC_MSG_ERROR([cannot find geos_c.h, bailing out])])
@@ -33,8 +33,8 @@ Index: spatialite/configure.ac
#-----------------------------------------------------------------------
# --enable-geosadvanced
#
-@@ -133,7 +133,7 @@
- [], [geosadvanced=yes])
+@@ -137,7 +137,7 @@
+ [], [enable_geosadvanced=yes])
if test x"$enable_geosadvanced" != "xno"; then
GEOSADVANCED_FLAGS=-DGEOS_ADVANCED
- AC_SEARCH_LIBS(GEOSCoveredBy,geos_c,,AC_MSG_ERROR([obsolete 'libgeos_c' (< v.3.3.0). please retry specifying: --disable-geosadvanced.]),-lm -lgeos)
diff --git a/debian/patches/06-fix_soname.patch b/debian/patches/06-fix_soname.patch
index 58756b4..0f8116d 100644
--- a/debian/patches/06-fix_soname.patch
+++ b/debian/patches/06-fix_soname.patch
@@ -1,31 +1,26 @@
Index: spatialite/src/Makefile.am
===================================================================
---- spatialite.orig/src/Makefile.am 2012-02-23 13:42:29.000000000 +0100
-+++ spatialite/src/Makefile.am 2012-02-27 12:58:50.000000000 +0100
-@@ -25,9 +25,9 @@
-
-
+--- spatialite.orig/src/Makefile.am 2012-03-02 11:53:36.000000000 +0100
++++ spatialite/src/Makefile.am 2012-03-02 11:59:04.000000000 +0100
+@@ -27,7 +27,7 @@
if MINGW
--libspatialite_la_LDFLAGS = -version-info 4:0:2 -no-undefined
-+libspatialite_la_LDFLAGS = -version-info 4:0:1 -no-undefined
+ libspatialite_la_LDFLAGS = -version-info 3:0:0 -no-undefined
else
--libspatialite_la_LDFLAGS = -version-info 4:0:2
-+libspatialite_la_LDFLAGS = -version-info 4:0:1
+-libspatialite_la_LDFLAGS = -version-info 4:3:0
++libspatialite_la_LDFLAGS = -version-info 5:0:2
libspatialite_la_LIBADD += -lpthread -ldl
endif
Index: spatialite/src/Makefile.in
===================================================================
---- spatialite.orig/src/Makefile.in 2012-02-23 13:42:29.000000000 +0100
-+++ spatialite/src/Makefile.in 2012-02-27 12:59:03.000000000 +0100
-@@ -279,8 +279,8 @@
+--- spatialite.orig/src/Makefile.in 2012-03-02 11:53:36.000000000 +0100
++++ spatialite/src/Makefile.in 2012-03-02 12:00:00.000000000 +0100
+@@ -282,7 +282,7 @@
./spatialite/libsplite.la ./shapefiles/libshapefiles.la \
./srsinit/libsrsinit.la ./virtualtext/libvirtualtext.la \
$(am__append_1)
-- at MINGW_FALSE@libspatialite_la_LDFLAGS = -version-info 4:0:2
-- at MINGW_TRUE@libspatialite_la_LDFLAGS = -version-info 4:0:2 -no-undefined
-+ at MINGW_FALSE@libspatialite_la_LDFLAGS = -version-info 4:0:1
-+ at MINGW_TRUE@libspatialite_la_LDFLAGS = -version-info 4:0:1 -no-undefined
+- at MINGW_FALSE@libspatialite_la_LDFLAGS = -version-info 4:3:0
++ at MINGW_FALSE@libspatialite_la_LDFLAGS = -version-info 5:0:2
+ @MINGW_TRUE at libspatialite_la_LDFLAGS = -version-info 3:0:0 -no-undefined
MOSTLYCLEANFILES = *.gcna *.gcno *.gcda
all: all-recursive
-
--
geospatial extension for SQLite
More information about the Pkg-grass-devel
mailing list