From: Raspbian automatic forward porter Date: Thu, 10 Sep 2020 13:10:10 +0000 (+0100) Subject: Merge version 6.2.0-2+rpi1 and 6.2.2-1 to produce 6.2.2-1+rpi1 X-Git-Tag: archive/raspbian/6.2.2-1+rpi1~1 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=4f065c676cd43bd48fed00c5a57094d53e6666c9;p=zimlib.git Merge version 6.2.0-2+rpi1 and 6.2.2-1 to produce 6.2.2-1+rpi1 --- 4f065c676cd43bd48fed00c5a57094d53e6666c9 diff --cc debian/changelog index 8a09a45,0214596..37c274b --- a/debian/changelog +++ b/debian/changelog @@@ -1,13 -1,9 +1,20 @@@ - zimlib (6.2.0-2+rpi1) bullseye-staging; urgency=medium ++zimlib (6.2.2-1+rpi1) bullseye-staging; urgency=medium + + [changes brought forward from 4.0.4-5+rpi1 by Peter Michael Green at Fri, 18 Jan 2019 22:43:45 +0000] + * Update symbols file for Raspbian. + + [changes brought forward from 4.0.4-5+rpi2 by Peter Michael Green at Sun, 07 Jun 2020 17:28:23 +0000] + * Disable testsuite. + * Fix clean target. + - -- Peter Michael Green Sat, 05 Sep 2020 11:13:28 +0000 ++ -- Raspbian forward porter Thu, 10 Sep 2020 13:10:10 +0000 ++ + zimlib (6.2.2-1) unstable; urgency=medium + + * New upstream version 6.2.2 + * Drop symbols file (Closes: #969196, #924572) + + -- Kunal Mehta Sat, 05 Sep 2020 02:29:25 -0700 zimlib (6.2.0-2) unstable; urgency=medium diff --cc debian/rules index bf6142b,1c7a791..25a6c0a --- a/debian/rules +++ b/debian/rules @@@ -4,11 -4,8 +4,11 @@@ export DEB_BUILD_MAINT_OPTIONS = harden # Skip some extremely memory-intensive tests export SKIP_BIG_MEMORY_TEST=1 %: - dh $@ --with pkgkde_symbolshelper --buildsystem=meson + dh $@ --buildsystem=meson -# Increase test timeout override_dh_auto_test: - dh_auto_test -- -t 3 + echo testsuite disabled + +override_dh_auto_clean: + rm -rf test/pytest/__pycache__ + dh_auto_clean