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

diff --cc debian/changelog
index 1ec3b0a20ea2c8e8fcf498ec5925cfc6eac54579,31282c4dfbc12abca0f6324808be4b642fae082b..b678bd02e23e485d03d9cbc5b460e94e8475abda
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,17 +1,24 @@@
- libzstd (1.3.4+dfsg-3+rpi1) buster-staging; urgency=medium
++libzstd (1.3.5+dfsg-1+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.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Tue, 15 May 2018 07:44:56 +0000
++ -- Peter Michael Green <plugwash@raspbian.org>  Fri, 24 Aug 2018 22:12:22 +0000
++
+ libzstd (1.3.5+dfsg-1) unstable; urgency=medium
+ 
+   [ Alexandre Mestiashvili ]
+   * Add attribuition for the patch
+   * Fix varying number of threads in pzstd man page, making build reproducible
+   * New upstream version 1.3.5+dfsg
+   * Refresh and drop patches applied by upstream
+   * Update d/zstd.lintian-overrides
+ 
+   [ Balint Reczey ]
+   * Update symbols file
+   * Allow Invoking `zstd --list` When `stdin` is not a `tty`
+ 
+  -- Alexandre Mestiashvili <mestia@debian.org>  Tue, 21 Aug 2018 15:32:44 +0000
  
  libzstd (1.3.4+dfsg-3) unstable; urgency=medium
  

diff --cc debian/patches/series
index 4da5e5516fef35d06c5d3562ebc4e4d2bbcab75b,81d79fa1010b544274e04e1bd84439010b198501..4cd4bfa83317aa7668f14f8c57a607aaba7d5b3c
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -1,8 -1,5 +1,6 @@@
+ 0001-Allow-Invoking-zstd-list-When-stdin-is-not-a-tty.patch
  0006-Use-bash-for-test-script-portablitity.patch
  0008-Address-embedded-zlib.patch
- 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 6e744b8dc0608d1a25e4f9ab4832f5ffd9303971,3b0f38f236e055c8f8ffd871dc9892a6bf33c5f1..9f37e33dc7e887573925f185a8bebde7191a87f8
--- 1/debian/rules
--- 2/debian/rules
+++ b/debian/rules
@@@ -42,7 -42,5 +42,8 @@@ override_dh_install
  override_dh_installman:
        dh_installman
        mkdir -p $(mandir)
-       $(HELP2MAN) --name='parallelised Zstandard compression, al la pigz' contrib/pzstd/pzstd >$(mandir)/pzstd.1
+       $(HELP2MAN) --name='parallelised Zstandard compression, al la pigz' contrib/pzstd/pzstd \
+       | perl -pe 's/(\(de\)compression\s\(default:)(\d+)(\))/$$1 All$$3/g' >$(mandir)/pzstd.1
 +
 +override_dh_auto_test:
 +      echo testsuite disabled