[med-svn] [libbpp-phyl] 04/04: Adapt package name to new soversion; upload to unstable

[Andreas Tille]

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

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

commit 4d19f064d0e1098285504de366c372701dd60764
Author: Andreas Tille <tille at debian.org>
Date:   Tue Jun 13 17:15:04 2017 +0200

    Adapt package name to new soversion; upload to unstable
---
 debian/changelog |  4 ++--
 debian/control   | 10 ++++------
 debian/rules     | 22 ++++------------------
 3 files changed, 10 insertions(+), 26 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f8d12f4..0bfd365 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-libbpp-phyl (2.3.1-1) UNRELEASED; urgency=medium
+libbpp-phyl (2.3.1-1) unstable; urgency=medium
 
   * New upstream version
   * d/watch: point to github
 
- -- Andreas Tille <tille at debian.org>  Tue, 13 Jun 2017 16:00:53 +0200
+ -- Andreas Tille <tille at debian.org>  Tue, 13 Jun 2017 16:39:48 +0200
 
 libbpp-phyl (2.2.0-1) unstable; urgency=medium
 
diff --git a/debian/control b/debian/control
index 40b1187..df59f19 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Priority: optional
 Build-Depends: debhelper (>= 9),
                cmake,
                d-shlibs,
-               libbpp-seq-dev (>= 2.2.0)
+               libbpp-seq-dev (>= 2.3.1)
 Standards-Version: 3.9.8
 Vcs-Browser: https://anonscm.debian.org/cgit/debian-med/libbpp-phyl.git
 Vcs-Git: https://anonscm.debian.org/git/debian-med/libbpp-phyl.git
@@ -16,9 +16,9 @@ Homepage: http://biopp.univ-montp2.fr/wiki/index.php/Main_Page
 Package: libbpp-phyl-dev
 Architecture: any
 Section: libdevel
-Depends: libbpp-phyl9v5 (= ${binary:Version}),
+Depends: libbpp-phyl11 (= ${binary:Version}),
          ${misc:Depends},
-         libbpp-seq-dev (>= 2.2.0)
+         libbpp-seq-dev (>= 2.3.1)
 Description: Bio++ Phylogenetic library development files
  Bio++ is a set of C++ libraries for Bioinformatics, including sequence
  analysis, phylogenetics, molecular evolution and population genetics.
@@ -29,15 +29,13 @@ Description: Bio++ Phylogenetic library development files
  This package contains the static library and the header files ofthe
  Bio++ classes for phylogenetics.
 
-Package: libbpp-phyl9v5
+Package: libbpp-phyl11
 Architecture: any
 Section: libs
 Pre-Depends: ${misc:Pre-Depends}
 Multi-Arch: same
 Depends: ${shlibs:Depends},
          ${misc:Depends}
-Conflicts: libbpp-phyl9
-Replaces: libbpp-phyl9
 Description: Bio++ Phylogenetic 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 b2361b3..9d1fe92 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,10 +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
-## So we need to live with:
-## libbpp-phyl9v5: hardening-no-bindnow usr/lib/x86_64-linux-gnu/libbpp-phyl.so.9
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
 %:
 	dh $@
@@ -14,20 +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-\([-a-z]\+\)[0-9]\+-dev/libbpp-\1-dev/' \
 		    --exclude-la \
                     --movedev debian/tmp/usr/include/* usr/include \
-                    debian/tmp/usr/lib/*.so
-
-ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
-override_dh_auto_test:
-	# For the moment ignore:
-	#  5/12 Test  #5: test_parsimony ...................***Failed    0.01 sec
-	# Newick::read: failed to read from stream
-	#
-	# 92% tests passed, 1 tests failed out of 12
-	dh_auto_test || true
-endif
+                    --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-phyl.git