[med-svn] [libbpp-qt] 02/06: Adapt package names to soversion change, Hardening

[Andreas Tille]

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

tille pushed a commit to branch master
in repository libbpp-qt.

commit 9ac1692c000356771284263d332ec477cbcdd32d
Author: Andreas Tille <tille at debian.org>
Date:   Wed Jun 14 10:45:16 2017 +0200

    Adapt package names to soversion change, Hardening
---
 debian/changelog |  2 ++
 debian/control   | 10 ++++------
 debian/rules     | 13 ++++---------
 3 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 82b44cc..c050789 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ libbpp-qt (2.3.1-1) UNRELEASED; urgency=medium
 
   * New upstream version
   * d/watch: point to github
+  * Adapt package names to soversion change
+  * Hardening
 
  -- Andreas Tille <tille at debian.org>  Wed, 14 Jun 2017 10:42:46 +0200
 
diff --git a/debian/control b/debian/control
index bc7d1f1..f7d08db 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Build-Depends: debhelper (>= 9),
                d-shlibs,
                qt4-qmake,
                libqt4-dev,
-               libbpp-phyl-dev (>= 2.2.0)
+               libbpp-phyl-dev (>= 2.3.1)
 Standards-Version: 3.9.8
 Vcs-Browser: https://anonscm.debian.org/cgit/debian-med/libbpp-qt.git
 Vcs-Git: https://anonscm.debian.org/git/debian-med/libbpp-qt.git
@@ -18,9 +18,9 @@ Homepage: http://biopp.univ-montp2.fr/wiki/index.php/Main_Page
 Package: libbpp-qt-dev
 Architecture: any
 Section: libdevel
-Depends: libbpp-qt1v5 (= ${binary:Version}),
+Depends: libbpp-qt2 (= ${binary:Version}),
          ${misc:Depends},
-         libbpp-phyl-dev (>= 2.2.0),
+         libbpp-phyl-dev (>= 2.3.1),
          libqt4-dev
 Description: Bio++ Qt Graphic classes library development files
  Bio++ is a set of C++ libraries for Bioinformatics, including sequence
@@ -32,13 +32,11 @@ Description: Bio++ Qt Graphic classes library development files
  Contains development files of the Bio++ graphical classes developed
  with Qt.
 
-Package: libbpp-qt1v5
+Package: libbpp-qt2
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends},
          ${misc:Depends}
-Conflicts: libbpp-qt1
-Replaces: libbpp-qt1
 Description: Bio++ Qt Graphic classes library
  Bio++ is a set of C++ libraries for Bioinformatics, including sequence
  analysis, phylogenetics, molecular evolution and population genetics.
diff --git a/debian/rules b/debian/rules
index ebf58cc..9d1fe92 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,8 +2,7 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-## When the following is set, the package does not build:
-# export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
 %:
 	dh $@
@@ -12,13 +11,9 @@ override_dh_install:
 	dh_install
 	d-shlibmove --commit \
 		    --multiarch \
-		    --v5 \
 		    --devunversioned \
-		    --override s/libbpp-core2-dev/libbpp-core-dev/ \
-		    --override s/libbpp-seq9-dev/libbpp-seq-dev/ \
-		    --override s/libbpp-phyl9-dev/libbpp-phyl-dev/ \
-		    --override s/libbpp-seq-omics1-dev/libbpp-seq-omics-dev/ \
-		    --override s/libQtGui4-dev/libqt4-dev/ \
+		    --override 's/libbpp-\([-a-z]\+\)[0-9]\+-dev/libbpp-\1-dev/' \
 		    --exclude-la \
                     --movedev debian/tmp/usr/include/* usr/include \
-                    debian/tmp/usr/lib/*.so
+                    --movedev debian/tmp/usr/lib/$(DEB_HOST_GNU_TYPE)/cmake usr/lib/$(DEB_HOST_GNU_TYPE) \
+                    debian/tmp/usr/lib/*/*.so

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