From: Peter Michael Green Date: Sat, 5 Sep 2020 20:05:04 +0000 (+0000) Subject: Manual merge of version 5.2.0-1+rpi1 and 5.2.0-2 to produce 5.2.0-2+rpi1 X-Git-Tag: raspbian/5.2.0-2+rpi1 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=f81e572bc84ed26674830216bd1b6c4fafe94246;p=supermin.git Manual merge of version 5.2.0-1+rpi1 and 5.2.0-2 to produce 5.2.0-2+rpi1 --- bda09681c656176303741959480fee5256d51016 diff --cc debian/changelog index 39589dc,3a62e7f..c406c65 --- a/debian/changelog +++ b/debian/changelog @@@ -1,15 -1,8 +1,21 @@@ - supermin (5.2.0-1+rpi1) bullseye-staging; urgency=medium ++supermin (5.2.0-2+rpi1) bullseye-staging; urgency=medium + + [changes brought forward from 5.1.11-1+rpi1 by Peter Michael Green at Fri, 28 Nov 2014 05:45:23 +0000] + * Build-depend on raspbian kernel rather than debian armmp kernel. + + [changes brought forward from 5.1.20-1+rpi2 by Peter Michael Green at Tue, 03 Dec 2019 01:42:22 +0000] + * Drop linux-image-rpi build-dependency, we currently don't have kernels + in raspbian bullseye. + * Disable testsuite. + * Fix clean target. + - -- Raspbian forward porter Tue, 17 Mar 2020 06:47:56 +0000 ++ -- Peter Michael Green Sat, 05 Sep 2020 20:03:57 +0000 ++ + supermin (5.2.0-2) unstable; urgency=medium + + * Don't dwz supermin binary (Closes: #968476) + + -- Hilko Bengen Sun, 30 Aug 2020 22:29:40 +0200 supermin (5.2.0-1) unstable; urgency=medium diff --cc debian/rules index 783271b,44aa67b..e0f13b9 --- a/debian/rules +++ b/debian/rules @@@ -25,9 -25,8 +25,12 @@@ override_dh_auto_test override_dh_gencontrol: dh_gencontrol -- -Vmisc:Built-Using="$(shell dpkg-query -f '$${source:Package} (= $${source:Version}), ' -W $(if $(shell which musl-gcc),musl-tools,libc-dev-bin))" +override_dh_auto_clean: + dh_auto_clean + rm -f src/.depend src/pod2htmd.tmp + + override_dh_dwz: + dh_dwz -X/usr/bin/supermin + %: dh $@ --with=ocaml