From: Peter Michael Green <plugwash@raspbian.org>
Date: Fri, 24 Aug 2018 22:45:01 +0000 (+0000)
Subject: Manual merge of version 1.3.4+dfsg-3+rpi1 and 1.3.5+dfsg-1 to produce 1.3.5+dfsg... 
X-Git-Tag: archive/raspbian/1.3.5+dfsg-1+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=2581bf7ac43209f1c42f87b3ad794a7eb7cd2ee3;p=libzstd.git

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

2581bf7ac43209f1c42f87b3ad794a7eb7cd2ee3
diff --cc debian/changelog
index 1ec3b0a,31282c4..b678bd0
--- a/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 4da5e55,81d79fa..4cd4bfa
--- a/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 6e744b8,3b0f38f..9f37e33
--- a/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