[med-svn] [libzstd] 05/07: 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 6807b73e126693926735e3a1ade56673de496178
Author: Kevin Murray <spam at kdmurray.id.au>
Date:   Thu Jul 21 11:01:34 2016 +1000

    Refresh patches
---
 debian/patches/0001-Skip-long-running-tests.patch  | 10 +++----
 debian/patches/0002-Build-lib-by-default.patch     |  6 ++--
 .../0003-Use-prefix-of-usr-not-usr-local.patch     | 31 -------------------
 .../0005-Append-to-CPPFLAGS-don-t-overwrite.patch  | 35 ----------------------
 debian/patches/series                              |  2 --
 5 files changed, 8 insertions(+), 76 deletions(-)

diff --git a/debian/patches/0001-Skip-long-running-tests.patch b/debian/patches/0001-Skip-long-running-tests.patch
index c67457c..535fdc8 100644
--- a/debian/patches/0001-Skip-long-running-tests.patch
+++ b/debian/patches/0001-Skip-long-running-tests.patch
@@ -8,9 +8,9 @@ Subject: Skip long-running tests
 
 --- a/programs/Makefile
 +++ b/programs/Makefile
-@@ -177,11 +177,11 @@
- 	[ -f $(DESTDIR)$(MANDIR)/zstd.1 ] && rm -f $(DESTDIR)$(MANDIR)/zstd.1
- 	@echo zstd programs successfully uninstalled
+@@ -210,11 +210,11 @@
+ zstd-playTests: datagen
+ 	ZSTD=$(ZSTD) ./playTests.sh $(ZSTDRTTEST)
  
 -test: test-zstd test-fullbench test-fuzzer test-zbuff
 +test: test-zstd
@@ -21,5 +21,5 @@ Subject: Skip long-running tests
 -test-all: test test32 valgrindTest
 +test-all: test test32
  
- zstd-playTests: datagen
- 	ZSTD=$(ZSTD) ./playTests.sh $(ZSTDRTTEST)
+ test-zstd: ZSTD = ./zstd
+ test-zstd: zstd zstd-playTests
diff --git a/debian/patches/0002-Build-lib-by-default.patch b/debian/patches/0002-Build-lib-by-default.patch
index effd234..f30ca7f 100644
--- a/debian/patches/0002-Build-lib-by-default.patch
+++ b/debian/patches/0002-Build-lib-by-default.patch
@@ -8,14 +8,14 @@ Subject: Build lib by default
 
 --- a/Makefile
 +++ b/Makefile
-@@ -45,7 +45,9 @@
+@@ -43,7 +43,9 @@
  
- .PHONY: default all zstdprogram clean install uninstall travis-install test clangtest gpptest armtest usan asan uasan
+ .PHONY: default all zlibwrapper zstdprogram clean install uninstall travis-install test clangtest gpptest armtest usan asan uasan
  
 -default: zstdprogram
 +default:
 +	$(MAKE) -C $(ZSTDDIR) $@
 +	$(MAKE) -C $(PRGDIR) $@
  
- all: 
+ all:
  	$(MAKE) -C $(ZSTDDIR) $@
diff --git a/debian/patches/0003-Use-prefix-of-usr-not-usr-local.patch b/debian/patches/0003-Use-prefix-of-usr-not-usr-local.patch
deleted file mode 100644
index aa9035f..0000000
--- a/debian/patches/0003-Use-prefix-of-usr-not-usr-local.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From: Kevin Murray <spam at kdmurray.id.au>
-Date: Tue, 8 Dec 2015 11:50:58 +1100
-Subject: Use prefix of /usr not /usr/local
-
----
- lib/Makefile      | 2 +-
- programs/Makefile | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
---- a/lib/Makefile
-+++ b/lib/Makefile
-@@ -42,7 +42,7 @@
- VERSION?= $(LIBVER)
- 
- DESTDIR?=
--PREFIX ?= /usr/local
-+PREFIX ?= /usr
- CPPFLAGS= -I.
- CFLAGS ?= -O3
- CFLAGS += -std=c99 -Wall -Wextra -Wundef -Wshadow -Wcast-qual -Wcast-align -Wstrict-prototypes -Wstrict-aliasing=1
---- a/programs/Makefile
-+++ b/programs/Makefile
-@@ -43,7 +43,7 @@
- VERSION?= $(LIBVER)
- 
- DESTDIR?=
--PREFIX ?= /usr/local
-+PREFIX ?= /usr
- CPPFLAGS= -I../lib -DZSTD_VERSION=\"$(VERSION)\"
- CFLAGS ?= -O3  # -falign-loops=32   # not always beneficial
- CFLAGS += -std=c99 -Wall -Wextra -Wcast-qual -Wcast-align -Wshadow -Wstrict-aliasing=1 -Wswitch-enum -Wstrict-prototypes -Wundef
diff --git a/debian/patches/0005-Append-to-CPPFLAGS-don-t-overwrite.patch b/debian/patches/0005-Append-to-CPPFLAGS-don-t-overwrite.patch
deleted file mode 100644
index 647092f..0000000
--- a/debian/patches/0005-Append-to-CPPFLAGS-don-t-overwrite.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From: Kevin Murray <spam at kdmurray.id.au>
-Date: Tue, 22 Dec 2015 12:31:33 +1100
-Subject: Append to CPPFLAGS, don't overwrite
-
----
- lib/Makefile      | 4 ++--
- programs/Makefile | 4 ++--
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
---- a/lib/Makefile
-+++ b/lib/Makefile
-@@ -43,8 +43,8 @@
- 
- DESTDIR?=
- PREFIX ?= /usr
--CPPFLAGS= -I.
--CFLAGS ?= -O3
-+CPPFLAGS += -I.
-+CFLAGS += -O3
- CFLAGS += -std=c99 -Wall -Wextra -Wundef -Wshadow -Wcast-qual -Wcast-align -Wstrict-prototypes -Wstrict-aliasing=1
- FLAGS   = $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) $(MOREFLAGS)
- 
---- a/programs/Makefile
-+++ b/programs/Makefile
-@@ -44,8 +44,8 @@
- 
- DESTDIR?=
- PREFIX ?= /usr
--CPPFLAGS= -I../lib -DZSTD_VERSION=\"$(VERSION)\"
--CFLAGS ?= -O3  # -falign-loops=32   # not always beneficial
-+CPPFLAGS += -I../lib -DZSTD_VERSION=\"$(VERSION)\"
-+CFLAGS  += -O3  # -falign-loops=32   # not always beneficial
- CFLAGS += -std=c99 -Wall -Wextra -Wcast-qual -Wcast-align -Wshadow -Wstrict-aliasing=1 -Wswitch-enum -Wstrict-prototypes -Wundef
- FLAGS   = $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) $(MOREFLAGS)
- 
diff --git a/debian/patches/series b/debian/patches/series
index 90eb33e..8c045c0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,3 @@
 0001-Skip-long-running-tests.patch
 0002-Build-lib-by-default.patch
-0003-Use-prefix-of-usr-not-usr-local.patch
 0004-Add-symlinks-for-extra-manpages.patch
-0005-Append-to-CPPFLAGS-don-t-overwrite.patch

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