[spatialite] 10/20: Bump SOVERSION to reflect added and removed symbols.

Bas Couwenberg sebastic at xs4all.nl
Sun Aug 3 21:55:09 UTC 2014


This is an automated email from the git hooks/post-receive script.

sebastic-guest pushed a commit to branch experimental
in repository spatialite.

commit bed66f9cb1f9a2d5dafa4423e4eac8495d57d370
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sun Jun 1 19:54:12 2014 +0200

    Bump SOVERSION to reflect added and removed symbols.
---
 debian/changelog                                   |  1 +
 debian/control                                     | 10 +++---
 ...patialite5.examples => libspatialite7.examples} |  0
 ...bspatialite5.install => libspatialite7.install} |  0
 ...bspatialite5.symbols => libspatialite7.symbols} |  2 +-
 debian/patches/02-fix_version-info.patch           | 42 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 debian/rules                                       |  2 +-
 8 files changed, 51 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d92c08e..7026257 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ spatialite (4.2.0~rc1-1) UNRELEASED; urgency=low
   * Drop --enable-libxml2, libxml2 support is enabled by default now.
   * Add patch to fix 'successfully' typo.
   * Add mod-spatialite package for the loadable extension module.
+  * Bump SOVERSION to reflect added and removed symbols.
 
  -- Bas Couwenberg <sebastic at xs4all.nl>  Sun, 01 Jun 2014 14:15:51 +0200
 
diff --git a/debian/control b/debian/control
index d8e2d68..425100e 100644
--- a/debian/control
+++ b/debian/control
@@ -22,7 +22,7 @@ Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-grass/spatialite.git
 Vcs-Git: git://anonscm.debian.org/pkg-grass/spatialite.git
 Homepage: https://www.gaia-gis.it/fossil/libspatialite
 
-Package: libspatialite5
+Package: libspatialite7
 Architecture: any
 Multi-Arch: same
 Section: libs
@@ -43,7 +43,7 @@ Package: libspatialite-dev
 Architecture: any
 Multi-Arch: same
 Section: libdevel
-Depends: libspatialite5 (= ${binary:Version}),
+Depends: libspatialite7 (= ${binary:Version}),
          libsqlite3-dev,
          ${misc:Depends}
 Recommends: pkg-config
@@ -56,12 +56,12 @@ Description: Geospatial extension for SQLite - development files
  .
  This package contains development files (static libraries and header files).
 
-Package: libspatialite5-dbg
+Package: libspatialite7-dbg
 Architecture: any
 Multi-Arch: same
 Section: debug
 Priority: extra
-Depends: libspatialite5 (= ${binary:Version}),
+Depends: libspatialite7 (= ${binary:Version}),
          ${misc:Depends}
 Description: Geospatial extension for SQLite - debugging symbols
  The SpatiaLite extension enables SQLite to support spatial (geometry) data
@@ -72,7 +72,7 @@ Description: Geospatial extension for SQLite - debugging symbols
  .
  This package contains debugging symbols for the libraries.
 
-Package: mod-spatialite5
+Package: mod-spatialite7
 Architecture: any
 Multi-Arch: same
 Section: libs
diff --git a/debian/libspatialite5.examples b/debian/libspatialite7.examples
similarity index 100%
rename from debian/libspatialite5.examples
rename to debian/libspatialite7.examples
diff --git a/debian/libspatialite5.install b/debian/libspatialite7.install
similarity index 100%
rename from debian/libspatialite5.install
rename to debian/libspatialite7.install
diff --git a/debian/libspatialite5.symbols b/debian/libspatialite7.symbols
similarity index 99%
rename from debian/libspatialite5.symbols
rename to debian/libspatialite7.symbols
index f180c17..a3e6c31 100644
--- a/debian/libspatialite5.symbols
+++ b/debian/libspatialite7.symbols
@@ -1,4 +1,4 @@
-libspatialite.so.5 libspatialite5 #MINVER#
+libspatialite.so.7 libspatialite7 #MINVER#
 #MISSING: 4.1.0# EwktLval at Base 3.0.0
  Ewkt_create_buffer at Base 3.0.0
  Ewkt_delete_buffer at Base 3.0.0
diff --git a/debian/patches/02-fix_version-info.patch b/debian/patches/02-fix_version-info.patch
new file mode 100644
index 0000000..3305e54
--- /dev/null
+++ b/debian/patches/02-fix_version-info.patch
@@ -0,0 +1,42 @@
+Description: Fix libtool version-info to reflect added and removed symbols in SONAME.
+Author: Bas Couwenberg <sebastic at xs4all.nl>
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -41,7 +41,7 @@ if ANDROID
+ libspatialite_la_LDFLAGS = -version-info 6:0:2
+ libspatialite_la_LIBADD += -ldl
+ else
+-libspatialite_la_LDFLAGS = -version-info 6:0:2
++libspatialite_la_LDFLAGS = -version-info 7:0:0
+ libspatialite_la_LIBADD += -lpthread -ldl
+ endif
+ endif
+@@ -73,7 +73,7 @@ if ANDROID
+ mod_spatialite_la_LDFLAGS = -module -version-info 6:0:2
+ mod_spatialite_la_LIBADD += -ldl
+ else
+-mod_spatialite_la_LDFLAGS = -module -version-info 6:0:2
++mod_spatialite_la_LDFLAGS = -module -version-info 7:0:0
+ mod_spatialite_la_LIBADD += -lpthread -ldl
+ endif
+ endif
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -415,7 +415,7 @@ libspatialite_la_LIBADD = ./gaiaaux/libg
+ 	./connection_cache/libconnection_cache.la \
+ 	./virtualtext/libvirtualtext.la ./wfs/libwfs.la @LIBXML2_LIBS@ \
+ 	$(am__append_1) $(am__append_2)
+- at ANDROID_FALSE@@MINGW_FALSE at libspatialite_la_LDFLAGS = -version-info 6:0:2
++ at ANDROID_FALSE@@MINGW_FALSE at libspatialite_la_LDFLAGS = -version-info 7:0:0
+ @ANDROID_TRUE@@MINGW_FALSE at libspatialite_la_LDFLAGS = -version-info 6:0:2
+ @MINGW_TRUE at libspatialite_la_LDFLAGS = -version-info 4:2:0 -no-undefined
+ mod_spatialite_la_SOURCES = versioninfo/version.c
+@@ -429,7 +429,7 @@ mod_spatialite_la_LIBADD = ./gaiaaux/gai
+ mod_spatialite_la_CPPFLAGS = @CFLAGS@ -I$(top_srcdir)/src/headers -I. \
+ 	-DLOADABLE_EXTENSION
+ mod_spatialite_la_LIBTOOLFLAGS = --tag=disable-static
+- at ANDROID_FALSE@@MINGW_FALSE at mod_spatialite_la_LDFLAGS = -module -version-info 6:0:2
++ at ANDROID_FALSE@@MINGW_FALSE at mod_spatialite_la_LDFLAGS = -module -version-info 7:0:0
+ @ANDROID_TRUE@@MINGW_FALSE at mod_spatialite_la_LDFLAGS = -module -version-info 6:0:2
+ @MINGW_TRUE at mod_spatialite_la_LDFLAGS = -module -avoid-version -no-undefined
+ MOSTLYCLEANFILES = *.gcna *.gcno *.gcda
diff --git a/debian/patches/series b/debian/patches/series
index f5bad46..8d4ab73 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,5 @@
 00-add_automake_foreign.patch
+02-fix_version-info.patch
 07-fix_spatialite_pc.patch
 10-automake-subdir-objects.patch
 11-link-libxml2.patch
diff --git a/debian/rules b/debian/rules
index 5575590..9d44a3b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -59,7 +59,7 @@ override_dh_shlibdeps:
 	dh_shlibdeps -l/usr/lib:$(CURDIR)/debian/tmp/usr/lib
 
 override_dh_strip:
-	dh_strip --dbg-package=libspatialite5-dbg
+	dh_strip --dbg-package=libspatialite7-dbg
 
 override_dh_install:
 	dh_install --list-missing

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/spatialite.git



More information about the Pkg-grass-devel mailing list