Étienne Mollier pushed to branch master at Debian Med / htslib
Commits: a22ba2ad by Étienne Mollier at 2022-10-19T16:39:49+02:00 d/rules: make sure libdir and plugindir are defined. This fixes issues caught downstream, reported upstream[1] and forwarded to the mailing list[2]. The change also ventilates the dh_auto_configure step, which is barely readable when horizontal scrolling is involved. [1]: https://github.com/samtools/htslib/issues/1515 [2]: https://lists.debian.org/debian-med/2022/10/msg00064.html Thanks: James Bonfield - - - - - b90cee6a by Étienne Mollier at 2022-10-19T16:53:12+02:00 d/libhts3.install: relocate plugins following fix at configure step. - - - - - ffb8c0af by Étienne Mollier at 2022-10-19T16:59:59+02:00 d/*.install: remove dh-exec shebang. Since debhelper-compat 13, dh is able to parse install directives with expansion of dpkg-architecture variables. - - - - - f956d5ac by Étienne Mollier at 2022-10-19T17:01:21+02:00 d/control: remove build-dependency to dh-exec. - - - - - b34edc81 by Étienne Mollier at 2022-10-19T17:02:39+02:00 ready to upload to unstable. - - - - - 5 changed files: - debian/changelog - debian/control - debian/libhts-dev.install - debian/libhts3.install - debian/rules Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,13 @@ +htslib (1.16+ds-3) unstable; urgency=medium + + * d/rules: make sure libdir and plugindir are defined. + Thanks to James Bonfield + * d/libhts3.install: relocate plugins following fix at configure step. + * d/*.install: remove dh-exec shebang. + * d/control: remove build-dependency to dh-exec. + + -- Étienne Mollier <emoll...@debian.org> Wed, 19 Oct 2022 17:01:44 +0200 + htslib (1.16+ds-2) unstable; urgency=medium * Team Upload. ===================================== debian/control ===================================== @@ -8,7 +8,6 @@ Uploaders: Charles Plessy <ple...@debian.org>, Section: science Priority: optional Build-Depends: debhelper-compat (= 13), - dh-exec, libbz2-dev, libcurl4-gnutls-dev, liblzma-dev, ===================================== debian/libhts-dev.install ===================================== @@ -1,4 +1,3 @@ -#! /usr/bin/dh-exec usr/include/* usr/include usr/lib/${DEB_HOST_MULTIARCH}/*.a usr/lib/${DEB_HOST_MULTIARCH} usr/lib/${DEB_HOST_MULTIARCH}/*.so usr/lib/${DEB_HOST_MULTIARCH} ===================================== debian/libhts3.install ===================================== @@ -1,4 +1,3 @@ -#! /usr/bin/dh-exec usr/lib/${DEB_HOST_MULTIARCH}/libhts.so.* usr/lib/${DEB_HOST_MULTIARCH} -debian/tmp/htslib usr/lib/${DEB_HOST_MULTIARCH} +usr/lib/${DEB_HOST_MULTIARCH}/htslib usr/lib/${DEB_HOST_MULTIARCH} usr/share/man/man5/* usr/share/man/man5 ===================================== debian/rules ===================================== @@ -17,6 +17,8 @@ export DEB_LDFLAGS_MAINT_APPEND # Prune +,ds etc from version UPSTREAM_VERSION := $(shell echo $(DEB_VERSION_UPSTREAM) | sed 's/+.*//') +libdir = /usr/lib/$(DEB_HOST_MULTIARCH) +plugindir = $(libdir)/htslib %: dh $@ @@ -32,8 +34,16 @@ endif # create clean copy of test dir cp -a test test_backup # to help with cross building, otherwise MMAP might get turned off - export ac_cv_func_mmap_fixed_mapped=yes && autoconf && \ - dh_auto_configure -- --enable-libcurl --enable-gcs --enable-s3 --enable-plugins --with-plugin-dir='$(libdir)/htslib' --with-external-htscodecs --with-plugin-path='/usr/local/lib/htslib:/usr/local/libexec/htslib:$(plugindir)' + export ac_cv_func_mmap_fixed_mapped=yes \ + && autoconf \ + && dh_auto_configure -- \ + --enable-libcurl \ + --enable-gcs \ + --enable-s3 \ + --enable-plugins \ + --with-plugin-dir='$(libdir)/htslib' \ + --with-external-htscodecs \ + --with-plugin-path='/usr/local/lib/htslib:/usr/local/libexec/htslib:$(plugindir)' override_dh_auto_build-arch: dh_auto_build -- \ @@ -41,7 +51,7 @@ override_dh_auto_build-arch: CPPFLAGS="-I. -DSAMTOOLS=1 $$(dpkg-buildflags --get CPPFLAGS)" \ LDFLAGS="$$(dpkg-buildflags --get LDFLAGS)" \ PACKAGE_VERSION="$(UPSTREAM_VERSION)" \ - libdir=/usr/lib/$(DEB_HOST_MULTIARCH) + libdir=$(libdir) # re-try later LDLIBS=-lhts \ override_dh_auto_build-indep: @@ -55,7 +65,7 @@ override_dh_auto_install-arch: CPPFLAGS="-I. -DSAMTOOLS=1 $$(dpkg-buildflags --get CPPFLAGS)" \ LDFLAGS="$$(dpkg-buildflags --get LDFLAGS)" \ PACKAGE_VERSION="$(UPSTREAM_VERSION)" \ - libdir=/usr/lib/$(DEB_HOST_MULTIARCH) + libdir=$(libdir) # restore clean copy of test dir before dh_install is run # This should not be done earlier since dh_auto_install contains some unconditional removals $(RM) -r test @@ -74,7 +84,7 @@ ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) CPPFLAGS="-I. -DSAMTOOLS=1 $$(dpkg-buildflags --get CPPFLAGS)" \ LDFLAGS="$$(dpkg-buildflags --get LDFLAGS)" \ PACKAGE_VERSION="$(UPSTREAM_VERSION)" \ - libdir=/usr/lib/$(DEB_HOST_MULTIARCH) \ + libdir=$(libdir) \ || \ if find . -name "FAIL*" > /dev/null ; then \ for file in $$(find . -name "FAIL*"); do echo $${file}; cat $${file}; done && false ; \ View it on GitLab: https://salsa.debian.org/med-team/htslib/-/compare/dd89fe34bb9dc49f9009be60604bf20ae5a70626...b34edc81293faf8d799ed447d0f6be257d36f574 -- View it on GitLab: https://salsa.debian.org/med-team/htslib/-/compare/dd89fe34bb9dc49f9009be60604bf20ae5a70626...b34edc81293faf8d799ed447d0f6be257d36f574 You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ debian-med-commit mailing list debian-med-com...@alioth-lists.debian.net https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/debian-med-commit
