[liblas] 04/23: Add patch to fix the library version and SONAME.

Bas Couwenberg sebastic at xs4all.nl
Sat Feb 8 01:30:44 UTC 2014


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

sebastic-guest pushed a commit to branch master
in repository liblas.

commit 9bf3ef806126c7b2372ea34e593ed7bcde026cc1
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Jan 31 05:31:38 2014 +0100

    Add patch to fix the library version and SONAME.
---
 debian/changelog         |  1 +
 debian/liblas-c2.install |  2 +-
 debian/liblas-c2.links   |  1 -
 debian/liblas2.install   |  2 +-
 debian/liblas2.links     |  1 -
 debian/patches/series    |  1 +
 debian/patches/soversion | 37 +++++++++++++++++++++++++++++++++++++
 7 files changed, 41 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9100381..e153398 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ liblas (1.7.0+dfsg-3) UNRELEASED; urgency=low
   * Refresh boost patch.
   * Also build python extension, replaces separate source package.
   * Remove obsolete liblas1.install.
+  * Add patch to fix the library version and SONAME.
 
  -- Bas Couwenberg <sebastic at xs4all.nl>  Fri, 31 Jan 2014 01:37:27 +0100
 
diff --git a/debian/liblas-c2.install b/debian/liblas-c2.install
index c24dc37..42c6f45 100644
--- a/debian/liblas-c2.install
+++ b/debian/liblas-c2.install
@@ -1 +1 @@
-usr/lib/liblas_c.so.2.*
+usr/lib/liblas_c.so.*
diff --git a/debian/liblas-c2.links b/debian/liblas-c2.links
deleted file mode 100644
index 24d83a3..0000000
--- a/debian/liblas-c2.links
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/liblas_c.so.2.*	usr/lib/liblas_c.so.2
diff --git a/debian/liblas2.install b/debian/liblas2.install
index 73705d1..9aa9c36 100644
--- a/debian/liblas2.install
+++ b/debian/liblas2.install
@@ -1 +1 @@
-usr/lib/liblas.so.2.*
+usr/lib/liblas.so.*
diff --git a/debian/liblas2.links b/debian/liblas2.links
deleted file mode 100644
index 614d502..0000000
--- a/debian/liblas2.links
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/liblas.so.2.*	usr/lib/liblas.so.2
diff --git a/debian/patches/series b/debian/patches/series
index d579dbe..7bc74a3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 boost
+soversion
diff --git a/debian/patches/soversion b/debian/patches/soversion
new file mode 100644
index 0000000..6906b7c
--- /dev/null
+++ b/debian/patches/soversion
@@ -0,0 +1,37 @@
+Description: Use 3 digit VERSION and single digit SOVERSION.
+Author: Bas Couwenberg <sebastic at xs4all.nl>
+Bug: https://github.com/libLAS/libLAS/pull/30
+Last-Update: 2014-02-02
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -13,8 +13,10 @@ SET(LIBLAS_VERSION_MAJOR "1")
+ SET(LIBLAS_VERSION_MINOR "7")
+ SET(LIBLAS_VERSION_PATCH "0")
+ set(VERSION "${LIBLAS_VERSION_MAJOR}.${LIBLAS_VERSION_MINOR}.${LIBLAS_VERSION_PATCH}")
+-SET(LIBLAS_LIB_SOVERSION "2.2.0")
+-SET(LIBLAS_C_LIB_SOVERSION "2.2.0")
++SET(LIBLAS_LIB_VERSION "2.2.0")
++SET(LIBLAS_LIB_SOVERSION "2")
++SET(LIBLAS_C_LIB_VERSION "2.2.0")
++SET(LIBLAS_C_LIB_SOVERSION "2")
+ SET(OSGEO4W_UPSTREAM_RELEASE "1")
+ 
+ if(WIN32)
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -239,9 +239,13 @@ target_link_libraries(${LIBLAS_C_LIB_NAM
+   ${Boost_LIBRARIES})
+ 
+ set_target_properties(${LIBLAS_LIB_NAME}
+-  PROPERTIES SOVERSION "${LIBLAS_LIB_SOVERSION}" )
++  PROPERTIES
++  VERSION "${LIBLAS_LIB_VERSION}"
++  SOVERSION "${LIBLAS_LIB_SOVERSION}")
+ set_target_properties(${LIBLAS_C_LIB_NAME}
+-  PROPERTIES SOVERSION "${LIBLAS_C_LIB_SOVERSION}" )
++  PROPERTIES
++  VERSION "${LIBLAS_C_LIB_VERSION}"
++  SOVERSION "${LIBLAS_C_LIB_SOVERSION}")
+ 
+ if (APPLE)
+   set_target_properties(

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



More information about the Pkg-grass-devel mailing list