[dune-common] 01/03: Move shared library into -dev package

[Ansgar Burchardt]

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

ansgar pushed a commit to annotated tag debian/2.4.20150825rc2-1
in repository dune-common.

commit db46c04c0a1492f9abe4d0f482502ff19364c5a5
Author: Ansgar Burchardt <ansgar at debian.org>
Date:   Thu Sep 3 13:39:53 2015 +0200

    Move shared library into -dev package
    
    Reference: https://lists.debian.org/debian-devel/2015/07/msg00115.html
---
 debian/control                                 | 18 +++---------------
 debian/dune-debian.mk                          |  9 +++++++++
 debian/libdune-common-2.4git.install           |  1 -
 debian/libdune-common-2.4git.lintian-overrides |  3 ---
 debian/libdune-common-dev.install              |  4 ++--
 debian/libdune-common-dev.lintian-overrides    |  6 ++++++
 6 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/debian/control b/debian/control
index 454d27f..e405f88 100644
--- a/debian/control
+++ b/debian/control
@@ -14,10 +14,11 @@ Build-Depends-Indep: doxygen, ghostscript, graphviz, texlive-latex-extra, texliv
 Package: libdune-common-dev
 Section: libdevel
 Architecture: any
-Depends: ${misc:Depends}, libdune-common-2.4git (= ${binary:Version}),
+Depends: ${misc:Depends}, ${shlibs:Depends},
  pkg-config, python, python-pyparsing
 Recommends: automake, autoconf, libtool
 Suggests: libdune-common-dbg (= ${binary:Version})
+Provides: ${dune:shared-library}
 Description: toolbox for solving PDEs -- basic classes (development files)
  DUNE, the Distributed and Unified Numerics Environment is a modular toolbox
  for solving partial differential equations (PDEs) with grid-based methods.
@@ -31,7 +32,7 @@ Section: debug
 Priority: extra
 Architecture: any
 Multi-Arch: same
-Depends: ${misc:Depends}, libdune-common-2.4git (= ${binary:Version})
+Depends: ${misc:Depends}, libdune-common-dev (= ${binary:Version})
 Description: toolbox for solving PDEs -- basic classes (debug symbols)
  DUNE, the Distributed and Unified Numerics Environment is a modular toolbox
  for solving partial differential equations (PDEs) with grid-based methods.
@@ -40,19 +41,6 @@ Description: toolbox for solving PDEs -- basic classes (debug symbols)
  .
  This package contains the debug symbols for the basic classes.
 
-Package: libdune-common-2.4git
-Architecture: any
-Multi-Arch: same
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Pre-Depends: ${misc:Pre-Depends}
-Description: toolbox for solving PDEs -- basic classes (library)
- DUNE, the Distributed and Unified Numerics Environment is a modular toolbox
- for solving partial differential equations (PDEs) with grid-based methods.
- It supports the easy implementation of methods like Finite Elements (FE),
- Finite Volumes (FV), and also Finite Differences (FD).
- .
- This package contains the library for the basic classes.
-
 Package: libdune-common-doc
 Section: doc
 Architecture: all
diff --git a/debian/dune-debian.mk b/debian/dune-debian.mk
index 164c75f..d420a7d 100644
--- a/debian/dune-debian.mk
+++ b/debian/dune-debian.mk
@@ -1,3 +1,4 @@
+include /usr/share/dpkg/pkg-info.mk
 
 export USE_CMAKE=no
 
@@ -14,6 +15,8 @@ DUNE_DEBIAN_CONFIGURE_FLAGS ?= \
 	--with-ug=/usr \
 	--without-x
 
+DUNE_DEBIAN_SHLIB = $(subst ~,.,lib$(DEB_SOURCE)-$(DEB_VERSION_UPSTREAM))
+
 override_dh_auto_configure:
 	$(DUNE_DEBIAN_DUNECONTROL) autogen
 	dh_auto_configure -Sautoconf -- $(DUNE_DEBIAN_CONFIGURE_FLAGS)
@@ -32,3 +35,9 @@ override_dh_clean:
 	rm -f aclocal.m4 compile config.guess config.h.in config.sub configure dependencies.m4 depcomp install-sh ltmain.sh missing test-driver
 	rm -rf doc/doxygen/Doxyfile.in doc/doxygen/doxyerr.log doc/doxygen/doxygen-tag doc/doxygen/doxygen.log doc/doxygen/html
 	rm -rf debian/tmp-test
+
+override_dh_gencontrol:
+	dh_gencontrol -- -Vdune:shared-library='$(DUNE_DEBIAN_SHLIB)'
+
+override_dh_makeshlibs:
+	dh_makeshlibs --version-info='$(DUNE_DEBIAN_SHLIB)'
diff --git a/debian/libdune-common-2.4git.install b/debian/libdune-common-2.4git.install
deleted file mode 100644
index 81d0bc9..0000000
--- a/debian/libdune-common-2.4git.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/libdunecommon-*.so
diff --git a/debian/libdune-common-2.4git.lintian-overrides b/debian/libdune-common-2.4git.lintian-overrides
deleted file mode 100644
index 8b06c35..0000000
--- a/debian/libdune-common-2.4git.lintian-overrides
+++ /dev/null
@@ -1,3 +0,0 @@
-# I prefer libdune-common as the module is named dune-common upstream.
-#  -- ansgar 2012-03-01
-libdune-common-2.4git: package-name-doesnt-match-sonames libdunecommon-2.4git
diff --git a/debian/libdune-common-dev.install b/debian/libdune-common-dev.install
index 49dd98d..ec6c7a9 100644
--- a/debian/libdune-common-dev.install
+++ b/debian/libdune-common-dev.install
@@ -3,8 +3,8 @@ usr/include
 usr/lib/*/cmake
 usr/lib/*/dunecontrol usr/lib
 usr/lib/*/dunemodules.lib usr/lib
-usr/lib/*/libdunecommon.a
-usr/lib/*/libdunecommon.so
+usr/lib/*/lib*.a
+usr/lib/*/lib*.so
 usr/lib/*/pkgconfig
 usr/share/bash-completion
 usr/share/dune-common
diff --git a/debian/libdune-common-dev.lintian-overrides b/debian/libdune-common-dev.lintian-overrides
new file mode 100644
index 0000000..c3689aa
--- /dev/null
+++ b/debian/libdune-common-dev.lintian-overrides
@@ -0,0 +1,6 @@
+# We don't build a separate shared library package.
+# See also https://lists.debian.org/debian-devel/2015/07/msg00115.html
+libdune-common-dev: non-dev-pkg-with-shlib-symlink *
+libdune-common-dev: package-name-doesnt-match-sonames *
+# ABI is too unstable to warrant extra work with a symbols file
+libdune-common-dev: no-symbols-control-file

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