diff -Nru tar-1.29/debian/changelog tar-1.29/debian/changelog
--- tar-1.29/debian/changelog	2016-05-17 20:01:07.000000000 +0000
+++ tar-1.29/debian/changelog	2016-06-04 13:25:41.000000000 +0000
@@ -1,3 +1,10 @@
+tar (1.29-1+rpi1) stretch-staging; urgency=medium
+
+  [changes brought forward from 1.28-2.2+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Mon, 09 May 2016 00:59:15 +0000]
+  * Disable testsuite.
+
+ -- Raspbian forward porter <root@raspbian.org>  Sat, 04 Jun 2016 13:25:40 +0000
+
 tar (1.29-1) unstable; urgency=medium
 
   * new upstream version, closes: #816072
diff -Nru tar-1.29/debian/rules tar-1.29/debian/rules
--- tar-1.29/debian/rules	2016-05-17 20:01:07.000000000 +0000
+++ tar-1.29/debian/rules	2016-06-04 13:25:41.000000000 +0000
@@ -40,17 +40,17 @@
 	RSH="/usr/bin/rsh" CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)" \
 		LDFLAGS="$(LDFLAGS)" $(MAKE)
 
-ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
-ifeq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
-	@runas=`whoami` ; \
-	if test $$runas = "root" ; \
-	then \
-	  echo "Sorry, but the test suite is not designed to be run as root."; \
-	  exit 1 ;\
-	fi
-	$(MAKE) check
-endif
-endif
+#ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
+#ifeq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
+#	@runas=`whoami` ; \
+#	if test $$runas = "root" ; \
+#	then \
+#	  echo "Sorry, but the test suite is not designed to be run as root."; \
+#	  exit 1 ;\
+#	fi
+#	$(MAKE) check
+#endif
+#endif
 
 	perl debian/tarman > debian/tar.1
 	touch build-stamp