The following commit has been merged in the master branch: commit 89fdb95bc3299191828258a7ab8eb4cbab7b36d1 Author: Francesco Paolo Lovergine <fran...@debian.org> Date: Mon Feb 27 13:11:34 2012 +0100
Fixed SONAME versioning. diff --git a/debian/changelog b/debian/changelog index ce5e595..04664e4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,8 +14,9 @@ spatialite (3.0.1-1) unstable; urgency=low * Added a patch 05-dont_relink.patch to avoid (superfluous) relinking against the C++ geos library. It now causes a failure at configuration time because the C/C++ libraries are now splitted. + * Added a 06-fix_soname.patch patch to use a correct SONAME versioning. - -- Francesco Paolo Lovergine <fran...@debian.org> Mon, 27 Feb 2012 12:26:08 +0100 + -- Francesco Paolo Lovergine <fran...@debian.org> Mon, 27 Feb 2012 13:09:12 +0100 spatialite (3.0.0~beta20110817-3) unstable; urgency=low diff --git a/debian/patches/00-systemlibs.patch b/debian/patches/00-systemlibs.patch deleted file mode 100644 index 455ede7..0000000 --- a/debian/patches/00-systemlibs.patch +++ /dev/null @@ -1,167 +0,0 @@ -From: Francesco Paolo Lovergine <fran...@debian.org> -Subject: use system-wide libraries -Origin: vendor -Forwarded: no - ---- - libspatialite/Makefile.am | 14 ++++++-------- - libspatialite/headers/Makefile.am | 2 -- - spatialite-tools/Makefile.am | 14 +++++--------- - spatialite-tools/exif_loader.c | 2 +- - spatialite-tools/shapefiles.c | 2 +- - spatialite-tools/shell.c | 2 +- - spatialite-tools/shp_doctor.c | 2 +- - spatialite-tools/spatialite_network.c | 2 +- - spatialite-tools/spatialite_osm.c | 2 +- - spatialite-tools/spatialite_tool.c | 2 +- - 10 files changed, 18 insertions(+), 26 deletions(-) - ---- spatialite.orig/libspatialite/headers/Makefile.am -+++ spatialite/libspatialite/headers/Makefile.am -@@ -4,6 +4,4 @@ nobase_include_HEADERS = \ - spatialite/gaiaexif.h \ - spatialite/gaiaaux.h \ - spatialite/gaiageo.h \ -- spatialite/sqlite3.h \ -- spatialite/sqlite3ext.h \ - spatialite/spatialite.h ---- spatialite.orig/libspatialite/Makefile.am -+++ spatialite/libspatialite/Makefile.am -@@ -7,8 +7,7 @@ INCLUDES += @PROJ_INCLUDE@ @GEOS_INCLUDE - - lib_LTLIBRARIES = libspatialite.la - --libspatialite_la_SOURCES = spatialite.c \ -- sqlite3.c -+libspatialite_la_SOURCES = spatialite.c - - if MINGW - libspatialite_la_LDFLAGS = -version-info 2:4:0 -no-undefined -@@ -26,16 +25,15 @@ libspatialite_la_LIBADD = \ - @PROJ_LIB_LA@ \ - -liconv -lm -lstdc++ -lpthread -ldl - else --libspatialite_la_LDFLAGS = -version-info 2:4:0 --libspatialite_la_LIBADD = \ -- @GEOS_LIB_CLA@ \ -- @GEOS_LIB_LA@ \ -- @PROJ_LIB_LA@ \ -+# Fixed SONAME to avoid not proper bumping. -+libspatialite_la_LDFLAGS = -lsqlite3 -version-info 3:0:1 -+libspatialite_la_LIBADD = -lsqlite3 \ -+ -lgeos_c -lgeos -lproj \ - -lm -lstdc++ -lpthread -ldl - endif - endif - --AUTOMAKE_OPTIONS = dist-zip -+AUTOMAKE_OPTIONS = dist-zip foreign - - EXTRA_DIST = makefile.vc nmake.opt libspatialite.def - ---- spatialite.orig/spatialite-tools/exif_loader.c -+++ spatialite/spatialite-tools/exif_loader.c -@@ -40,7 +40,7 @@ - #include <dirent.h> - #endif - --#include <spatialite/sqlite3.h> -+#include <sqlite3.h> - #include <spatialite/gaiaexif.h> - #include <spatialite/gaiageo.h> - #include <spatialite.h> ---- spatialite.orig/spatialite-tools/Makefile.am -+++ spatialite/spatialite-tools/Makefile.am -@@ -45,21 +45,17 @@ LDADD = @SPATIALITE_LIB@ \ - @PROJ_LIB@ \ - -lm -liconv -lstdc++ -lpthread -ldl - else --spatialite_LDADD = @SPATIALITE_LIB@ \ -- @GEOS_LIB_C@ \ -- @GEOS_LIB@ \ -- @PROJ_LIB@ \ -+spatialite_LDADD = @SPATIALITE_LIB@ -lsqlite3 \ -+ -lgeos_c -lgeos -lproj \ - -lm -lstdc++ -lpthread -ldl \ - @READLINE_LIBS@ --LDADD = @SPATIALITE_LIB@ \ -- @GEOS_LIB_C@ \ -- @GEOS_LIB@ \ -- @PROJ_LIB@ \ -+LDADD = @SPATIALITE_LIB@ -lsqlite3 \ -+ -lgeos_c -lgeos -lproj \ - -lm -lstdc++ -lpthread -ldl - endif - endif - - EXTRA_DIST = makefile.vc nmake.opt - --AUTOMAKE_OPTIONS = dist-zip -+AUTOMAKE_OPTIONS = dist-zip foreign - ---- spatialite.orig/spatialite-tools/shapefiles.c -+++ spatialite/spatialite-tools/shapefiles.c -@@ -47,7 +47,7 @@ the terms of any one of the MPL, the GPL - #include <stdio.h> - #include <string.h> - --#include <spatialite/sqlite3.h> -+#include <sqlite3.h> - #include <spatialite/gaiaaux.h> - #include <spatialite/gaiageo.h> - #include <spatialite.h> ---- spatialite.orig/spatialite-tools/shell.c -+++ spatialite/spatialite-tools/shell.c -@@ -38,7 +38,7 @@ - /* Sandro Furieri 30 May 2008 - / #include "sqlite3.h" - */ --#include <spatialite/sqlite3.h> -+#include <sqlite3.h> - #include <spatialite.h> - #ifdef __MINGW32__ - #define LIBICONV_STATIC ---- spatialite.orig/spatialite-tools/shp_doctor.c -+++ spatialite/spatialite-tools/shp_doctor.c -@@ -30,7 +30,7 @@ - #include <float.h> - #include <errno.h> - --#include <spatialite/sqlite3.h> -+#include <sqlite3.h> - #include <spatialite/gaiageo.h> - - #define ARG_NONE 0 ---- spatialite.orig/spatialite-tools/spatialite_network.c -+++ spatialite/spatialite-tools/spatialite_network.c -@@ -29,7 +29,7 @@ - #include <string.h> - #include <float.h> - --#include <spatialite/sqlite3.h> -+#include <sqlite3.h> - #include <spatialite/gaiageo.h> - #include <spatialite.h> - ---- spatialite.orig/spatialite-tools/spatialite_osm.c -+++ spatialite/spatialite-tools/spatialite_osm.c -@@ -28,7 +28,7 @@ - #include <stdio.h> - #include <string.h> - --#include <spatialite/sqlite3.h> -+#include <sqlite3.h> - #include <spatialite/gaiageo.h> - #include <spatialite.h> - ---- spatialite.orig/spatialite-tools/spatialite_tool.c -+++ spatialite/spatialite-tools/spatialite_tool.c -@@ -29,7 +29,7 @@ - #include <string.h> - #include <errno.h> - --#include <spatialite/sqlite3.h> -+#include <sqlite3.h> - #include <spatialite/gaiaaux.h> - #include <spatialite/gaiageo.h> - #include <spatialite.h> diff --git a/debian/patches/01-fix_local_build.patch b/debian/patches/01-fix_local_build.patch deleted file mode 100644 index 8d8c92e..0000000 --- a/debian/patches/01-fix_local_build.patch +++ /dev/null @@ -1,162 +0,0 @@ -From: David Paleino <da...@debian.org> -Subject: fix local build issues -Origin: vendor -Forwarded: not-needed - ---- - spatialite-tools/Makefile.am | 7 ++-- - spatialite-tools/Makefile.in | 7 ++-- - spatialite-tools/configure | 71 +----------------------------------------- - spatialite-tools/configure.ac | 3 + - 4 files changed, 14 insertions(+), 74 deletions(-) - -Index: spatialite/spatialite-tools/Makefile.am -=================================================================== ---- spatialite.orig/spatialite-tools/Makefile.am 2012-02-22 11:15:13.000000000 +0100 -+++ spatialite/spatialite-tools/Makefile.am 2012-02-22 11:15:13.000000000 +0100 -@@ -2,7 +2,10 @@ - - AM_CFLAGS = -D_LARGE_FILE=1 -D_FILE_OFFSET_BITS=64 \ - -D_LARGEFILE_SOURCE=1 @LIBSPATIALITE_CFLAGS@ \ -- @LIBFREEXL_CFLAGS@ -+ @LIBFREEXL_CFLAGS@ \ -+ -L../libspatialite/src/.libs/ \ -+ -I../libspatialite/src/headers/ -+ - - bin_PROGRAMS = spatialite \ - spatialite_tool \ -@@ -39,7 +42,8 @@ - -lexpat - spatialite_LDADD = @LIBSPATIALITE_LIBS@ \ - @LIBFREEXL_LIBS@ \ -- @READLINE_LIBS@ -+ @READLINE_LIBS@ \ -+ -lfreexl - LDADD = @LIBSPATIALITE_LIBS@ \ - @LIBFREEXL_LIBS@ - -Index: spatialite/spatialite-tools/Makefile.in -=================================================================== ---- spatialite.orig/spatialite-tools/Makefile.in 2012-02-22 11:15:13.000000000 +0100 -+++ spatialite/spatialite-tools/Makefile.in 2012-02-22 11:15:13.000000000 +0100 -@@ -257,7 +257,9 @@ - ACLOCAL_AMFLAGS = -I m4 - AM_CFLAGS = -D_LARGE_FILE=1 -D_FILE_OFFSET_BITS=64 \ - -D_LARGEFILE_SOURCE=1 @LIBSPATIALITE_CFLAGS@ \ -- @LIBFREEXL_CFLAGS@ -+ @LIBFREEXL_CFLAGS@ \ -+ -L../libspatialite/src/.libs/ \ -+ -I../libspatialite/src/headers/ - - INCLUDES = @CFLAGS@ - spatialite_SOURCES = shell.c -@@ -287,7 +289,8 @@ - @READLINE_LIBS@ - - LDADD = @LIBSPATIALITE_LIBS@ \ -- @LIBFREEXL_LIBS@ -+ @LIBFREEXL_LIBS@ \ -+ -lfreexl - - EXTRA_DIST = makefile.vc nmake.opt \ - Makefile-static-MinGW \ -Index: spatialite/spatialite-tools/configure.ac -=================================================================== ---- spatialite.orig/spatialite-tools/configure.ac 2012-02-22 11:10:56.000000000 +0100 -+++ spatialite/spatialite-tools/configure.ac 2012-02-22 11:15:13.000000000 +0100 -@@ -74,9 +74,11 @@ - 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(geos_c,GEOSTopologyPreserveSimplify,,AC_MSG_ERROR(['libgeos_c' is required but it doesn't seem to be installed on this system.]),-lm -lgeos) - --PKG_CHECK_MODULES([LIBSPATIALITE], [spatialite], , AC_MSG_ERROR(['libspatialite' is required but it doesn't seem to be installed on this system.])) -+LIBSPATIALITE_CFLAGS= -+LIBSPATIALITE_LIBS="-lspatialite -lsqlite3" - AC_SUBST(LIBSPATIALITE_CFLAGS) - AC_SUBST(LIBSPATIALITE_LIBS) -+ - PKG_CHECK_MODULES([LIBFREEXL], [freexl], , AC_MSG_ERROR(['libfreexl' is required but it doesn't seem to be installed on this system.])) - AC_SUBST(LIBFREEXL_CFLAGS) - AC_SUBST(LIBFREEXL_LIBS) -Index: spatialite/spatialite-tools/configure -=================================================================== ---- spatialite.orig/spatialite-tools/configure 2012-02-22 11:14:40.000000000 +0100 -+++ spatialite/spatialite-tools/configure 2012-02-22 11:17:05.000000000 +0100 -@@ -17316,77 +17316,6 @@ - fi - - pkg_failed=no --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBSPATIALITE" >&5 --$as_echo_n "checking for LIBSPATIALITE... " >&6; } -- --if test -n "$LIBSPATIALITE_CFLAGS"; then -- pkg_cv_LIBSPATIALITE_CFLAGS="$LIBSPATIALITE_CFLAGS" -- elif test -n "$PKG_CONFIG"; then -- if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"spatialite\""; } >&5 -- ($PKG_CONFIG --exists --print-errors "spatialite") 2>&5 -- ac_status=$? -- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -- test $ac_status = 0; }; then -- pkg_cv_LIBSPATIALITE_CFLAGS=`$PKG_CONFIG --cflags "spatialite" 2>/dev/null` --else -- pkg_failed=yes --fi -- else -- pkg_failed=untried --fi --if test -n "$LIBSPATIALITE_LIBS"; then -- pkg_cv_LIBSPATIALITE_LIBS="$LIBSPATIALITE_LIBS" -- elif test -n "$PKG_CONFIG"; then -- if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"spatialite\""; } >&5 -- ($PKG_CONFIG --exists --print-errors "spatialite") 2>&5 -- ac_status=$? -- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -- test $ac_status = 0; }; then -- pkg_cv_LIBSPATIALITE_LIBS=`$PKG_CONFIG --libs "spatialite" 2>/dev/null` --else -- pkg_failed=yes --fi -- else -- pkg_failed=untried --fi -- -- -- --if test $pkg_failed = yes; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 --$as_echo "no" >&6; } -- --if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then -- _pkg_short_errors_supported=yes --else -- _pkg_short_errors_supported=no --fi -- if test $_pkg_short_errors_supported = yes; then -- LIBSPATIALITE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "spatialite" 2>&1` -- else -- LIBSPATIALITE_PKG_ERRORS=`$PKG_CONFIG --print-errors "spatialite" 2>&1` -- fi -- # Put the nasty error message in config.log where it belongs -- echo "$LIBSPATIALITE_PKG_ERRORS" >&5 -- -- as_fn_error $? "'libspatialite' is required but it doesn't seem to be installed on this system." "$LINENO" 5 --elif test $pkg_failed = untried; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 --$as_echo "no" >&6; } -- as_fn_error $? "'libspatialite' is required but it doesn't seem to be installed on this system." "$LINENO" 5 --else -- LIBSPATIALITE_CFLAGS=$pkg_cv_LIBSPATIALITE_CFLAGS -- LIBSPATIALITE_LIBS=$pkg_cv_LIBSPATIALITE_LIBS -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 --$as_echo "yes" >&6; } -- --fi -- -- -- --pkg_failed=no - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBFREEXL" >&5 - $as_echo_n "checking for LIBFREEXL... " >&6; } - diff --git a/debian/patches/03-fix_typos.patch b/debian/patches/03-fix_typos.patch deleted file mode 100644 index b95de5c..0000000 --- a/debian/patches/03-fix_typos.patch +++ /dev/null @@ -1,85 +0,0 @@ -From: David Paleino <da...@debian.org> -Subject: fix typos in source code -Origin: vendor -Forwarded: no - ---- - libspatialite/src/spatialite/spatialite.c | 24 ++++++++++++------------ - libspatialite/src/srsinit/srs_init.c | 2 +- - spatialite-tools/exif_loader.c | 4 ++-- - spatialite-tools/spatialite_gml.c | 2 +- - spatialite-tools/spatialite_osm_map.c | 4 ++-- - spatialite-tools/spatialite_osm_net.c | 4 ++-- - spatialite-tools/spatialite_osm_raw.c | 2 +- - 7 files changed, 21 insertions(+), 21 deletions(-) - -Index: spatialite/spatialite-tools/spatialite_gml.c -=================================================================== ---- spatialite.orig/spatialite-tools/spatialite_gml.c 2012-02-17 16:53:36.000000000 +0100 -+++ spatialite/spatialite-tools/spatialite_gml.c 2012-02-22 11:09:03.000000000 +0100 -@@ -1919,7 +1919,7 @@ - ret = sqlite3_backup_finish (backup); - sqlite3_close (handle); - handle = disk_db_handle; -- printf ("\tIN_MEMORY database succesfully exported\n"); -+ printf ("\tIN_MEMORY database successfully exported\n"); - } - - sqlite3_close (handle); -Index: spatialite/spatialite-tools/spatialite_osm_map.c -=================================================================== ---- spatialite.orig/spatialite-tools/spatialite_osm_map.c 2012-02-17 16:53:36.000000000 +0100 -+++ spatialite/spatialite-tools/spatialite_osm_map.c 2012-02-22 11:09:03.000000000 +0100 -@@ -2038,7 +2038,7 @@ - sqlite3_free (sql_err); - return; - } -- printf ("\tAll done: OSM map was succesfully loaded\n"); -+ printf ("\tAll done: OSM map was successfully loaded\n"); - } - - static void -@@ -2870,7 +2870,7 @@ - ret = sqlite3_backup_finish (backup); - sqlite3_close (handle); - handle = disk_db_handle; -- printf ("\tIN_MEMORY database succesfully exported\n"); -+ printf ("\tIN_MEMORY database successfully exported\n"); - } - - /* VACUUMing */ -Index: spatialite/spatialite-tools/spatialite_osm_net.c -=================================================================== ---- spatialite.orig/spatialite-tools/spatialite_osm_net.c 2011-10-27 12:17:39.000000000 +0200 -+++ spatialite/spatialite-tools/spatialite_osm_net.c 2012-02-22 11:09:03.000000000 +0100 -@@ -2030,7 +2030,7 @@ - sqlite3_free (sql_err); - return; - } -- printf ("\tAll done: OSM graph was succesfully loaded\n"); -+ printf ("\tAll done: OSM graph was successfully loaded\n"); - } - - static void -@@ -2644,7 +2644,7 @@ - ret = sqlite3_backup_finish (backup); - sqlite3_close (handle); - handle = disk_handle; -- printf ("\tIN_MEMORY database succesfully exported\n"); -+ printf ("\tIN_MEMORY database successfully exported\n"); - } - /* VACUUMing */ - db_vacuum (handle); -Index: spatialite/spatialite-tools/spatialite_osm_raw.c -=================================================================== ---- spatialite.orig/spatialite-tools/spatialite_osm_raw.c 2012-02-17 16:53:36.000000000 +0100 -+++ spatialite/spatialite-tools/spatialite_osm_raw.c 2012-02-22 11:09:03.000000000 +0100 -@@ -1649,7 +1649,7 @@ - ret = sqlite3_backup_finish (backup); - sqlite3_close (handle); - handle = disk_db_handle; -- printf ("\tIN_MEMORY database succesfully exported\n"); -+ printf ("\tIN_MEMORY database successfully exported\n"); - } - - /* closing the DB connection */ diff --git a/debian/patches/06-fix_soname.patch b/debian/patches/06-fix_soname.patch new file mode 100644 index 0000000..58756b4 --- /dev/null +++ b/debian/patches/06-fix_soname.patch @@ -0,0 +1,31 @@ +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 @@ + + + if MINGW +-libspatialite_la_LDFLAGS = -version-info 4:0:2 -no-undefined ++libspatialite_la_LDFLAGS = -version-info 4:0:1 -no-undefined + else +-libspatialite_la_LDFLAGS = -version-info 4:0:2 ++libspatialite_la_LDFLAGS = -version-info 4:0:1 + 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/libsplite.la ./shapefiles/libshapefiles.la \ + ./srsinit/libsrsinit.la ./virtualtext/libvirtualtext.la \ + $(am__append_1) +-@MINGW_FALSE@libspatialite_la_LDFLAGS = -version-info 4:0:2 +-@MINGW_TRUE@libspatialite_la_LDFLAGS = -version-info 4:0:2 -no-undefined ++@MINGW_FALSE@libspatialite_la_LDFLAGS = -version-info 4:0:1 ++@MINGW_TRUE@libspatialite_la_LDFLAGS = -version-info 4:0:1 -no-undefined + MOSTLYCLEANFILES = *.gcna *.gcno *.gcda + all: all-recursive + diff --git a/debian/patches/series b/debian/patches/series index ecda345..587abf4 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,4 @@ 00-add_automake_foreign.patch 04-fix_missing_define.patch 05-dont_relink.patch +06-fix_soname.patch -- geospatial extension for SQLite _______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel