[dune-geometry] 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-geometry.

commit 14365c6f3569478b2080785101c0f6aa1b545e88
Author: Ansgar Burchardt <ansgar at debian.org>
Date:   Thu Sep 3 15:19:23 2015 +0200

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

diff --git a/debian/control b/debian/control
index 65fd061..5fd266f 100644
--- a/debian/control
+++ b/debian/control
@@ -15,9 +15,10 @@ Build-Depends-Indep: doxygen, ghostscript, graphviz, texlive-latex-recommended,
 Package: libdune-geometry-dev
 Section: libdevel
 Architecture: any
-Depends: ${misc:Depends}, libdune-geometry-2.4git (= ${binary:Version}),
+Depends: ${misc:Depends}, ${shlibs:Depends},
  libdune-common-dev (>= 2.4~20150717rc1)
 Suggests: libdune-geometry-dbg (= ${binary:Version})
+Provides: ${dune:shared-library}
 Description: toolbox for solving PDEs -- geometry 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-geometry-2.4git (= ${binary:Version})
+Depends: ${misc:Depends}, libdune-geometry-dev (= ${binary:Version})
 Description: toolbox for solving PDEs -- geometry 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 -- geometry classes (debug symbols)
  .
  This package contains the debug symbols for the geometry classes.
 
-Package: libdune-geometry-2.4git
-Architecture: any
-Multi-Arch: same
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Pre-Depends: ${misc:Pre-Depends}
-Description: toolbox for solving PDEs -- geometry 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 geometry classes.
-
 Package: libdune-geometry-doc
 Section: doc
 Architecture: all
diff --git a/debian/libdune-geometry-2.4git.install b/debian/libdune-geometry-2.4git.install
deleted file mode 100644
index 0e62d0b..0000000
--- a/debian/libdune-geometry-2.4git.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/libdunegeometry-*.so
diff --git a/debian/libdune-geometry-2.4git.lintian-overrides b/debian/libdune-geometry-2.4git.lintian-overrides
deleted file mode 100644
index 86ca6f2..0000000
--- a/debian/libdune-geometry-2.4git.lintian-overrides
+++ /dev/null
@@ -1,3 +0,0 @@
-# I prefer libdune-geometry as the module in named dune-geometry upstream.
-#  -- ansgar 2012-03-01
-libdune-geometry-2.4git: package-name-doesnt-match-sonames libdunegeometry-2.4git
diff --git a/debian/libdune-geometry-dev.install b/debian/libdune-geometry-dev.install
index f350959..68f2824 100644
--- a/debian/libdune-geometry-dev.install
+++ b/debian/libdune-geometry-dev.install
@@ -1,8 +1,8 @@
 usr/include
 usr/lib/*/cmake
 usr/lib/*/dunecontrol usr/lib
-usr/lib/*/libdunegeometry.a
-usr/lib/*/libdunegeometry.so
+usr/lib/*/lib*.a
+usr/lib/*/lib*.so
 usr/lib/*/pkgconfig
 usr/share/dune
 usr/share/dune-geometry
diff --git a/debian/libdune-geometry-dev.lintian-overrides b/debian/libdune-geometry-dev.lintian-overrides
new file mode 100644
index 0000000..b845ad5
--- /dev/null
+++ b/debian/libdune-geometry-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-geometry-dev: non-dev-pkg-with-shlib-symlink *
+libdune-geometry-dev: package-name-doesnt-match-sonames *
+# ABI is too unstable to warrant extra work with a symbols file
+libdune-geometry-dev: no-symbols-control-file

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