This is an automated email from the git hooks/post-receive script. vdanjean pushed a commit to branch master in repository picard-tools.
commit 897414906e08c0e19880773ded8d818b2c156aaa Author: Vincent Danjean <[email protected]> Date: Tue Dec 20 09:37:02 2016 +0100 Ensure versionned B-D and Depends are in sync --- debian/changelog | 6 ++++++ debian/control | 7 ++++--- debian/rules | 23 ++++++++++++++++++++++- 3 files changed, 32 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 135df7d..4073427 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +picard-tools (2.8.0+dfsg-2) UNRELEASED; urgency=medium + + * Ensure versionned B-D and Depends are in sync (Closes: #848831) + + -- Vincent Danjean <[email protected]> Tue, 20 Dec 2016 09:36:16 +0100 + picard-tools (2.8.0+dfsg-1) unstable; urgency=medium [ Andreas Tille ] diff --git a/debian/control b/debian/control index 302b155..455b179 100644 --- a/debian/control +++ b/debian/control @@ -80,9 +80,10 @@ Package: libpicard-java Architecture: all Section: java Depends: ${misc:Depends}, - libguava-java (>= 15.0), - libhtsjdk-java (>= 2.7~), - libhtsjdk-java (<< 2.8~) +# Getting versionned depends from Build-Depends +# This avoid mismatch, but each library must be extracted in debian/rules + ${bd:libguava-java}, + ${bd:libhtsjdk-java} # avoid ${java:Depends} that contains openjdk-8-jdk-headless # due to tools.jar in classpath Recommends: ${java:Recommends}, diff --git a/debian/rules b/debian/rules index 7606249..25ef01f 100755 --- a/debian/rules +++ b/debian/rules @@ -19,6 +19,27 @@ override_dh_auto_test: dh_auto_build -- test override_dh_clean: - dh_auto_clean + dh_clean # also remove bai files that are left after tests find testdata -iname "*.bai" -exec rm {} \; + $(RM) debian/bd-temp-substvars + $(RM) debian/bd.substvars + +override_dh_gencontrol: + cat debian/control \ + | sed -e '/^Build-.*Depends:/,/^[^[:space:]#]/{s/^Build-.*Depends:/ /;p};d' \ + | grep '^[[:space:]]' \ + | tr ',' '\n' \ + > debian/bd-temp-substvars + echo -n "bd:libhtsjdk-java=" > debian/bd.substvars + grep 'libhtsjdk-java ' debian/bd-temp-substvars \ + | tr "\n" "," \ + | sed -e 's/[[:space:]]\+/ /g;s/,$$/\n/' \ + >> debian/bd.substvars + echo -n "bd:libguava-java=" >> debian/bd.substvars + grep 'libguava-java ' debian/bd-temp-substvars \ + | tr "\n" "," \ + | sed -e 's/[[:space:]]\+/ /g;s/,$$/\n/' \ + >> debian/bd.substvars + dh_gencontrol -O--buildsystem=gradle -- -Tdebian/bd.substvars + -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/picard-tools.git _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
