diff -Nru snapd-2.54.3/debian/changelog snapd-2.54.3/debian/changelog --- snapd-2.54.3/debian/changelog 2022-07-17 12:18:10.000000000 +0000 +++ snapd-2.54.3/debian/changelog 2022-08-05 14:27:48.000000000 +0000 @@ -1,3 +1,12 @@ +snapd (2.54.3-1.1+rpi1) bookworm-staging; urgency=medium + + [changes brought forward from 2.27.2-2+rpi1 by Peter Michael Green at Thu, 24 Aug 2017 17:53:18 +0000] + * Treat unknown derivatives the same as Debian. + * Disable testsuite. + * Fix clean target. + + -- Raspbian forward porter Fri, 05 Aug 2022 14:27:48 +0000 + snapd (2.54.3-1.1) unstable; urgency=medium * Non-maintainer upload. diff -Nru snapd-2.54.3/debian/rules snapd-2.54.3/debian/rules --- snapd-2.54.3/debian/rules 2022-07-17 11:06:03.000000000 +0000 +++ snapd-2.54.3/debian/rules 2022-08-05 14:27:48.000000000 +0000 @@ -96,12 +96,8 @@ endif BUILT_USING_PACKAGES=libcap-dev libapparmor-dev libseccomp-dev else -ifeq ($(shell dpkg-vendor --query Vendor),Debian) VENDOR_ARGS=--enable-nvidia-multiarch BUILT_USING_PACKAGES=libcap-dev -else - VENDOR_ARGS=--disable-apparmor -endif endif BUILT_USING=$(shell dpkg-query -f '$${source:Package} (= $${source:Version}), ' -W $(BUILT_USING_PACKAGES)) @@ -187,7 +183,7 @@ $(MAKE) -C data all override_dh_auto_test: - GO111MODULE=off dh_auto_test -- $(BUILDFLAGS) -tags "$(TAGS)" $(GCCGOFLAGS) $(DH_GOPKG)/... + #GO111MODULE=off dh_auto_test -- $(BUILDFLAGS) -tags "$(TAGS)" $(GCCGOFLAGS) $(DH_GOPKG)/... # a tested default (production) build should have no test keys ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) # check that only the main trusted account-keys are included @@ -204,7 +200,7 @@ endif ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) # run the snap-confine tests - $(MAKE) -C cmd check + #$(MAKE) -C cmd check endif override_dh_install-indep: @@ -279,6 +275,8 @@ override_dh_auto_clean: dh_auto_clean -O--buildsystem=golang rm -vf snap.8 + rm -rf share + rm -f cmd/Makefile.in cmd/VERSION cmd/aclocal.m4 cmd/compile cmd/config.guess cmd/config.h.in cmd/config.sub cmd/configure cmd/depcomp cmd/install-sh cmd/missing cmd/test-driver cmd/version_generated.go data/info po/snappy.pot override_dh_gencontrol: dh_gencontrol -- -VBuilt-Using="$(BUILT_USING)"