[med-svn] [libzstd] 04/07: Remove unnecessary patch; refresh patches

Kevin Murray daube-guest at moszumanska.debian.org
Thu Mar 17 10:55:37 UTC 2016 

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

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

commit 17c6cad0b85f3d024a4ae6a86f5a8c7b48c7ec93
Author: Kevin Murray <spam at kdmurray.id.au>
Date:   Mon Feb 22 09:02:34 2016 +1100

    Remove unnecessary patch; refresh patches
---
 debian/patches/0001-Skip-long-running-tests.patch   |  4 ++--
 debian/patches/0002-Build-lib-by-default.patch      |  4 +---
 .../0003-Use-prefix-of-usr-not-usr-local.patch      | 16 ++++++----------
 .../0005-Append-to-CPPFLAGS-don-t-overwrite.patch   | 16 ++++++----------
 ...-hard-coded-date-from-zstd-welcome-message.patch | 21 ---------------------
 debian/patches/series                               |  1 -
 6 files changed, 15 insertions(+), 47 deletions(-)

diff --git a/debian/patches/0001-Skip-long-running-tests.patch b/debian/patches/0001-Skip-long-running-tests.patch
index f1df5f7..c67457c 100644
--- a/debian/patches/0001-Skip-long-running-tests.patch
+++ b/debian/patches/0001-Skip-long-running-tests.patch
@@ -8,7 +8,7 @@ Subject: Skip long-running tests
 
 --- a/programs/Makefile
 +++ b/programs/Makefile
-@@ -162,11 +162,11 @@
+@@ -177,11 +177,11 @@
  	[ -f $(DESTDIR)$(MANDIR)/zstd.1 ] && rm -f $(DESTDIR)$(MANDIR)/zstd.1
  	@echo zstd programs successfully uninstalled
  
@@ -22,4 +22,4 @@ Subject: Skip long-running tests
 +test-all: test test32
  
  zstd-playTests: datagen
- 	ZSTD=$(ZSTD) ./playTests.sh --test-large-data
+ 	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 faca394..effd234 100644
--- a/debian/patches/0002-Build-lib-by-default.patch
+++ b/debian/patches/0002-Build-lib-by-default.patch
@@ -6,11 +6,9 @@ Subject: Build lib by default
  Makefile | 4 +++-
  1 file changed, 3 insertions(+), 1 deletion(-)
 
-diff --git a/Makefile b/Makefile
-index 4ec4a79..9bd1d80 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -46,7 +46,9 @@ endif
+@@ -45,7 +45,9 @@
  
  .PHONY: default all zstdprogram clean install uninstall travis-install test clangtest gpptest armtest usan asan uasan
  
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 cc58173..aa9035f 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,11 +7,9 @@ Subject: Use prefix of /usr not /usr/local
  programs/Makefile | 2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)
 
-Index: libzstd/lib/Makefile
-===================================================================
---- libzstd.orig/lib/Makefile
-+++ libzstd/lib/Makefile
-@@ -43,7 +43,7 @@ LIBVER := $(shell echo $(LIBVER_SCRIPT))
+--- a/lib/Makefile
++++ b/lib/Makefile
+@@ -42,7 +42,7 @@
  VERSION?= $(LIBVER)
  
  DESTDIR?=
@@ -20,11 +18,9 @@ Index: libzstd/lib/Makefile
  CPPFLAGS= -I.
  CFLAGS ?= -O3
  CFLAGS += -std=c99 -Wall -Wextra -Wundef -Wshadow -Wcast-qual -Wcast-align -Wstrict-prototypes -Wstrict-aliasing=1
-Index: libzstd/programs/Makefile
-===================================================================
---- libzstd.orig/programs/Makefile
-+++ libzstd/programs/Makefile
-@@ -42,7 +42,7 @@ LIBVER := $(shell echo $(LIBVER_SCRIPT))
+--- a/programs/Makefile
++++ b/programs/Makefile
+@@ -43,7 +43,7 @@
  VERSION?= $(LIBVER)
  
  DESTDIR?=
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 02de3f6..647092f 100644
--- a/debian/patches/0005-Append-to-CPPFLAGS-don-t-overwrite.patch
+++ b/debian/patches/0005-Append-to-CPPFLAGS-don-t-overwrite.patch
@@ -7,11 +7,9 @@ Subject: Append to CPPFLAGS, don't overwrite
  programs/Makefile | 4 ++--
  2 files changed, 4 insertions(+), 4 deletions(-)
 
-Index: libzstd/lib/Makefile
-===================================================================
---- libzstd.orig/lib/Makefile
-+++ libzstd/lib/Makefile
-@@ -44,8 +44,8 @@ VERSION?= $(LIBVER)
+--- a/lib/Makefile
++++ b/lib/Makefile
+@@ -43,8 +43,8 @@
  
  DESTDIR?=
  PREFIX ?= /usr
@@ -22,11 +20,9 @@ Index: libzstd/lib/Makefile
  CFLAGS += -std=c99 -Wall -Wextra -Wundef -Wshadow -Wcast-qual -Wcast-align -Wstrict-prototypes -Wstrict-aliasing=1
  FLAGS   = $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) $(MOREFLAGS)
  
-Index: libzstd/programs/Makefile
-===================================================================
---- libzstd.orig/programs/Makefile
-+++ libzstd/programs/Makefile
-@@ -43,8 +43,8 @@ VERSION?= $(LIBVER)
+--- a/programs/Makefile
++++ b/programs/Makefile
+@@ -44,8 +44,8 @@
  
  DESTDIR?=
  PREFIX ?= /usr
diff --git a/debian/patches/0006-Remove-hard-coded-date-from-zstd-welcome-message.patch b/debian/patches/0006-Remove-hard-coded-date-from-zstd-welcome-message.patch
deleted file mode 100644
index a418a0c..0000000
--- a/debian/patches/0006-Remove-hard-coded-date-from-zstd-welcome-message.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: Kevin Murray <spam at kdmurray.id.au>
-Date: Wed, 3 Feb 2016 11:24:22 +0200
-Subject: Remove hard-coded date from zstd welcome message
-
----
- programs/zstdcli.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/programs/zstdcli.c b/programs/zstdcli.c
-index 564686c..46f1072 100644
---- a/programs/zstdcli.c
-+++ b/programs/zstdcli.c
-@@ -78,7 +78,7 @@
- #  define ZSTD_VERSION "v" EXPAND_AND_QUOTE(ZSTD_VERSION_MAJOR) "." EXPAND_AND_QUOTE(ZSTD_VERSION_MINOR) "." EXPAND_AND_QUOTE(ZSTD_VERSION_RELEASE)
- #endif
- #define AUTHOR "Yann Collet"
--#define WELCOME_MESSAGE "*** %s %i-bits %s, by %s (%s) ***\n", COMPRESSOR_NAME, (int)(sizeof(void*)*8), ZSTD_VERSION, AUTHOR, __DATE__
-+#define WELCOME_MESSAGE "*** %s %i-bits %s, by %s ***\n", COMPRESSOR_NAME, (int)(sizeof(void*)*8), ZSTD_VERSION, AUTHOR
- #define ZSTD_EXTENSION ".zst"
- #define ZSTD_CAT "zstdcat"
- #define ZSTD_UNZSTD "unzstd"
diff --git a/debian/patches/series b/debian/patches/series
index 77b0f2a..90eb33e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,4 +3,3 @@
 0003-Use-prefix-of-usr-not-usr-local.patch
 0004-Add-symlinks-for-extra-manpages.patch
 0005-Append-to-CPPFLAGS-don-t-overwrite.patch
-0006-Remove-hard-coded-date-from-zstd-welcome-message.patch

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

More information about the debian-med-commit mailing list