[med-svn] [libbpp-phyl] 04/04: short dh rules file using d-shlibs, library transition
Andreas Tille
tille at debian.org
Wed Apr 13 14:20:06 UTC 2016
This is an automated email from the git hooks/post-receive script.
tille pushed a commit to branch master
in repository libbpp-phyl.
commit 202d8104a71cceca716e5d4f9b97e106aff07b96
Author: Andreas Tille <tille at debian.org>
Date: Wed Apr 13 16:19:43 2016 +0200
short dh rules file using d-shlibs, library transition
---
debian/changelog | 3 +
debian/control | 16 +++--
debian/libbpp-phyl-dev.install | 3 -
debian/libbpp-phyl9.install | 1 -
debian/rules | 138 +++++++----------------------------------
5 files changed, 36 insertions(+), 125 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index a195919..79ef7e9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,9 @@ libbpp-phyl (2.2.0-1) UNRELEASED; urgency=medium
* Add watch file
* debhelper 9
* DEP5
+ * short dh rules file using d-shlibs
+ * Library transition
+ Closes: #791094
-- Andreas Tille <tille at debian.org> Sat, 09 Apr 2016 14:08:54 +0200
diff --git a/debian/control b/debian/control
index 3152302..77b0e87 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,8 @@ Section: science
Priority: optional
Build-Depends: debhelper (>= 9),
cmake,
- libbpp-seq-dev (>= 2.1.0)
+ d-shlibs,
+ libbpp-seq-dev (>= 2.2.0)
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
@@ -15,9 +16,9 @@ Homepage: http://biopp.univ-montp2.fr/wiki/index.php/Main_Page
Package: libbpp-phyl-dev
Architecture: any
Section: libdevel
-Depends: libbpp-phyl9 (= ${binary:Version}),
+Depends: libbpp-phyl9v5 (= ${binary:Version}),
${misc:Depends},
- libbpp-seq-dev (>= 2.1.0)
+ libbpp-seq-dev (>= 2.2.0)
Description: Bio++ Phylogenetic library development files.
Bio++ is a set of C++ libraries for Bioinformatics, including sequence
analysis, phylogenetics, molecular evolution and population genetics.
@@ -28,12 +29,15 @@ Description: Bio++ Phylogenetic library development files.
This package contains the static library and the header files ofthe
Bio++ classes for phylogenetics.
-Package: libbpp-phyl9
+Package: libbpp-phyl9v5
Architecture: any
Section: libs
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
Depends: ${shlibs:Depends},
- ${misc:Depends},
- libbpp-seq9 (>= 2.1.0)
+ ${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/libbpp-phyl-dev.install b/debian/libbpp-phyl-dev.install
deleted file mode 100644
index 7d74f2b..0000000
--- a/debian/libbpp-phyl-dev.install
+++ /dev/null
@@ -1,3 +0,0 @@
-debian/tmp/usr/include/*
-debian/tmp/usr/lib/lib*.a
-debian/tmp/usr/lib/lib*.so
diff --git a/debian/libbpp-phyl9.install b/debian/libbpp-phyl9.install
deleted file mode 100644
index c45ebcf..0000000
--- a/debian/libbpp-phyl9.install
+++ /dev/null
@@ -1 +0,0 @@
-debian/tmp/usr/lib/lib*.so.*
diff --git a/debian/rules b/debian/rules
index 34313ef..695b295 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,122 +1,30 @@
#!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
-
-# 24/01/10 Modification for use with CMake by Julien Dutheil.
-
# 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
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
-DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-
-
-CFLAGS = -Wall -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -O0
-else
- CFLAGS += -O2
-endif
-
-# shared library versions
-version=`ls src/lib*.so.* | \
- awk '{if (match($$0,/[0-9]+\.[0-9]+\.[0-9]+$$/)) print substr($$0,RSTART)}'`
-major=`ls src/lib*.so.* | \
- awk '{if (match($$0,/\.so\.[0-9]+$$/)) print substr($$0,RSTART+4)}'`
-
-configure:
- cmake -DCMAKE_INSTALL_PREFIX=/usr -DBUILD_TESTING=OFF .
-
-config.status: configure
- dh_testdir
-
-build: build-arch build-indep
-build-arch: build-stamp
-build-indep: build-stamp
-build-stamp: config.status
- dh_testdir
-
- # Add here commands to compile the package.
- $(MAKE)
+%:
+ dh $@
- touch $@
-
-clean:
- dh_testdir
- dh_testroot
-
- # Add here commands to clean up after the build process.
- [ ! -f Makefile ] || $(MAKE) clean;
- [ ! -f Makefile ] || rm Makefile;
- [ ! -f src/Makefile ] || rm src/Makefile;
- [ ! -f test/Makefile ] || rm test/Makefile;
- rm -f config.sub config.guess
- rm -f build-stamp
- rm -f CMakeCache.txt
- rm -f *.cmake
- rm -f src/*.cmake
- rm -f test/*.cmake
- rm -rf CMakeFiles
- rm -rf src/CMakeFiles
- rm -rf test/CMakeFiles
- rm -rf _CPack_Packages
- rm -rf Testing
- rm -f DartConfiguration.tcl
-
- dh_clean
-
-install: build
- dh_testdir
- dh_testroot
- dh_prep
- dh_installdirs
-
- # Add here commands to install the package into debian/tmp
- $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
-
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
- dh_testdir
- dh_testroot
- dh_installchangelogs ChangeLog
- dh_installdocs
- dh_installexamples
+override_dh_install:
dh_install
-# dh_installmenu
-# dh_installdebconf
-# dh_installlogrotate
-# dh_installemacsen
-# dh_installpam
-# dh_installmime
-# dh_installinit
-# dh_installcron
-# dh_installinfo
- dh_installman
- dh_link
- dh_strip
- dh_compress
- dh_fixperms
-# dh_perl
-# dh_python
- dh_makeshlibs
- dh_installdeb
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+ d-shlibmove --commit \
+ --multiarch \
+ --v5 \
+ --devunversioned \
+ --override s/libbpp-core2-dev/libbpp-core-dev/ \
+ --exclude-la \
+ --movedev debian/tmp/usr/include/* usr/include \
+ debian/tmp/usr/lib/*.so
+
+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
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/libbpp-phyl.git
More information about the debian-med-commit
mailing list