Manual merge of version 1.3.4+dfsg-2+rpi1 and 1.3.4+dfsg-3 to produce 1.3.4+dfsg...

diff --cc debian/changelog
index c35a4fb2fe3692aefb2c711d83753d9aaa8d9339,5516dc416abdcbf1ae5d16771f01237d003ed505..1ec3b0a20ea2c8e8fcf498ec5925cfc6eac54579
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,11 +1,18 @@@
- libzstd (1.3.4+dfsg-2+rpi1) buster-staging; urgency=medium
++libzstd (1.3.4+dfsg-3+rpi1) buster-staging; urgency=medium
 +
 +  [changes brought forward from 1.3.3+dfsg-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sun, 14 Jan 2018 16:35:02 +0000]
 +  * Disable testsuite.
 +
-  -- Peter Michael green <plugwash@raspbian.org>  Sat, 05 May 2018 11:52:09 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Tue, 15 May 2018 07:44:56 +0000
++
+ libzstd (1.3.4+dfsg-3) unstable; urgency=medium
+ 
+   * Add patch making build reproducible, Closes: #897904
+   * Update patch skipping heavy tests on mips(el) and hurd
+   * Add patch fixing tests on GNU/Hurd
+   * Drop not needed override_dh_auto_test
+ 
+  -- Alexandre Mestiashvili <mestia@debian.org>  Wed, 09 May 2018 13:08:47 +0200
  
  libzstd (1.3.4+dfsg-2) unstable; urgency=medium
  

diff --cc debian/patches/series
index 805c2e29ecc69b6ae839e438a99690c03a97eee2,fa0eca47d6b3cb0c8649ee9620fa54f7d1fc3236..4da5e5516fef35d06c5d3562ebc4e4d2bbcab75b
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -3,4 -3,5 +3,6 @@@
  0012-typos.patch
  pthread.patch
  0013-skip-memory-greedy-tests.patch
+ 0014-Reproducible-build.patch
+ 0015-Non-regular-file-test.patch
 +auto-1.3.3+dfsg-2+rpi1-b6fb80e42fefa1468d8d52ec458ab4fee6f2c12c-1525381460

diff --cc debian/rules
index 406e6bdb1b86be7e08cd08f914febfc64b4b75de,85fb0dbfb9b2474f82ffd7bf72fd4efa945b4ba2..6e744b8dc0608d1a25e4f9ab4832f5ffd9303971
--- 1/debian/rules
--- 2/debian/rules
+++ b/debian/rules
@@@ -43,10 -43,3 +43,6 @@@ override_dh_installman
        dh_installman
        mkdir -p $(mandir)
        $(HELP2MAN) --name='parallelised Zstandard compression, al la pigz' contrib/pzstd/pzstd >$(mandir)/pzstd.1
- ifeq ($(DEB_HOST_ARCH),hurd-i386)
-       make shortest
- else
-       #dh_auto_test
- endif
 +
 +override_dh_auto_test:
++      echo testsuite disabled