Merge branch 'next' into dfsg-debian

diff --git a/debian/changelog b/debian/changelog
index 21c2f8c6c814ccdd8854eb5cf70c4e1ccebf67e2..65fb236cef4cedab87bfda9fac81877e01d210a3 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
-tar (1.29b-2) UNRELEASED; urgency=medium
+tar (1.29b-2) unstable; urgency=medium
 
   * add suggests tar-doc, closes: #856958
+  * dump test results into build log on make check failure for kfreebsd team
 
- -- Bdale Garbee <bdale@gag.com>  Thu, 08 Jun 2017 12:27:13 -0600
+ -- Bdale Garbee <bdale@gag.com>  Thu, 08 Jun 2017 12:20:20 -0600
 
 tar (1.29b-1.1) unstable; urgency=medium
 

diff --git a/debian/rules b/debian/rules
index 6ed8fe2060cf0ee32c0e48594079e16f33de9433..7c2f21c0ca2b40c85364f7ca9332ebba08fea9c1 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -49,7 +49,7 @@ ifeq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
          echo "Sorry, but the test suite is not designed to be run as root."; \
          exit 1 ;\
        fi
-       $(MAKE) check
+       $(MAKE) check || { cat tests/testsuite.log; false; }
 endif
 endif