diff -Nru snapd-2.30/debian/changelog snapd-2.30/debian/changelog
--- snapd-2.30/debian/changelog	2018-02-10 22:18:15.000000000 +0000
+++ snapd-2.30/debian/changelog	2018-02-17 10:25:46.000000000 +0000
@@ -1,3 +1,14 @@
+conflicts found
+debian/rules
+snapd (2.30-5+rpi1) buster-staging; urgency=medium
+
+  [changes brought forward from 2.27.2-2+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Thu, 24 Aug 2017 17:53:18 +0000]
+  * Treat unknown derivatives the same as Debian.
+  * Disable testsuite.
+  * Fix clean target.
+
+ -- Raspbian forward porter <root@raspbian.org>  Sat, 17 Feb 2018 10:25:46 +0000
+
 snapd (2.30-5) unstable; urgency=medium
 
   * Team upload.
diff -Nru snapd-2.30/debian/rules snapd-2.30/debian/rules
--- snapd-2.30/debian/rules	2018-02-10 22:18:15.000000000 +0000
+++ snapd-2.30/debian/rules	2018-02-17 10:25:46.000000000 +0000
@@ -74,12 +74,8 @@
     BUILT_USING_PACKAGES=libcap-dev libapparmor-dev libseccomp-dev
     BUILT_USING=$(shell dpkg-query -f '$${source:Package} (= $${source:Version}), ' -W $(BUILT_USING_PACKAGES))
 else
-ifeq ($(shell dpkg-vendor --query Vendor),Debian)
     VENDOR_ARGS=--enable-nvidia-multiarch
     BUILT_USING=
-else
-    VENDOR_ARGS=--disable-apparmor
-endif
 endif
 
 %:
@@ -147,7 +143,7 @@
 	$(MAKE) -C data all
 
 override_dh_auto_test:
-	dh_auto_test -- $(GCCGOFLAGS)
+	#dh_auto_test -- $(GCCGOFLAGS)
 # 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
@@ -164,7 +160,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:
@@ -213,6 +209,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)"