[deal.ii] 06/08: Rename the shared libraries to libdeal.ii[.g].so, patch cleanup

[Matthias Maier]

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

tamiko-guest pushed a commit to branch master
in repository deal.ii.

commit 99dd6fc3ff435da58d5a3f1ad2a0c9ebbd4d2a15
Author: Matthias Maier <tamiko at kyomu.43-1.org>
Date:   Sat Mar 1 19:16:49 2014 +0100

    Rename the shared libraries to libdeal.ii[.g].so, patch cleanup
    
      - Rename the shared libraries to libdeal.ii[.g].so
      - Ensure that the SONAME is libdeal.ii[.g].so-$(VERSION)
      - Reorganize patches
---
 debian/libdeal.ii-8.1.0.install                          |  4 ++--
 debian/libdeal.ii-dev.install                            |  4 ++--
 .../patches/{fix_suitesparse => fix_suitesparse.patch}   |  0
 debian/patches/series                                    |  3 ++-
 debian/patches/soversion_version_with_dash.patch         | 16 ++++++++++++++++
 debian/rules                                             |  1 +
 6 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/debian/libdeal.ii-8.1.0.install b/debian/libdeal.ii-8.1.0.install
index 23f2b72..6b5a7f4 100644
--- a/debian/libdeal.ii-8.1.0.install
+++ b/debian/libdeal.ii-8.1.0.install
@@ -1,2 +1,2 @@
-usr/lib/*/libdeal_II.so.*
-usr/lib/*/libdeal_II.g.so.*
+usr/lib/*/libdeal.ii.so.*
+usr/lib/*/libdeal.ii.g.so.*
diff --git a/debian/libdeal.ii-dev.install b/debian/libdeal.ii-dev.install
index 76a22be..d8ee0f0 100644
--- a/debian/libdeal.ii-dev.install
+++ b/debian/libdeal.ii-dev.install
@@ -1,5 +1,5 @@
 usr/include
-usr/lib/*/libdeal_II.so
-usr/lib/*/libdeal_II.g.so
+usr/lib/*/libdeal.ii.so
+usr/lib/*/libdeal.ii.g.so
 usr/share/deal.ii
 usr/share/cmake
diff --git a/debian/patches/fix_suitesparse b/debian/patches/fix_suitesparse.patch
similarity index 100%
rename from debian/patches/fix_suitesparse
rename to debian/patches/fix_suitesparse.patch
diff --git a/debian/patches/series b/debian/patches/series
index 9d01cb2..38b28f9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
-fix_suitesparse
+fix_suitesparse.patch
+soversion_version_with_dash.patch
diff --git a/debian/patches/soversion_version_with_dash.patch b/debian/patches/soversion_version_with_dash.patch
new file mode 100644
index 0000000..e185f59
--- /dev/null
+++ b/debian/patches/soversion_version_with_dash.patch
@@ -0,0 +1,16 @@
+Description: Append version to SOVERSION with a dash
+ Apply the version number to the basename with a leading '-' in order to
+ comply with SOVERSION best practices
+Author: Matthias Maier <tamiko+DEBIAN at kyomu.43-1.org>
+
+--- deal.ii-8.1.0.orig/source/CMakeLists.txt
++++ deal.ii-8.1.0/source/CMakeLists.txt
+@@ -80,7 +80,7 @@ FOREACH(build ${DEAL_II_BUILD_TYPES})
+     # No point to wrack one's brain over the question whether a new version of
+     # a C++ library is still ABI backwards compatible :-]
+     #
+-    SOVERSION "${DEAL_II_PACKAGE_VERSION}"
++    SOVERSION "-${DEAL_II_PACKAGE_VERSION}"
+     LINK_FLAGS "${DEAL_II_LINKER_FLAGS} ${DEAL_II_LINKER_FLAGS_${build}}"
+     COMPILE_DEFINITIONS "${DEAL_II_DEFINITIONS};${DEAL_II_DEFINITIONS_${build}}"
+     COMPILE_FLAGS "${DEAL_II_CXX_FLAGS_${build}}"
diff --git a/debian/rules b/debian/rules
index ce8b7fd..ed316f7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,6 +19,7 @@ override_dh_auto_configure:
 	-DDEAL_II_WITH_UMFPACK=ON \
 	-DDEAL_II_WITH_ZLIB=ON \
 	-DCMAKE_INSTALL_RPATH_USE_LINK_PATH=OFF \
+	-DDEAL_II_BASE_NAME="deal.ii" \
 	-DDEAL_II_CMAKE_MACROS_RELDIR=share/deal.ii/cmake/macros \
 	-DDEAL_II_DOCHTML_RELDIR=share/doc/libdeal.ii-doc/html \
 	-DDEAL_II_DOCREADME_RELDIR=share/doc/libdeal.ii-doc \

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