From: Raspbian automatic forward porter Date: Mon, 19 Aug 2019 00:24:20 +0000 (+0100) Subject: Merge version 0.19.0+dfsg-4+rpi1 and 0.23.0+dfsg-1 to produce 0.23.0+dfsg-1+rpi1 X-Git-Tag: archive/raspbian/0.23.0+dfsg-1+rpi1^0 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=dfd060d40724d8141035c86a3a6f3ca969f90861;p=pbbam.git Merge version 0.19.0+dfsg-4+rpi1 and 0.23.0+dfsg-1 to produce 0.23.0+dfsg-1+rpi1 --- dfd060d40724d8141035c86a3a6f3ca969f90861 diff --cc debian/changelog index d5027bb,af799f9..b002d5e --- a/debian/changelog +++ b/debian/changelog @@@ -1,9 -1,17 +1,24 @@@ - pbbam (0.19.0+dfsg-4+rpi1) buster-staging; urgency=medium ++pbbam (0.23.0+dfsg-1+rpi1) bullseye-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. + - -- Raspbian forward porter Thu, 14 Feb 2019 04:03:11 +0000 ++ -- Raspbian forward porter Mon, 19 Aug 2019 00:24:19 +0000 ++ + pbbam (0.23.0+dfsg-1) unstable; urgency=medium + + * Afif removed himself from Uploaders + * Add myself to Uploaders + * New upstream version + * debhelper-compat 12 + * Standards-Version: 4.4.0 + * Set upstream metadata fields: Contact, Name. + * Rename library to libpbbam0.23.0 due to upstream choice of ABI version + * Remove code copy of python-cram from upstream source + * Build-Depends: python3-cram + * d/control: Use instead of comment + + -- Andreas Tille Sun, 04 Aug 2019 21:16:32 +0200 pbbam (0.19.0+dfsg-4) unstable; urgency=medium diff --cc debian/rules index 18d6bb6,61b3ef7..cd09321 --- a/debian/rules +++ b/debian/rules @@@ -13,10 -13,10 +13,10 @@@ generated_data_dir = $(CURDIR)/gendat dh $@ --buildsystem=meson override_dh_auto_test: $(subst .t.in,.deb.t,$(wildcard tests/src/cram/pb*.t.in)) -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) + python3 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*