[odb-api] 18/21: add versioning to shared libs

Alastair McKinstry mckinstry at moszumanska.debian.org
Wed Aug 30 06:42:57 UTC 2017


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

mckinstry pushed a commit to branch debian/master
in repository odb-api.

commit 494397dcb9715992ce473dbe0a8bc77a8c78c90f
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Tue Aug 29 18:18:37 2017 +0100

    add versioning to shared libs
---
 debian/libodb-api-0.install.in  |   2 +-
 debian/libodb-api-dev.links.in  |  15 ++++
 debian/patches/shared_lib.patch | 166 +++++++++++++++++++++++++++++++++++++++-
 debian/rules                    |   2 +-
 4 files changed, 182 insertions(+), 3 deletions(-)

diff --git a/debian/libodb-api-0.install.in b/debian/libodb-api-0.install.in
index 6604868..f235a3f 100644
--- a/debian/libodb-api-0.install.in
+++ b/debian/libodb-api-0.install.in
@@ -1 +1 @@
-usr/lib/*.so	/usr/lib/@ARCH@/
+usr/lib/*.so.* /usr/lib/@ARCH@/
diff --git a/debian/libodb-api-dev.links.in b/debian/libodb-api-dev.links.in
new file mode 100644
index 0000000..12d59b7
--- /dev/null
+++ b/debian/libodb-api-dev.links.in
@@ -0,0 +1,15 @@
+/usr/lib/@ARCH@/libeckit_cmd.so.0d /usr/lib/@ARCH@/libeckit_cmd.so
+/usr/lib/@ARCH@/libeckit_geometry.so.0d /usr/lib/@ARCH@/libeckit_geometry.so
+/usr/lib/@ARCH@/libeckit_linalg.so.0d /usr/lib/@ARCH@/libeckit_linalg.so
+/usr/lib/@ARCH@/libeckit_mpi.so.0d /usr/lib/@ARCH@/libeckit_mpi.so
+/usr/lib/@ARCH@/libeckit_option.so.0d /usr/lib/@ARCH@/libeckit_option.so
+/usr/lib/@ARCH@/libeckit.so.0d /usr/lib/@ARCH@/libeckit.so
+/usr/lib/@ARCH@/libeckit_testing.so.0d /usr/lib/@ARCH@/libeckit_testing.so
+/usr/lib/@ARCH@/libeckit_web.so.0d /usr/lib/@ARCH@/libeckit_web.so
+/usr/lib/@ARCH@/libecml.so.0d /usr/lib/@ARCH@/libecml.so
+/usr/lib/@ARCH@/libmetkit.so.0d /usr/lib/@ARCH@/libmetkit.so
+/usr/lib/@ARCH@/libOdb2Netcdf.so.0d /usr/lib/@ARCH@/libOdb2Netcdf.so
+/usr/lib/@ARCH@/libOdb_fortran.so.0d /usr/lib/@ARCH@/libOdb_fortran.so
+/usr/lib/@ARCH@/libOdb.so.0d /usr/lib/@ARCH@/libOdb.so
+/usr/lib/@ARCH@/libodbtest.so.0d /usr/lib/@ARCH@/libodbtest.so
+/usr/lib/@ARCH@/libodbtools.so.0d /usr/lib/@ARCH@/libodbtools.so
\ No newline at end of file
diff --git a/debian/patches/shared_lib.patch b/debian/patches/shared_lib.patch
index 275c72b..6afa1b4 100644
--- a/debian/patches/shared_lib.patch
+++ b/debian/patches/shared_lib.patch
@@ -1,3 +1,8 @@
+Description: Add versioing to the shared libraries
+Author: Alastair McKinstry <mckinstry at debian.org>
+Last-Updated: 2017-08-29
+Forwarded: no
+
 Index: odb-api-0.17.1/odb_api/src/ecml/CMakeLists.txt
 ===================================================================
 --- odb-api-0.17.1.orig/odb_api/src/ecml/CMakeLists.txt
@@ -6,7 +11,166 @@ Index: odb-api-0.17.1/odb_api/src/ecml/CMakeLists.txt
                       INSTALL_HEADERS    LISTED
                       HEADER_DESTINATION ${INSTALL_INCLUDE_DIR}/ecml
                       SOURCES            ${ecml_srcs}
-+		     VERSION            0
++		     VERSION            0d
                       LIBS               eckit 
                                          eckit_cmd # for UserInput
                                          metkit
+Index: odb-api-0.17.1/eckit/src/eckit/cmd/CMakeLists.txt
+===================================================================
+--- odb-api-0.17.1.orig/eckit/src/eckit/cmd/CMakeLists.txt
++++ odb-api-0.17.1/eckit/src/eckit/cmd/CMakeLists.txt
+@@ -74,5 +74,6 @@ ecbuild_add_library( TARGET
+                      INSTALL_HEADERS    LISTED
+                      SOURCES            ${eckit_cmd_srcs}
+                      HEADER_DESTINATION ${INSTALL_INCLUDE_DIR}/eckit/cmd
++		     VERSION            0d
+                      INCLUDES           ${CURSES_INCLUDE_DIR}
+                      LIBS               eckit ${CURSES_LIBRARIES} )
+Index: odb-api-0.17.1/eckit/src/eckit/geometry/CMakeLists.txt
+===================================================================
+--- odb-api-0.17.1.orig/eckit/src/eckit/geometry/CMakeLists.txt
++++ odb-api-0.17.1/eckit/src/eckit/geometry/CMakeLists.txt
+@@ -11,7 +11,8 @@ ecbuild_add_library(TARGET eckit_geometr
+ 					HEADER_DESTINATION
+ 						${INSTALL_INCLUDE_DIR}/eckit/geometry
+ 					SOURCES
+-						${eckit_geometry_srcs}
++					${eckit_geometry_srcs}
++					VERSION 0d
+ 					LIBS
+ 						eckit  )
+ 
+Index: odb-api-0.17.1/eckit/src/eckit/linalg/CMakeLists.txt
+===================================================================
+--- odb-api-0.17.1.orig/eckit/src/eckit/linalg/CMakeLists.txt
++++ odb-api-0.17.1/eckit/src/eckit/linalg/CMakeLists.txt
+@@ -27,6 +27,7 @@ ecbuild_add_library( TARGET
+                      INSTALL_HEADERS    ALL
+                      HEADER_DESTINATION ${INSTALL_INCLUDE_DIR}/eckit/linalg
+                      SOURCES            ${eckit_la_srcs}
++		     VERSION            0d
+                      INCLUDES           "${ARMADILLO_INCLUDE_DIRS}"
+                                         "${CUDA_INCLUDE_DIRS}"
+                                         "${MKL_INCLUDE_DIRS}"
+Index: odb-api-0.17.1/eckit/src/eckit/maths/CMakeLists.txt
+===================================================================
+--- odb-api-0.17.1.orig/eckit/src/eckit/maths/CMakeLists.txt
++++ odb-api-0.17.1/eckit/src/eckit/maths/CMakeLists.txt
+@@ -11,5 +11,6 @@ ecbuild_add_library( TARGET
+                      INSTALL_HEADERS     ALL
+                      HEADER_DESTINATION  ${INSTALL_INCLUDE_DIR}/eckit/maths
+                      SOURCES             ${eckit_maths_lib_srcs}
++		     VERSION             0d
+                      INCLUDES            "${EIGEN3_INCLUDE_DIR}"
+                      LIBS                eckit "${LAPACK_LIBRARIES}" "${BLAS_LIBRARIES}" )
+Index: odb-api-0.17.1/eckit/src/eckit/mpi/CMakeLists.txt
+===================================================================
+--- odb-api-0.17.1.orig/eckit/src/eckit/mpi/CMakeLists.txt
++++ odb-api-0.17.1/eckit/src/eckit/mpi/CMakeLists.txt
+@@ -40,7 +40,8 @@ ecbuild_add_library(TARGET eckit_mpi
+                     HEADER_DESTINATION
+                         ${INSTALL_INCLUDE_DIR}/eckit/mpi
+                     SOURCES
+-                        ${eckit_mpi_srcs}
++                    ${eckit_mpi_srcs}
++		    VERSION 0d
+                     DEFINITIONS
+                         "${eckit_mpi_defs}"
+                     INCLUDES
+Index: odb-api-0.17.1/eckit/src/eckit/option/CMakeLists.txt
+===================================================================
+--- odb-api-0.17.1.orig/eckit/src/eckit/option/CMakeLists.txt
++++ odb-api-0.17.1/eckit/src/eckit/option/CMakeLists.txt
+@@ -20,6 +20,8 @@ ecbuild_add_library(
+         CmdArgs.cc
+         CmdArgs.h
+ 
++    VERSION
++	0d
+     TEMPLATES
+         FactoryOption.cc
+         VectorOption.cc
+Index: odb-api-0.17.1/eckit/src/eckit/web/CMakeLists.txt
+===================================================================
+--- odb-api-0.17.1.orig/eckit/src/eckit/web/CMakeLists.txt
++++ odb-api-0.17.1/eckit/src/eckit/web/CMakeLists.txt
+@@ -41,7 +41,8 @@ Url.h )
+ ecbuild_add_library( TARGET eckit_web
+ 					 INSTALL_HEADERS LISTED
+ 					 SOURCES
+-						${eckit_web_srcs}
++					 ${eckit_web_srcs}
++					 VERSION 0d
+ 					 PERSISTENT
+ 						HtmlObject.h
+ 					 HEADER_DESTINATION
+Index: odb-api-0.17.1/eckit/src/experimental/eckit/testing/CMakeLists.txt
+===================================================================
+--- odb-api-0.17.1.orig/eckit/src/experimental/eckit/testing/CMakeLists.txt
++++ odb-api-0.17.1/eckit/src/experimental/eckit/testing/CMakeLists.txt
+@@ -6,6 +6,7 @@ UnitTest.cc
+ ecbuild_add_library(TARGET eckit_testing
+ 					INSTALL_HEADERS ALL
+ 					SOURCES ${eckit_testing_srcs}
++					VERSION 0d
+ 					HEADER_DESTINATION ${INSTALL_INCLUDE_DIR}/eckit/testing
+ 					LIBS eckit )
+ 
+Index: odb-api-0.17.1/metkit/src/metkit/CMakeLists.txt
+===================================================================
+--- odb-api-0.17.1.orig/metkit/src/metkit/CMakeLists.txt
++++ odb-api-0.17.1/metkit/src/metkit/CMakeLists.txt
+@@ -113,6 +113,8 @@ ecbuild_add_library(
+     SOURCES
+         ${metkit_srcs}
+ 
++	VERSION
++	0d
+     PRIVATE_INCLUDES
+         ${ECKIT_INCLUDE_DIRS}
+         ${GRIB_API_INCLUDE_DIRS}
+Index: odb-api-0.17.1/odb_api/src/fortran/CMakeLists.txt
+===================================================================
+--- odb-api-0.17.1.orig/odb_api/src/fortran/CMakeLists.txt
++++ odb-api-0.17.1/odb_api/src/fortran/CMakeLists.txt
+@@ -12,7 +12,7 @@ ecbuild_add_library(TARGET		Odb_fortran
+                                 # Legacy:
+ 
+                                 odb_c_binding.f90
+-
++		    VERSION 0d
+                     LIBS		Odb )
+ 
+ set( test_environment_fortran
+Index: odb-api-0.17.1/odb_api/src/odb_api/CMakeLists.txt
+===================================================================
+--- odb-api-0.17.1.orig/odb_api/src/odb_api/CMakeLists.txt
++++ odb-api-0.17.1/odb_api/src/odb_api/CMakeLists.txt
+@@ -467,6 +467,7 @@ ecbuild_add_library( TARGET
+                      HEADER_DESTINATION ${INSTALL_INCLUDE_DIR}/odb_api
+                      COMPONENT          server
+                      SOURCES            ${odblib_src_files}
++		     VERSION            0d
+                      GENERATED          ODBAPIVersionSHA1.cc
+                      TEMPLATES          ${odblib_templates}
+                      LINKER_LANGUAGE    CXX
+Index: odb-api-0.17.1/odb_api/src/odb_api/tools/CMakeLists.txt
+===================================================================
+--- odb-api-0.17.1.orig/odb_api/src/odb_api/tools/CMakeLists.txt
++++ odb-api-0.17.1/odb_api/src/odb_api/tools/CMakeLists.txt
+@@ -128,6 +128,7 @@ ecbuild_add_library( TARGET     odbtools
+                      INSTALL_HEADERS LISTED
+                      HEADER_DESTINATION ${INSTALL_INCLUDE_DIR}/odb_api/tools
+                      SOURCES    ${odbtools_src_files}
++		     VERSION    0d
+                      TEMPLATES  ${odbtools_templates}
+                      LIBS       Odb )
+ 
+@@ -135,6 +136,7 @@ ecbuild_add_library( TARGET     odbtest
+                      #INSTALL_HEADERS LISTED
+                      #HEADER_DESTINATION ${INSTALL_INCLUDE_DIR}/odb_api/tools
+                      SOURCES    ${odbtest_src_files}
++		     VERSION    0d
+                      TEMPLATES  ${odbtest_templates}
+                      LIBS       Odb odbtools )
+ 
diff --git a/debian/rules b/debian/rules
index cfac635..244bc3e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,7 +10,7 @@
 DESTDIR:=$(shell pwd)/debian/tmp
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 ARCH:=$(shell dpkg --print-architecture)
-AUTOGENERATED:= libodb-api-0.install libodb-api-dev.install
+AUTOGENERATED:= libodb-api-0.install libodb-api-dev.install libodb-api-dev.links
 LIBDIR:=/usr/lib/${DEB_HOST_MULTIARCH}
 
 CMAKE_CFLAGS:= \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/odb-api.git



More information about the debian-science-commits mailing list