From: Peter Michael Green Date: Thu, 14 Feb 2019 14:24:55 +0000 (+0000) Subject: Manual merge of version 0.7.4+ds-1+rpi1 and 0.19.0+dfsg-4 to produce 0.19.0+dfsg... X-Git-Tag: archive/raspbian/0.19.0+dfsg-4+rpi1^0 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=78577c5a99adacfd553acdcdbe0e0537b12e3cf7;p=pbbam.git Manual merge of version 0.7.4+ds-1+rpi1 and 0.19.0+dfsg-4 to produce 0.19.0+dfsg-4+rpi1 --- 78577c5a99adacfd553acdcdbe0e0537b12e3cf7 diff --cc debian/changelog index 466bbe6,a8a1e30..d5027bb --- a/debian/changelog +++ b/debian/changelog @@@ -1,8 -1,80 +1,87 @@@ - pbbam (0.7.4+ds-1+rpi1) stretch-staging; urgency=medium ++pbbam (0.19.0+dfsg-4+rpi1) buster-staging; urgency=medium + ++ [changes brought forward from 0.7.4+ds-1+rpi1 by Peter Michael Green at Sun, 30 Jul 2017 13:11:07 +0000] + * Disable testsuite. + - -- Peter Michael Green Sun, 30 Jul 2017 13:11:07 +0000 ++ -- Raspbian forward porter Thu, 14 Feb 2019 04:03:11 +0000 ++ + pbbam (0.19.0+dfsg-4) unstable; urgency=medium + + * Team upload. + + [ Steve Langasek ] + * Fix autopkgtest on different architectures + + [ Andreas Tille ] + * Cleanup d/rules + * No "Provides: libpbbam" due to ABI incompatibility + + -- Andreas Tille Wed, 06 Feb 2019 09:16:06 +0100 + + pbbam (0.19.0+dfsg-3) unstable; urgency=medium + + * Team upload. + + [ Steve Langasek ] + * Fix build dir name for tests + Closes: #909071 + + -- Andreas Tille Mon, 04 Feb 2019 11:50:20 +0100 + + pbbam (0.19.0+dfsg-2) unstable; urgency=medium + + * Team upload. + + [ Steve Langasek ] + * Provide generated files to autopkgtest + Closes: #921122 + + [ Andreas Tille ] + * debhelper 12 + * Standards-Version: 4.3.0 + * Secure URI in copyright format + * Remove trailing whitespace in debian/copyright + + -- Andreas Tille Sun, 03 Feb 2019 08:00:29 +0100 + + pbbam (0.19.0+dfsg-1) unstable; urgency=medium + + * Team upload. + * New upstream version + * Fix samtools call in tests + * d/control: Bump (fake) SOVERSION (=release version) + + -- Andreas Tille Wed, 10 Oct 2018 12:45:02 +0200 + + pbbam (0.18.0+dfsg-2) unstable; urgency=medium + + * Team upload. + * Missing Breaks+Replaces: libpbbam (<< 0.18) + Closes: #910206 + * No needs-recommends restrictions, just Test-Depends: samtools + + -- Andreas Tille Wed, 03 Oct 2018 22:24:56 +0200 + + pbbam (0.18.0+dfsg-1) unstable; urgency=medium + + [ Andreas Tille ] + * Team upload. + * New upstream version + * Upstream is now tagging releases -> adapt watch file + * Upstream switched from cmake to meson + * debhelper 11 + * Point Vcs fields to salsa.debian.org + * Standards-Version: 4.2.1 + * Use d-shlibs + * Remove unneeded trigger + * Respect DEB_BUILD_OPTIONS in override_dh_auto_test + * hardening=+all + * Add Breaks/Provides/Replaces libpbbam + + [ Fabian Kloetzl ] + * fix dependency check for meson + + -- Andreas Tille Thu, 06 Sep 2018 14:29:53 +0200 pbbam (0.7.4+ds-1) unstable; urgency=medium diff --cc debian/rules index 293bda5,34e18a0..18d6bb6 --- a/debian/rules +++ b/debian/rules @@@ -8,27 -10,21 +10,21 @@@ DEB_VERSION_UPSTREAM := $(subst +ds,,$( generated_data_dir = $(CURDIR)/gendata %: - dh $@ - - override_dh_auto_configure: - dh_auto_configure -- \ - -DPacBioBAM_build_shared=ON \ - -DPacBioBAM_build_tests=OFF \ - -DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH) \ - -DCMAKE_SKIP_RPATH=ON \ - -DHTSLIB_INCLUDE_DIRS=/usr/include \ - -DHTSLIB_LIBRARIES="-lssl -lcrypto -lhts" \ - -DCMAKE_SHARED_LINKER_FLAGS="$(LDFLAGS)" - # -DPacBioBAM_wrap_python=ON \ - # -DPacBioBAM_wrap_r=ON + dh $@ --buildsystem=meson 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) - #BINDIR=`find $$PWD -name bin -type d`; \ - #LIBDIR=`find $$PWD -name lib -type d`; \ - #PATH="$$BINDIR:$(PATH)" LD_LIBRARY_PATH="$$LIBDIR:$(LD_LIBRARY_PATH)" \ - #cram -v $^ -ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) ++ifeq (testsuitedisabled,$(filter nocheck,$(DEB_BUILD_OPTIONS))) + dh_auto_configure -O--buildsystem=meson + mkdir -p $(generated_data_dir) + python tests/scripts/generate_data.py $(CURDIR)/tests/data $(generated_data_dir) + # 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* + BINDIR=`dirname $$(find $$PWD -name pbmerge -type f -executable)`; \ + LIBDIR=`find $$PWD -name lib -type d`; \ + PATH="$$BINDIR:$(PATH)" LD_LIBRARY_PATH="$$LIBDIR:$(LD_LIBRARY_PATH)" \ + cram -v --preserve-env $^ + endif override_dh_installchangelogs: dh_installchangelogs CHANGELOG.md