From: Peter Michael Green <plugwash@raspbian.org>
Date: Sun, 6 May 2018 00:23:35 +0000 (+0000)
Subject: Manual merge of version 1.3.3+dfsg-2+rpi1 and 1.3.4+dfsg-2 to produce 1.3.4+dfsg... 
X-Git-Tag: archive/raspbian/1.3.4+dfsg-2+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=a72b6190b25b24740bcf5212b975a3779ba0c6d5;p=libzstd.git

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

a72b6190b25b24740bcf5212b975a3779ba0c6d5
diff --cc debian/changelog
index 15272d1,691ab06..c35a4fb
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,33 +1,40 @@@
- libzstd (1.3.3+dfsg-2+rpi1) buster-staging; urgency=medium
++libzstd (1.3.4+dfsg-2+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>  Thu, 03 May 2018 20:47:50 +0000
++ -- Peter Michael green <plugwash@raspbian.org>  Sat, 05 May 2018 11:52:09 +0000
++
+ libzstd (1.3.4+dfsg-2) unstable; urgency=medium
+ 
+   * Add liblzma-dev and liblz4-dev to build-depends to enable xz and lz4 support
+   * Patch tests to avoid FTBFS on mips(el) architectures
+   * Use help2man for pzstd man page, drop patches providing obsolete man pages
+   * Update zstd.lintian-overrides, add more binaries without man pages
+   * Add override for dh_auto_test, on hurd run only simple tests
+   * Update 0012-typos.patch, forward to upstream
+ 
+  -- Alexandre Mestiashvili <mestia@debian.org>  Wed, 02 May 2018 15:43:16 +0200
+ 
+ libzstd (1.3.4+dfsg-1) unstable; urgency=medium
+ 
+   * Team upload.
+ 
+   [ Alexandre Mestiashvili ]
+   * New upstream version 1.3.4+dfsg
+   * Refresh patches, remove indexes
+   * Update d/libzstd1.symbols fixing minimal-version
+   * Update d/copyright, starting from 1.3.1 patent claim is removed
+   * Add comments to unstable symbols
+ 
+   [ Mattia Rizzolo ]
+   * Update copyright after the new upstream release.
+ 
+   [ Sascha Steinbiss ]
+   * Remove obsolete patch.
+   * Reword patch description.
+ 
+  -- Alexandre Mestiashvili <mestia@debian.org>  Wed, 25 Apr 2018 10:39:39 +0200
  
  libzstd (1.3.3+dfsg-2) unstable; urgency=medium
  
diff --cc debian/patches/series
index d7bfc8f,fbcf640..805c2e2
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,8 -1,5 +1,6 @@@
- 0003-Add-symlinks-for-extra-manpages.patch
- 0004-Add-help2man-d-pzstd-man-file.patch
  0006-Use-bash-for-test-script-portablitity.patch
  0008-Address-embedded-zlib.patch
- 0009-Add-shebang-for-scripts.patch
  0012-typos.patch
  pthread.patch
+ 0013-skip-memory-greedy-tests.patch
 +auto-1.3.3+dfsg-2+rpi1-b6fb80e42fefa1468d8d52ec458ab4fee6f2c12c-1525381460
diff --cc debian/rules
index d3fae6b,0c73295..406e6bd
--- a/debian/rules
+++ b/debian/rules
@@@ -31,9 -39,14 +39,14 @@@ override_dh_install
  				debian/tmp/usr/lib/lib*.so
  	dh_install
  
- override_dh_auto_test:
- 	echo testsuite disabled
+ 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_clean:
- 	dh_auto_clean
- 	dh_auto_clean --sourcedirectory=contrib/pzstd
+ override_dh_auto_test:
+ ifeq ($(DEB_HOST_ARCH),hurd-i386)
+ 	make shortest
+ else
 -	dh_auto_test
++	#dh_auto_test
+ endif