[med-svn] [libzstd] 04/05: Refresh patches

[Kevin Murray]

This is an automated email from the git hooks/post-receive script.

daube-guest pushed a commit to branch master
in repository libzstd.

commit db2511ad0a37e34b0688afb33f24b11dc1d83629
Author: Kevin Murray <spam at kdmurray.id.au>
Date:   Sun Nov 13 23:08:49 2016 +1100

    Refresh patches
---
 debian/patches/0001-Skip-long-running-tests.patch  |  4 +--
 debian/patches/0002-Build-lib-by-default.patch     | 13 ++-------
 .../patches/0004-Use-already-built-libzstd.a.patch | 32 ----------------------
 debian/patches/series                              |  1 -
 4 files changed, 4 insertions(+), 46 deletions(-)

diff --git a/debian/patches/0001-Skip-long-running-tests.patch b/debian/patches/0001-Skip-long-running-tests.patch
index 1f2ee59..c27d646 100644
--- a/debian/patches/0001-Skip-long-running-tests.patch
+++ b/debian/patches/0001-Skip-long-running-tests.patch
@@ -6,11 +6,9 @@ Subject: Skip long-running tests
  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 @@ ifneq (,$(filter $(HOST_OS),MSYS POSIX))
+@@ -169,11 +169,11 @@
  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 2ace5f6..987a101 100644
--- a/debian/patches/0002-Build-lib-by-default.patch
+++ b/debian/patches/0002-Build-lib-by-default.patch
@@ -6,16 +6,9 @@ Subject: Build lib by default
  Makefile | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
 
-diff --git a/Makefile b/Makefile
-index ac0c583..b5c05b5 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -22,12 +22,12 @@ endif
- 
- .PHONY: default all zlibwrapper zstd clean install uninstall travis-install test clangtest gpptest armtest usan asan uasan
- 
--default: zstd
-+default: all
+@@ -26,8 +26,8 @@
  
  all:
  	$(MAKE) -C $(ZSTDDIR) $@
@@ -24,5 +17,5 @@ index ac0c583..b5c05b5 100644
 +	$(MAKE) -C $(PRGDIR) $@
 +	$(MAKE) -C $(TESTDIR) $@
  
- zstd:
- 	$(MAKE) -C $(PRGDIR)
+ libzstd:
+ 	@$(MAKE) -C $(ZSTDDIR)
diff --git a/debian/patches/0004-Use-already-built-libzstd.a.patch b/debian/patches/0004-Use-already-built-libzstd.a.patch
deleted file mode 100644
index e88875e..0000000
--- a/debian/patches/0004-Use-already-built-libzstd.a.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From: Kevin Murray <spam at 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 eeed273..394d58e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +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
 0005-Add-help2man-d-pzstd-man-file.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/libzstd.git