debian/changelog

+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.

debian/control

@@ -5,8 +5,11 @@ Uploaders: Kevin Murray <kdmfoss@gmail.com>,
            Alexandre Mestiashvili <mestia@debian.org>
 Section: libs
 Priority: optional
-Build-Depends: debhelper (>= 11),
-               d-shlibs,
+Build-Depends: d-shlibs,
+               debhelper (>= 11),
+               help2man,
+               liblz4-dev,
+               liblzma-dev,
                zlib1g-dev
 Standards-Version: 4.1.4
 Vcs-Browser: https://salsa.debian.org/med-team/libzstd
@@ -17,8 +20,7 @@ Package: libzstd-dev
 Architecture: any
 Multi-Arch: same
 Section: libdevel
-Depends: libzstd1 (= ${binary:Version}),
-         ${misc:Depends}
+Depends: libzstd1 (= ${binary:Version}), ${misc:Depends}
 Description: fast lossless compression algorithm -- development files
  Zstd, short for Zstandard, is a fast lossless compression algorithm, targeting
  real-time compression scenarios at zlib-level compression ratio.
@@ -29,8 +31,7 @@ Package: libzstd1
 Architecture: any
 Multi-Arch: same
 Section: libs
-Depends: ${shlibs:Depends},
-         ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: fast lossless compression algorithm
  Zstd, short for Zstandard, is a fast lossless compression algorithm, targeting
  real-time compression scenarios at zlib-level compression ratio.
@@ -40,8 +41,7 @@ Description: fast lossless compression algorithm
 Package: zstd
 Architecture: any
 Section: utils
-Depends: ${shlibs:Depends},
-         ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: fast lossless compression algorithm -- CLI tool
  Zstd, short for Zstandard, is a fast lossless compression algorithm, targeting
  real-time compression scenarios at zlib-level compression ratio.

debian/patches/0003-Add-symlinks-for-extra-manpages.patch

-From: Kevin Murray <spam@kdmurray.id.au>
-Date: Tue, 22 Dec 2015 12:24:27 +1100
-Subject: Add symlinks for extra manpages
-
----
- programs/unzstd.1  | 92 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
- programs/zstdcat.1 | 92 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
- 2 files changed, 184 insertions(+)
- create mode 100644 programs/unzstd.1
- create mode 100644 programs/zstdcat.1
-
---- /dev/null
-+++ libzstd/programs/unzstd.1
-@@ -0,0 +1,92 @@
-+\"
-+\" zstd.1: This is a manual page for 'zstd' program. This file is part of the
-+\" zstd <http://www.zstd.net/> project.
-+\" Author: Yann Collet
-+\"
-+
-+\" No hyphenation
-+.hy 0
-+.nr HY 0
-+
-+.TH zstd "1" "2015-08-22" "zstd" "User Commands"
-+.SH NAME
-+\fBzstd, unzstd, zstdcat\fR - Compress or decompress .zst files
-+
-+.SH SYNOPSIS
-+.TP 5
-+\fBzstd\fR [\fBOPTIONS\fR] [-|INPUT-FILE] <OUTPUT-FILE>
-+.PP
-+.B unzstd
-+is equivalent to
-+.BR "zstd \-d" 
-+.br
-+.B zstdcat
-+is equivalent to
-+.BR "zstd \-dc" 
-+.br
-+
-+.SH DESCRIPTION
-+.PP
-+\fBzstd\fR is a fast lossless compression algorithm.
-+It is based on the \fBLZ77\fR family, with FSE & huff0 entropy stage.
-+zstd offers compression speed > 200 MB/s per core.
-+It also features a fast decoder, with speed > 500 MB/s per core.
-+
-+\fBzstd\fR command line is generally similar to gzip, but features the following differences :
-+ - Original files are preserved
-+ - By default, \fBzstd file1 file2\fR means : compress file1 \fBinto\fR file2.
-+     Use \fB-m\fR command if you want : compress file1 into file1.zstd and file2 into file2.zst
-+ - By default, when compressing files, \fBzstd\fR displays advancement notification and result summary.
-+     Use \fB-q\fR to turn them off
-+
-+
-+\fBzstd\fR supports the following options :
-+
-+.SH OPTIONS
-+.TP
-+.B \-#
-+ # compression level [1-19](default:1)
-+.TP
-+.B \-d
-+ decompression
-+.TP
-+.B \-f
-+ overwrite output without prompting
-+.TP
-+.BR \-m ", " --multiple
-+ multiple files mode
-+ In this mode, multiple files on the command line means compression or decompression of each named file
-+ Notifications are also turned off by default
-+.TP
-+.B \-D
-+ Use next file as dictionary content for compress / decompression
-+.TP
-+.BR \-h/\-H ", " --help
-+ display help/long help and exit
-+.TP
-+.BR \-V ", " --version
-+ display Version number and exit
-+.TP
-+.BR \-v ", " --verbose
-+ verbose mode
-+.TP
-+.BR \-q ", " --quiet
-+ suppress warnings and notifications; specify twice to suppress errors too
-+.TP
-+.B \-c 
-+ force write to standard output, even if it is the console
-+.TP
-+.B \-z
-+ force compression
-+.TP
-+.B \-b#
-+ benchmark file(s) using compression level #
-+.TP
-+.B \-i#
-+ iteration loops [1-9](default : 3), benchmark mode only
-+
-+.SH BUGS
-+Report bugs at:- https://github.com/facebook/zstd/issues
-+
-+.SH AUTHOR
-+Yann Collet
---- /dev/null
-+++ libzstd/programs/zstdcat.1
-@@ -0,0 +1,92 @@
-+\"
-+\" zstd.1: This is a manual page for 'zstd' program. This file is part of the
-+\" zstd <http://www.zstd.net/> project.
-+\" Author: Yann Collet
-+\"
-+
-+\" No hyphenation
-+.hy 0
-+.nr HY 0
-+
-+.TH zstd "1" "2015-08-22" "zstd" "User Commands"
-+.SH NAME
-+\fBzstd, unzstd, zstdcat\fR - Compress or decompress .zst files
-+
-+.SH SYNOPSIS
-+.TP 5
-+\fBzstd\fR [\fBOPTIONS\fR] [-|INPUT-FILE] <OUTPUT-FILE>
-+.PP
-+.B unzstd
-+is equivalent to
-+.BR "zstd \-d" 
-+.br
-+.B zstdcat
-+is equivalent to
-+.BR "zstd \-dc" 
-+.br
-+
-+.SH DESCRIPTION
-+.PP
-+\fBzstd\fR is a fast lossless compression algorithm.
-+It is based on the \fBLZ77\fR family, with FSE & huff0 entropy stage.
-+zstd offers compression speed > 200 MB/s per core.
-+It also features a fast decoder, with speed > 500 MB/s per core.
-+
-+\fBzstd\fR command line is generally similar to gzip, but features the following differences :
-+ - Original files are preserved
-+ - By default, \fBzstd file1 file2\fR means : compress file1 \fBinto\fR file2.
-+     Use \fB-m\fR command if you want : compress file1 into file1.zstd and file2 into file2.zst
-+ - By default, when compressing files, \fBzstd\fR displays advancement notification and result summary.
-+     Use \fB-q\fR to turn them off
-+
-+
-+\fBzstd\fR supports the following options :
-+
-+.SH OPTIONS
-+.TP
-+.B \-#
-+ # compression level [1-19](default:1)
-+.TP
-+.B \-d
-+ decompression
-+.TP
-+.B \-f
-+ overwrite output without prompting
-+.TP
-+.BR \-m ", " --multiple
-+ multiple files mode
-+ In this mode, multiple files on the command line means compression or decompression of each named file
-+ Notifications are also turned off by default
-+.TP
-+.B \-D
-+ Use next file as dictionary content for compress / decompression
-+.TP
-+.BR \-h/\-H ", " --help
-+ display help/long help and exit
-+.TP
-+.BR \-V ", " --version
-+ display Version number and exit
-+.TP
-+.BR \-v ", " --verbose
-+ verbose mode
-+.TP
-+.BR \-q ", " --quiet
-+ suppress warnings and notifications; specify twice to suppress errors too
-+.TP
-+.B \-c 
-+ force write to standard output, even if it is the console
-+.TP
-+.B \-z
-+ force compression
-+.TP
-+.B \-b#
-+ benchmark file(s) using compression level #
-+.TP
-+.B \-i#
-+ iteration loops [1-9](default : 3), benchmark mode only
-+
-+.SH BUGS
-+Report bugs at:- https://github.com/facebook/zstd/issues
-+
-+.SH AUTHOR
-+Yann Collet

debian/patches/0004-Add-help2man-d-pzstd-man-file.patch

-From: Kevin Murray <spam@kdmurray.id.au>
-Date: Mon, 17 Oct 2016 08:09:13 +1100
-Subject: Add help2man'd pzstd man file
-
----
- contrib/pzstd/pzstd.1 | 76 +++++++++++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 76 insertions(+)
- create mode 100644 contrib/pzstd/pzstd.1
-
---- /dev/null
-+++ libzstd/contrib/pzstd/pzstd.1
-@@ -0,0 +1,76 @@
-+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.4.
-+.TH PZSTD "1" "October 2016" "PZSTD version: 1.1.0." "User Commands"
-+.SH NAME
-+PZSTD \- parallelised Zstandard compression, al la pigz
-+.SH DESCRIPTION
-+.SS "Usage:"
-+.IP
-+pzstd [args] [FILE(s)]
-+.SS "Parallel ZSTD options:"
-+.TP
-+\fB\-p\fR, \fB\-\-processes\fR
-+#    : number of threads to use for (de)compression (default:4)
-+.SS "ZSTD options:"
-+.TP
-+\-#
-+: # compression level (1\-19, default:3)
-+.TP
-+\fB\-d\fR, \fB\-\-decompress\fR
-+: decompression
-+.TP
-+\fB\-o\fR
-+file : result stored into `file` (only if 1 input file)
-+.TP
-+\fB\-f\fR, \fB\-\-force\fR
-+: overwrite output without prompting
-+.TP
-+\fB\-\-rm\fR
-+: remove source file(s) after successful (de)compression
-+.TP
-+\fB\-k\fR, \fB\-\-keep\fR
-+: preserve source file(s) (default)
-+.TP
-+\fB\-h\fR, \fB\-\-help\fR
-+: display help and exit
-+.TP
-+\fB\-V\fR, \fB\-\-version\fR
-+: display version number and exit
-+.TP
-+\fB\-v\fR, \fB\-\-verbose\fR
-+: verbose mode; specify multiple times to increase log level (default:2)
-+.TP
-+\fB\-q\fR, \fB\-\-quiet\fR
-+: suppress warnings; specify twice to suppress errors too
-+.TP
-+\fB\-c\fR, \fB\-\-stdout\fR
-+: force write to standard output, even if it is the console
-+.TP
-+\fB\-r\fR
-+: operate recursively on directories
-+.TP
-+\fB\-\-ultra\fR
-+: enable levels beyond 19, up to 22 (requires more memory)
-+.TP
-+\fB\-C\fR, \fB\-\-check\fR
-+: integrity check (default)
-+.TP
-+\fB\-\-no\-check\fR
-+: no integrity check
-+.TP
-+\fB\-t\fR, \fB\-\-test\fR
-+: test compressed file integrity
-+.TP
-+\fB\-\-\fR
-+: all arguments after "\-\-" are treated as files
-+.SH "SEE ALSO"
-+The full documentation for
-+.B PZSTD
-+is maintained as a Texinfo manual.  If the
-+.B info
-+and
-+.B PZSTD
-+programs are properly installed at your site, the command
-+.IP
-+.B info PZSTD
-+.PP
-+should give you access to the complete manual.

debian/patches/0012-typos.patch

 Description: Fix typo in zstd man page s/minumum/minimum/
 From: Alex Mestiashvili <mailatgoogl@gmail.com>
+Forwarded: https://github.com/facebook/zstd/issues/1115
 --- libzstd.orig/programs/zstd.1.md
 +++ libzstd/programs/zstd.1.md
 @@ -392,7 +392,7 @@

debian/patches/0013-skip-memory-greedy-tests.patch

+Subject: Skip memory heavy tests causing FTBFS on mips and mipsel buildds
+From: Alex Mestiashvili <mestia@debian.org>
+--- libzstd.orig/tests/playTests.sh
++++ libzstd/tests/playTests.sh
+@@ -761,9 +761,15 @@
+     $ECHO "\n===>   zstdmt long round-trip tests "
+     roundTripTest -g80000000 -P99 "19 -T2" " "
+     roundTripTest -g5000000000 -P99 "1 -T2" " "
+-    roundTripTest -g500000000 -P97 "1 -T999" " "
+-    fileRoundTripTest -g4103M -P98 " -T0" " "
+-    roundTripTest -g400000000 -P97 "1 --long=24 -T2" " "
++	DEBARCH=$(dpkg-architecture -qDEB_HOST_ARCH)
++	if [ "$DEBARCH" != 'mips' -a "$DEBARCH" != 'mipsel' ]
++    then
++        roundTripTest -g500000000 -P97 "1 -T999" " "
++        fileRoundTripTest -g4103M -P98 " -T0" " "
++        roundTripTest -g400000000 -P97 "1 --long=24 -T2" " "
++    else
++        $ECHO "\n**** skip memory greedy tests on $DEBARCH **** "
++    fi
+ else
+     $ECHO "\n**** no multithreading, skipping zstdmt tests **** "
+ fi

debian/patches/series

-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
 0012-typos.patch
 pthread.patch
+0013-skip-memory-greedy-tests.patch

debian/rules

@@ -3,11 +3,15 @@
 export DH_VERBOSE=1
 
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
 export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 
 # Upstream's makefiles will respect PREFIX, and this means we avoid a patch
 export PREFIX=/usr
 
+HELP2MAN = help2man --no-info --help-option="'-h'" --no-discard-stderr
+mandir := $(CURDIR)/debian/zstd/usr/share/man/man1
+
 %:
 	dh $@
 
@@ -16,6 +20,10 @@ ifneq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 	DH_AUTO_CONFIGURE_OPTS += -DZSTD_BUILD_TESTS:BOOL=OFF
 endif
 
+override_dh_auto_clean:
+	dh_auto_clean
+	dh_auto_clean --sourcedirectory=contrib/pzstd
+
 override_dh_auto_build:
 	dh_auto_build
 	dh_auto_build --sourcedirectory=contrib/pzstd/ -- pzstd
@@ -31,6 +39,14 @@ override_dh_install:
 				debian/tmp/usr/lib/lib*.so
 	dh_install
 
-override_dh_auto_clean:
-	dh_auto_clean
-	dh_auto_clean --sourcedirectory=contrib/pzstd
+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

debian/zstd.install

-usr/bin
 contrib/pzstd/pzstd usr/bin
+usr/bin

debian/zstd.lintian-overrides

 zstd: binary-without-manpage usr/bin/zstdgrep
 zstd: binary-without-manpage usr/bin/zstdless
 zstd: binary-without-manpage usr/bin/zstdmt
+zstd: binary-without-manpage usr/bin/unzstd
+zstd: binary-without-manpage usr/bin/zstdcat
 zstd: manpage-has-errors-from-man

debian/zstd.manpages

-contrib/pzstd/*.1
-programs/*zstd*.1
+programs/zstd*.1