From: Peter Michael Green <plugwash@raspbian.org>
Date: Thu, 17 May 2018 20:41:22 +0000 (+0000)
Subject: Manual merge of version 1.3.4+dfsg-2+rpi1 and 1.3.4+dfsg-3 to produce 1.3.4+dfsg... 
X-Git-Tag: raspbian/1.3.4+dfsg-3+rpi1
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=4d40954d16ae53ceb399aeed8e9c5a46e8d5887c;p=libzstd.git

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

2de018e7d5884f38211c5e59183af68fb1fe6893
diff --cc debian/changelog
index c35a4fb,5516dc4..1ec3b0a
--- a/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 805c2e2,fa0eca4..4da5e55
--- a/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 406e6bd,85fb0db..6e744b8
--- a/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
 +
 +override_dh_auto_test:
- ifeq ($(DEB_HOST_ARCH),hurd-i386)
- 	make shortest
- else
- 	#dh_auto_test
- endif
++	echo testsuite disabled