[med-svn] [freecontact] 01/01: Move to d-shlibs to simplify gcc-5 transition

[Andreas Tille]

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

tille pushed a commit to branch master
in repository freecontact.

commit c0391d6f72cbc8ff8c086e3a486b109dbd2f62da
Author: Andreas Tille <tille at debian.org>
Date:   Wed Aug 19 08:20:04 2015 +0200

    Move to d-shlibs to simplify gcc-5 transition
---
 debian/control                     |  2 ++
 debian/libfreecontact0-dev.install |  3 ---
 debian/libfreecontact0.install     |  1 -
 debian/rules                       | 17 +++++++++++++++++
 4 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/debian/control b/debian/control
index 23fdd4f..a4ac44c 100644
--- a/debian/control
+++ b/debian/control
@@ -9,6 +9,7 @@ Build-Depends: debhelper (>= 9.0.0),
                autotools-dev,
                bash-completion,
                dh-autoreconf,
+               d-shlibs,
                dpkg-dev (>= 1.16.2),
                gfortran,
                libblas-dev | libblas-3.so,
@@ -55,6 +56,7 @@ Section: libdevel
 Depends: libfreecontact0 (= ${binary:Version}),
          ${misc:Depends}
 Suggests: libfreecontact-doc
+Conflicts: libfreecontact-dev
 Provides: libfreecontact-dev
 Description: fast protein contact predictor library - development files
  ${Description}
diff --git a/debian/libfreecontact0-dev.install b/debian/libfreecontact0-dev.install
deleted file mode 100644
index ad64286..0000000
--- a/debian/libfreecontact0-dev.install
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/include/*
-usr/lib/*/libfreecontact.a
-usr/lib/*/libfreecontact.so
diff --git a/debian/libfreecontact0.install b/debian/libfreecontact0.install
deleted file mode 100644
index b0255d8..0000000
--- a/debian/libfreecontact0.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/libfreecontact.so.*
diff --git a/debian/rules b/debian/rules
index ef7e56a..4f92691 100755
--- a/debian/rules
+++ b/debian/rules
@@ -25,6 +25,23 @@ override_dh_compress:
 override_dh_gencontrol:
 	dh_gencontrol -- '-VDescription=$(Description)'
 
+override_dh_install:
+	dh_install
+	d-shlibmove --commit \
+	            --multiarch \
+	            --exclude-la \
+	            --override s/libblas3-dev/libblas-dev/ \
+	            --override s/libgfortran3-dev/libgfortran-4.9-dev/ \
+	            --override s/liblapack3-dev/liblapack-dev/ \
+	            --override s/libquadmath0-dev/libgcc-4.9-dev/ \
+	            --movedev debian/tmp/usr/include/* usr/include \
+	            debian/tmp/usr/lib/*/*.so
+
+#	            --devunversioned \
+##	            --v5 \
+##	            --override s/libgfortran3-dev/libgfortran-5-dev/ \
+##	            --override s/libquadmath0-dev/libgcc-5-dev/ \
+
 override_dh_bash-completion:
 	echo "Until bug #668254 is fixed we need to override this"
 	mkdir -p debian/freecontact/usr/share/bash-completion/completions

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/freecontact.git