[med-svn] [libzstd] 03/04: Refresh patches after new upstream release

[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 a41912b325f19c18b52ae244e3e486ddbfdca5de
Author: Kevin Murray <spam at kdmurray.id.au>
Date:   Tue Dec 22 12:45:51 2015 +1100

    Refresh patches after new upstream release
---
 debian/patches/0001-Skip-long-running-tests.patch            |  6 ++----
 debian/patches/0003-Use-prefix-of-usr-not-usr-local.patch    | 10 +++-------
 debian/patches/0005-Append-to-CPPFLAGS-don-t-overwrite.patch | 12 ++++--------
 3 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/debian/patches/0001-Skip-long-running-tests.patch b/debian/patches/0001-Skip-long-running-tests.patch
index 3b2afb1..f1df5f7 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
  programs/Makefile | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
 
-diff --git a/programs/Makefile b/programs/Makefile
-index 9d73cb9..0921590 100644
 --- a/programs/Makefile
 +++ b/programs/Makefile
-@@ -145,11 +145,11 @@ uninstall:
+@@ -162,11 +162,11 @@
  	[ -f $(DESTDIR)$(MANDIR)/zstd.1 ] && rm -f $(DESTDIR)$(MANDIR)/zstd.1
  	@echo zstd programs successfully uninstalled
  
@@ -24,4 +22,4 @@ index 9d73cb9..0921590 100644
 +test-all: test test32
  
  zstd-playTests: datagen
- 	@echo "\n**** frame concatenation **** "
+ 	ZSTD=$(ZSTD) ./playTests.sh --test-large-data
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
index 6b70dec..8780794 100644
--- a/debian/patches/0003-Use-prefix-of-usr-not-usr-local.patch
+++ b/debian/patches/0003-Use-prefix-of-usr-not-usr-local.patch
@@ -7,25 +7,21 @@ Subject: Use prefix of /usr not /usr/local
  programs/Makefile | 2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)
 
-diff --git a/lib/Makefile b/lib/Makefile
-index 3e34d89..fc05f1a 100644
 --- a/lib/Makefile
 +++ b/lib/Makefile
-@@ -39,7 +39,7 @@ LIBVER  = $(LIBVER_MAJOR).$(LIBVER_MINOR).$(LIBVER_PATCH)
+@@ -39,7 +39,7 @@
  VERSION?= $(LIBVER)
  
  DESTDIR?=
 -PREFIX ?= /usr/local
 +PREFIX ?= /usr
- CPPFLAGS= -I. -I./legacy -DZSTD_LEGACY_SUPPORT=1
+ CPPFLAGS= -I.
  CFLAGS ?= -O3
  CFLAGS += -std=c99 -Wall -Wextra -Wundef -Wshadow -Wcast-qual -Wcast-align -Wstrict-prototypes
-diff --git a/programs/Makefile b/programs/Makefile
-index 0921590..1eadb98 100644
 --- a/programs/Makefile
 +++ b/programs/Makefile
 @@ -33,7 +33,7 @@
- VERSION?= 0.4.0
+ VERSION?= 0.4.5
  
  DESTDIR?=
 -PREFIX ?= /usr/local
diff --git a/debian/patches/0005-Append-to-CPPFLAGS-don-t-overwrite.patch b/debian/patches/0005-Append-to-CPPFLAGS-don-t-overwrite.patch
index b8aeccb..f240954 100644
--- a/debian/patches/0005-Append-to-CPPFLAGS-don-t-overwrite.patch
+++ b/debian/patches/0005-Append-to-CPPFLAGS-don-t-overwrite.patch
@@ -7,26 +7,22 @@ Subject: Append to CPPFLAGS, don't overwrite
  programs/Makefile | 4 ++--
  2 files changed, 4 insertions(+), 4 deletions(-)
 
-diff --git a/lib/Makefile b/lib/Makefile
-index fc05f1a..b45b68e 100644
 --- a/lib/Makefile
 +++ b/lib/Makefile
-@@ -40,8 +40,8 @@ VERSION?= $(LIBVER)
+@@ -40,8 +40,8 @@
  
  DESTDIR?=
  PREFIX ?= /usr
--CPPFLAGS= -I. -I./legacy -DZSTD_LEGACY_SUPPORT=1
+-CPPFLAGS= -I.
 -CFLAGS ?= -O3
-+CPPFLAGS += -I. -I./legacy -DZSTD_LEGACY_SUPPORT=1
++CPPFLAGS += -I.
 +CFLAGS += -O3
  CFLAGS += -std=c99 -Wall -Wextra -Wundef -Wshadow -Wcast-qual -Wcast-align -Wstrict-prototypes
  FLAGS   = $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) $(MOREFLAGS)
  
-diff --git a/programs/Makefile b/programs/Makefile
-index 1eadb98..b4bc672 100644
 --- a/programs/Makefile
 +++ b/programs/Makefile
-@@ -34,8 +34,8 @@ VERSION?= 0.4.0
+@@ -34,8 +34,8 @@
  
  DESTDIR?=
  PREFIX ?= /usr

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