Andreas Tille pushed to branch master at Debian Med / pbbam
Commits: e2175606 by Andreas Tille at 2018-09-06T09:34:51Z Standards-Version: 4.2.1 - - - - - 1aa1d70b by Andreas Tille at 2018-09-06T10:58:31Z Use d-shlibs, use file name with SONAME proposed by d-shlibs - - - - - 5b37e019 by Andreas Tille at 2018-09-06T11:27:43Z There is no static lib build - - - - - 7 changed files: - debian/changelog - debian/control - − debian/libpbbam-dev.install - − debian/libpbbam.install - − debian/libpbbam.lintian-overrides - debian/libpbbam.triggers → debian/libpbbam0.18.0.triggers - debian/rules Changes: ===================================== debian/changelog ===================================== @@ -7,7 +7,8 @@ pbbam (0.18.0+dfsg-1) UNRELEASED; urgency=medium * Upstream switched from cmake to meson * debhelper 11 * Point Vcs fields to salsa.debian.org - * Standards-Version: 4.2.0 + * Standards-Version: 4.2.1 + * Use d-shlibs [ Fabian Kloetzl ] * fix dependency check for meson ===================================== debian/control ===================================== @@ -1,10 +1,11 @@ Source: pbbam Maintainer: Debian Med Packaging Team <[email protected]> Uploaders: Afif Elghraoui <[email protected]> -Section: libs +Section: science Priority: optional Build-Depends: debhelper (>= 11~), dh-exec, + d-shlibs, meson, pkg-config, python, @@ -17,14 +18,13 @@ Build-Depends: debhelper (>= 11~), libgtest-dev, python-cram, samtools -Standards-Version: 4.2.0 +Standards-Version: 4.2.1 Vcs-Browser: https://salsa.debian.org/med-team/pbbam Vcs-Git: https://salsa.debian.org/med-team/pbbam.git Homepage: http://pbbam.readthedocs.org/en/latest/index.html Package: pbbamtools Architecture: any -Section: science Depends: ${shlibs:Depends}, ${misc:Depends}, libpbbam (= ${binary:Version}) @@ -42,9 +42,10 @@ Description: processing Pacific Biosciences binary alignment/map files This package provides command-line utilities for working with PacBio BAM files. -Package: libpbbam +Package: libpbbam0.18.0 Architecture: any Multi-Arch: same +Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} Pre-Depends: ${misc:Pre-Depends} @@ -62,7 +63,7 @@ Description: Pacific Biosciences binary alignment/map (BAM) library Package: libpbbam-dev Architecture: any Section: libdevel -Depends: libpbbam (= ${binary:Version}), +Depends: libpbbam0.18.0 (= ${binary:Version}), libhts-dev, libssl-dev, ${misc:Depends} ===================================== debian/libpbbam-dev.install deleted ===================================== @@ -1 +0,0 @@ -include/* usr/include ===================================== debian/libpbbam.install deleted ===================================== @@ -1,2 +0,0 @@ -#!/usr/bin/dh-exec -*/lib/* usr/lib/${DEB_HOST_MULTIARCH} ===================================== debian/libpbbam.lintian-overrides deleted ===================================== @@ -1,6 +0,0 @@ -# Upstream has not yet stabilized the API. -# This library is so far only used by a closely-related set of programs. -shlib-without-versioned-soname usr/lib/x86_64-linux-gnu/libpbbam.so libpbbam.so -# Because of the lack of versioned soname, the library itself contains -# the libpbbam.so file, so there's no need for a symlink. -dev-pkg-without-shlib-symlink usr/lib/x86_64-linux-gnu/libpbbam.so usr/lib/x86_64-linux-gnu/libpbbam.so ===================================== debian/libpbbam.triggers → debian/libpbbam0.18.0.triggers ===================================== ===================================== debian/rules ===================================== @@ -25,8 +25,6 @@ generated_data_dir = $(CURDIR)/gendata override_dh_auto_test: $(subst .t.in,.deb.t,$(wildcard tests/src/cram/pb*.t.in)) mkdir -p $(generated_data_dir) python tests/scripts/generate_data.py $(CURDIR)/tests/data $(generated_data_dir) - # remove dfsg extension from test cases - sed -i -e 's/+dfsg//g' -e 's?\(/build/$(DEB_SOURCE)-[0-9.]\+\)/?\1+dfsg/?' tests/src/cram/* # Fix broken PATH synthetic_movie_all_path=`find $$PWD -name synthetic_movie_all.subreadset.xml` ; \ sed -i -e "s?.GENERATEDDATADIR/synthetic_movie_all.subreadset.xml?$${synthetic_movie_all_path}?" tests/src/cram/pbbamify* @@ -53,5 +51,17 @@ override_dh_auto_clean: -e 's|@PacBioBAM_TestsDir@|$(CURDIR)/tests|g' \ -e 's|@PacBioBAM_VERSION@|$(DEB_VERSION_UPSTREAM)|g' \ -e 's|@GeneratedTestDataDir@|$(generated_data_dir)|g' \ + -e 's|+dfsg||g' -e 's|\(/build/$(DEB_SOURCE)-[0-9.]\+\)/|\1+dfsg/|' \ $< > $@ +override_dh_install: + dh_install + d-shlibmove --commit \ + --multiarch \ + --devunversioned \ + --exclude-la \ + --exclude-a \ + --override s/libhts2-dev/libhts-dev/ \ + --movedev debian/tmp/usr/include/* usr/include \ + --movedev "debian/tmp/usr/lib/*/pkgconfig/*.pc" usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig \ + debian/tmp/usr/lib/*/*.so View it on GitLab: https://salsa.debian.org/med-team/pbbam/compare/c1f1472da5dd9df47113ec3db320919edaef93b3...5b37e0193bcc56e7bdb6d7b017559941968707e2 -- View it on GitLab: https://salsa.debian.org/med-team/pbbam/compare/c1f1472da5dd9df47113ec3db320919edaef93b3...5b37e0193bcc56e7bdb6d7b017559941968707e2 You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ debian-med-commit mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/debian-med-commit
