This is an automated email from the git hooks/post-receive script. daube-guest pushed a commit to branch master in repository libzstd.
commit 2eaaf760bbc317367afae9593c1168bb42b8bca5 Author: Kevin Murray <s...@kdmurray.id.au> Date: Sun Oct 16 18:53:44 2016 +1100 refresh patches --- debian/patches/0001-Skip-long-running-tests.patch | 8 ++++-- debian/patches/0002-Build-lib-by-default.patch | 8 ++++-- .../0004-Add-symlinks-for-extra-manpages.patch | 24 ++++++++-------- .../patches/0004-Use-already-built-libzstd.a.patch | 32 ++++++++++++++++++++++ debian/patches/series | 1 + 5 files changed, 56 insertions(+), 17 deletions(-) diff --git a/debian/patches/0001-Skip-long-running-tests.patch b/debian/patches/0001-Skip-long-running-tests.patch index 9db1c04..1f2ee59 100644 --- a/debian/patches/0001-Skip-long-running-tests.patch +++ b/debian/patches/0001-Skip-long-running-tests.patch @@ -3,12 +3,14 @@ Date: Tue, 1 Dec 2015 14:40:58 +1100 Subject: Skip long-running tests --- - programs/Makefile | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) + tests/Makefile | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +diff --git a/tests/Makefile b/tests/Makefile +index 3ce9f31..4614a9c 100644 --- a/tests/Makefile +++ b/tests/Makefile -@@ -184,11 +184,11 @@ +@@ -184,11 +184,11 @@ ifneq (,$(filter $(HOST_OS),MSYS POSIX)) zstd-playTests: datagen ZSTD=$(ZSTD) ./playTests.sh $(ZSTDRTTEST) diff --git a/debian/patches/0002-Build-lib-by-default.patch b/debian/patches/0002-Build-lib-by-default.patch index 12fec82..2ace5f6 100644 --- a/debian/patches/0002-Build-lib-by-default.patch +++ b/debian/patches/0002-Build-lib-by-default.patch @@ -3,12 +3,14 @@ Date: Tue, 1 Dec 2015 14:52:40 +1100 Subject: Build lib by default --- - Makefile | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) + Makefile | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) +diff --git a/Makefile b/Makefile +index ac0c583..b5c05b5 100644 --- a/Makefile +++ b/Makefile -@@ -21,12 +21,12 @@ +@@ -22,12 +22,12 @@ endif .PHONY: default all zlibwrapper zstd clean install uninstall travis-install test clangtest gpptest armtest usan asan uasan diff --git a/debian/patches/0004-Add-symlinks-for-extra-manpages.patch b/debian/patches/0004-Add-symlinks-for-extra-manpages.patch index 2d0ad1b..cd45a63 100644 --- a/debian/patches/0004-Add-symlinks-for-extra-manpages.patch +++ b/debian/patches/0004-Add-symlinks-for-extra-manpages.patch @@ -3,16 +3,17 @@ Date: Tue, 22 Dec 2015 12:24:27 +1100 Subject: Add symlinks for extra manpages --- - programs/unzstd.1 | 1 + - programs/zstdcat.1 | 1 + - 2 files changed, 2 insertions(+) - create mode 120000 programs/unzstd.1 - create mode 120000 programs/zstdcat.1 + 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 -Index: libzstd/programs/unzstd.1 -=================================================================== +diff --git a/programs/unzstd.1 b/programs/unzstd.1 +new file mode 100644 +index 0000000..5ccdf8a --- /dev/null -+++ libzstd/programs/unzstd.1 ++++ b/programs/unzstd.1 @@ -0,0 +1,92 @@ +\" +\" zstd.1: This is a manual page for 'zstd' program. This file is part of the @@ -106,10 +107,11 @@ Index: libzstd/programs/unzstd.1 + +.SH AUTHOR +Yann Collet -Index: libzstd/programs/zstdcat.1 -=================================================================== +diff --git a/programs/zstdcat.1 b/programs/zstdcat.1 +new file mode 100644 +index 0000000..5ccdf8a --- /dev/null -+++ libzstd/programs/zstdcat.1 ++++ b/programs/zstdcat.1 @@ -0,0 +1,92 @@ +\" +\" zstd.1: This is a manual page for 'zstd' program. This file is part of the diff --git a/debian/patches/0004-Use-already-built-libzstd.a.patch b/debian/patches/0004-Use-already-built-libzstd.a.patch new file mode 100644 index 0000000..e88875e --- /dev/null +++ b/debian/patches/0004-Use-already-built-libzstd.a.patch @@ -0,0 +1,32 @@ +From: Kevin Murray <s...@kdmurray.id.au> +Date: Sun, 16 Oct 2016 18:44:14 +1100 +Subject: Use already-built libzstd.a + +--- + contrib/pzstd/Makefile | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +diff --git a/contrib/pzstd/Makefile b/contrib/pzstd/Makefile +index e30be0b..3bc4564 100644 +--- a/contrib/pzstd/Makefile ++++ b/contrib/pzstd/Makefile +@@ -37,9 +37,8 @@ default: pzstd + all: pzstd + + +-libzstd.a: $(ZSTD_FILES) ++$(ZSTDDIR)/libzstd.a: $(ZSTD_FILES) + $(MAKE) -C $(ZSTDDIR) libzstd +- @cp $(ZSTDDIR)/libzstd.a . + + Pzstd.o: Pzstd.h Pzstd.cpp ErrorHolder.h utils/*.h + $(CXX) $(FLAGS) -c Pzstd.cpp -o $@ +@@ -53,7 +52,7 @@ Options.o: Options.h Options.cpp + main.o: main.cpp *.h utils/*.h + $(CXX) $(FLAGS) -c main.cpp -o $@ + +-pzstd: Pzstd.o SkippableFrame.o Options.o main.o libzstd.a ++pzstd: Pzstd.o SkippableFrame.o Options.o main.o $(ZSTDDIR)/libzstd.a + $(CXX) $(FLAGS) $^ -o $@$(EXT) -lpthread + + libzstd32.a: $(ZSTD_FILES) diff --git a/debian/patches/series b/debian/patches/series index 8c045c0..1aca2f4 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,4 @@ 0001-Skip-long-running-tests.patch 0002-Build-lib-by-default.patch 0004-Add-symlinks-for-extra-manpages.patch +0004-Use-already-built-libzstd.a.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/libzstd.git _______________________________________________ debian-med-commit mailing list debian-med-commit@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit