[libspatialindex] 03/07: Add patch to fix VERSION and SOVERSION for CMake build.

[Bas Couwenberg]

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

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

commit 8fa43ecf957740c868fb742781131404364f871b
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Mon Sep 29 23:12:18 2014 +0200

    Add patch to fix VERSION and SOVERSION for CMake build.
---
 debian/changelog               |  6 ++---
 debian/patches/soversion.patch | 51 +++---------------------------------------
 2 files changed, 6 insertions(+), 51 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5911721..7aeb80a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,12 @@
-spatialindex (1.8.3-1) UNRELEASED; urgency=medium
+spatialindex (1.8.4-1) UNRELEASED; urgency=medium
 
   * New upstream release.
   * Refresh patches.
-  * Add patch to bump SOVERSION to 4 because of removed symbols.
+  * Add patch to fix VERSION and SOVERSION for CMake build.
   * Update package names for SONAME bump.
   * Update symbols for amd64.
 
- -- Bas Couwenberg <sebastic at xs4all.nl>  Sun, 28 Sep 2014 15:52:50 +0200
+ -- Bas Couwenberg <sebastic at xs4all.nl>  Mon, 29 Sep 2014 23:00:48 +0200
 
 spatialindex (1.8.1-3) unstable; urgency=medium
 
diff --git a/debian/patches/soversion.patch b/debian/patches/soversion.patch
index 0c3a417..2b8489f 100644
--- a/debian/patches/soversion.patch
+++ b/debian/patches/soversion.patch
@@ -19,55 +19,10 @@ Forwarded: https://github.com/libspatialindex/libspatialindex/pull/44
 @@ -28,7 +28,8 @@ endif()
  SET(SIDX_VERSION_MAJOR "1")
  SET(SIDX_VERSION_MINOR "8")
- SET(SIDX_VERSION_PATCH "3")
--SET(SIDX_LIB_SOVERSION "3.2.0")
-+SET(SIDX_LIB_VERSION "3.2.0")
+ SET(SIDX_VERSION_PATCH "4")
+-SET(SIDX_LIB_SOVERSION "4.0.0")
++SET(SIDX_LIB_VERSION "4.0.0")
 +SET(SIDX_LIB_SOVERSION "4")
  
  
  set(SIDX_VERSION_STRING "${SIDX_VERSION_MAJOR}.${SIDX_VERSION_MINOR}.${SIDX_VERSION_PATCH}")
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -205,10 +205,14 @@ target_link_libraries(${SIDX_C_LIB_NAME}
- 
- 
- set_target_properties(${SIDX_LIB_NAME}
--  PROPERTIES SOVERSION "${SIDX_LIB_SOVERSION}" )
-+  PROPERTIES
-+  VERSION "${SIDX_LIB_VERSION}"
-+  SOVERSION "${SIDX_LIB_SOVERSION}" )
- 
- set_target_properties(${SIDX_C_LIB_NAME} 
--  PROPERTIES SOVERSION "${SIDX_LIB_SOVERSION}" )
-+  PROPERTIES
-+  VERSION "${SIDX_LIB_VERSION}"
-+  SOVERSION "${SIDX_LIB_SOVERSION}" )
- 
- 
- 
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -17,8 +17,8 @@ libspatialindex_c_la_LIBADD = \
- 	libspatialindex.la \
- 	src/capi/libsidxc.la
- 
--libspatialindex_la_LDFLAGS = -version-info 3:2:0 -no-undefined -lstdc++
--libspatialindex_c_la_LDFLAGS = -version-info 3:2:0 -no-undefined -lstdc++
-+libspatialindex_la_LDFLAGS = -version-info 4:0:0 -no-undefined -lstdc++
-+libspatialindex_c_la_LDFLAGS = -version-info 4:0:0 -no-undefined -lstdc++
- 
- EXTRA_DIST = INSTALL.WIN \
-              spatialindex.sln \
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -398,8 +398,8 @@ libspatialindex_c_la_LIBADD = \
- 	libspatialindex.la \
- 	src/capi/libsidxc.la
- 
--libspatialindex_la_LDFLAGS = -version-info 3:2:0 -no-undefined -lstdc++
--libspatialindex_c_la_LDFLAGS = -version-info 3:2:0 -no-undefined -lstdc++
-+libspatialindex_la_LDFLAGS = -version-info 4:0:0 -no-undefined -lstdc++
-+libspatialindex_c_la_LDFLAGS = -version-info 4:0:0 -no-undefined -lstdc++
- EXTRA_DIST = INSTALL.WIN \
-              spatialindex.sln \
-              spatialindex-vc/spatialindex.vcproj \

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