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

satta pushed a commit to branch master
in repository libzstd.

commit 217ce051cf47fd51ab56f56fe356e595f13d7b16
Author: Sascha Steinbiss <sa...@debian.org>
Date:   Fri Jan 13 13:38:11 2017 +0000

    new upstream version, adapt patches
---
 debian/changelog                                   |  7 ++
 debian/patches/0001-Skip-long-running-tests.patch  | 14 ++--
 debian/patches/0002-Build-lib-by-default.patch     | 10 ++-
 ...-Ensure-CPPFLAGS-makes-it-to-the-compiler.patch | 83 +++++++++-------------
 4 files changed, 52 insertions(+), 62 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b68c0b9..0f0424f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libzstd (1.1.2-1) unstable; urgency=medium
+
+  * Team upload.
+  * New upstream version 1.1.2
+
+ -- Sascha Steinbiss <sa...@debian.org>  Fri, 13 Jan 2017 12:48:37 +0000
+
 libzstd (1.1.1-1) unstable; urgency=medium
 
   * New upstream version 1.1.1 (Closes: #844248)
diff --git a/debian/patches/0001-Skip-long-running-tests.patch 
b/debian/patches/0001-Skip-long-running-tests.patch
index cd109c5..0f72c2a 100644
--- a/debian/patches/0001-Skip-long-running-tests.patch
+++ b/debian/patches/0001-Skip-long-running-tests.patch
@@ -6,18 +6,16 @@ Subject: Skip long-running tests
  tests/Makefile | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
-diff --git a/tests/Makefile b/tests/Makefile
-index ecff182..5fe05cb 100644
 --- a/tests/Makefile
 +++ b/tests/Makefile
-@@ -169,11 +169,11 @@ ifneq (,$(filter $(HOST_OS),MSYS POSIX))
- zstd-playTests: datagen
-       ZSTD=$(ZSTD) ./playTests.sh $(ZSTDRTTEST)
+@@ -183,11 +183,11 @@
+       file $(ZSTD)
+       ZSTD="$(QEMU_SYS) $(ZSTD)" ./playTests.sh $(ZSTDRTTEST)
  
--test: test-zstd test-fullbench test-fuzzer test-zbuff test-zstream
-+test: test-zstd test-zbuff test-zstream
+-test: test-zstd test-fullbench test-fuzzer test-zstream test-longmatch
++test: test-zstd test-zstream
  
- test32: test-zstd32 test-fullbench32 test-fuzzer32 test-zbuff32 test-zstream32
+ test32: test-zstd32 test-fullbench32 test-fuzzer32 test-zstream32
  
 -test-all: test test32 valgrindTest
 +test-all: test
diff --git a/debian/patches/0002-Build-lib-by-default.patch 
b/debian/patches/0002-Build-lib-by-default.patch
index fcd23b4..0c03c7b 100644
--- a/debian/patches/0002-Build-lib-by-default.patch
+++ b/debian/patches/0002-Build-lib-by-default.patch
@@ -6,12 +6,10 @@ Subject: Build lib by default
  Makefile | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
-diff --git a/Makefile b/Makefile
-index 20ae31e..589192a 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -26,8 +26,8 @@ default: libzstd zstd
- 
+@@ -28,8 +28,8 @@
+ .PHONY: all
  all:
        $(MAKE) -C $(ZSTDDIR) $@
 -      $(MAKE) -C $(PRGDIR) $@ zstd32
@@ -19,5 +17,5 @@ index 20ae31e..589192a 100644
 +      $(MAKE) -C $(PRGDIR) $@
 +      $(MAKE) -C $(TESTDIR) $@
  
- libzstd:
-       @$(MAKE) -C $(ZSTDDIR)
+ .PHONY: lib
+ lib:
diff --git a/debian/patches/0005-Ensure-CPPFLAGS-makes-it-to-the-compiler.patch 
b/debian/patches/0005-Ensure-CPPFLAGS-makes-it-to-the-compiler.patch
index 5121b07..13cdc37 100644
--- a/debian/patches/0005-Ensure-CPPFLAGS-makes-it-to-the-compiler.patch
+++ b/debian/patches/0005-Ensure-CPPFLAGS-makes-it-to-the-compiler.patch
@@ -9,57 +9,59 @@ Subject: Ensure CPPFLAGS makes it to the compiler
  zlibWrapper/Makefile |  4 ++--
  4 files changed, 11 insertions(+), 14 deletions(-)
 
-diff --git a/lib/Makefile b/lib/Makefile
-index 1117b49..eecd37f 100644
 --- a/lib/Makefile
 +++ b/lib/Makefile
-@@ -23,9 +23,8 @@ PREFIX ?= /usr/local
+@@ -23,9 +23,8 @@
  LIBDIR ?= $(PREFIX)/lib
  INCLUDEDIR=$(PREFIX)/include
  
--CPPFLAGS= -I. -I./common
--CFLAGS ?= -O3
--CFLAGS += -Wall -Wextra -Wcast-qual -Wcast-align -Wshadow -Wstrict-aliasing=1 
\
-+CPPFLAGS += -I. -I./common
-+CFLAGS += -O3 -Wall -Wextra -Wcast-qual -Wcast-align -Wshadow 
-Wstrict-aliasing=1 \
-           -Wswitch-enum -Wdeclaration-after-statement -Wstrict-prototypes 
-Wundef
- FLAGS   = $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) $(MOREFLAGS)
- 
-@@ -63,10 +62,10 @@ all: clean libzstd
- 
- libzstd: $(ZSTD_FILES)
+-CPPFLAGS+= -I. -I./common -DXXH_NAMESPACE=ZSTD_
+-CFLAGS  ?= -O3
+-CFLAGS  += -Wall -Wextra -Wcast-qual -Wcast-align -Wshadow 
-Wstrict-aliasing=1 \
++CPPFLAGS += -I. -I./common -DXXH_NAMESPACE=ZSTD_
++CFLAGS  += -O3 -Wall -Wextra -Wcast-qual -Wcast-align -Wshadow 
-Wstrict-aliasing=1 \
+            -Wswitch-enum -Wdeclaration-after-statement -Wstrict-prototypes 
-Wundef \
+            -Wpointer-arith
+ CFLAGS  += $(MOREFLAGS)
+@@ -67,17 +66,17 @@
+ libzstd.a: ARFLAGS = rcs
+ libzstd.a: $(ZSTD_FILES)
        @echo compiling static library
 -      @$(CC) $(FLAGS) -c $^
--      @$(AR) rcs $@.a *.o
+-      @$(AR) $(ARFLAGS) $@ *.o
 +      $(CC) $(FLAGS) -c $^
-+      $(AR) rcs $@.a *.o
++      $(AR) $(ARFLAGS) $@ *.o
+ 
+ $(LIBZSTD): LDFLAGS += -shared -fPIC -fvisibility=hidden
+ $(LIBZSTD): $(ZSTD_FILES)
        @echo compiling dynamic library $(LIBVER)
--      @$(CC) $(FLAGS) -shared $^ -fPIC $(SONAME_FLAGS) -o $@.$(SHARED_EXT_VER)
-+      $(CC) $(FLAGS) -shared $^ -fPIC $(SONAME_FLAGS) -o $@.$(SHARED_EXT_VER)
+ ifneq (,$(filter Windows%,$(OS)))
+-      @$(CC) $(FLAGS) -DZSTD_DLL_EXPORT=1 -shared $^ -o dll\libzstd.dll
++      $(CC) $(FLAGS) -DZSTD_DLL_EXPORT=1 -shared $^ -o dll\libzstd.dll
+       dlltool -D dll\libzstd.dll -d dll\libzstd.def -l dll\libzstd.lib
+ else
+-      @$(CC) $(FLAGS) $^ $(LDFLAGS) $(SONAME_FLAGS) -o $@
++      $(CC) $(FLAGS) $^ $(LDFLAGS) $(SONAME_FLAGS) -o $@
        @echo creating versioned links
-       @ln -sf $@.$(SHARED_EXT_VER) $@.$(SHARED_EXT_MAJOR)
-       @ln -sf $@.$(SHARED_EXT_VER) $@.$(SHARED_EXT)
-diff --git a/programs/Makefile b/programs/Makefile
-index f5e625f..c9eddb1 100644
+       @ln -sf $@ libzstd.$(SHARED_EXT_MAJOR)
+       @ln -sf $@ libzstd.$(SHARED_EXT)
 --- a/programs/Makefile
 +++ b/programs/Makefile
-@@ -27,9 +27,8 @@ else
+@@ -27,9 +27,8 @@
  ALIGN_LOOP =
  endif
  
--CPPFLAGS= -I$(ZSTDDIR) -I$(ZSTDDIR)/common -I$(ZSTDDIR)/dictBuilder
--CFLAGS ?= -O3
--CFLAGS += -Wall -Wextra -Wcast-qual -Wcast-align -Wshadow -Wstrict-aliasing=1 
\
+-CPPFLAGS+= -I$(ZSTDDIR) -I$(ZSTDDIR)/common -I$(ZSTDDIR)/dictBuilder
+-CFLAGS  ?= -O3
+-CFLAGS  += -Wall -Wextra -Wcast-qual -Wcast-align -Wshadow 
-Wstrict-aliasing=1 \
 +CPPFLAGS += -I$(ZSTDDIR) -I$(ZSTDDIR)/common -I$(ZSTDDIR)/dictBuilder
-+CFLAGS += -O3 -Wall -Wextra -Wcast-qual -Wcast-align -Wshadow 
-Wstrict-aliasing=1 \
-           -Wswitch-enum -Wdeclaration-after-statement -Wstrict-prototypes 
-Wundef
- CFLAGS += $(MOREFLAGS)
- FLAGS   = $(CPPFLAGS) $(CFLAGS) $(LDFLAGS)
-diff --git a/tests/Makefile b/tests/Makefile
-index 5fe05cb..e2df117 100644
++CFLAGS  += -O3 -Wall -Wextra -Wcast-qual -Wcast-align -Wshadow 
-Wstrict-aliasing=1 \
+           -Wswitch-enum -Wdeclaration-after-statement -Wstrict-prototypes 
-Wundef \
+           -Wpointer-arith
+ CFLAGS  += $(MOREFLAGS)
 --- a/tests/Makefile
 +++ b/tests/Makefile
-@@ -30,9 +30,8 @@ PYTHON ?= python3
+@@ -28,9 +28,8 @@
  TESTARTEFACT := versionsTest namespaceTest
  
  
@@ -71,18 +73,3 @@ index 5fe05cb..e2df117 100644
            -Wswitch-enum -Wdeclaration-after-statement -Wstrict-prototypes 
-Wundef
  CFLAGS += $(MOREFLAGS)
  FLAGS   = $(CPPFLAGS) $(CFLAGS) $(LDFLAGS)
-diff --git a/zlibWrapper/Makefile b/zlibWrapper/Makefile
-index 0e4ca9e..56b5534 100644
---- a/zlibWrapper/Makefile
-+++ b/zlibWrapper/Makefile
-@@ -16,8 +16,8 @@ EXAMPLE_PATH = examples
- PROGRAMS_PATH = ../programs
- TEST_FILE = ../doc/zstd_compression_format.md
- CC ?= gcc
--CFLAGS ?= -O3 
--CFLAGS += $(LOC) -I$(PROGRAMS_PATH) -I$(ZSTDLIBDIR) -I$(ZSTDLIBDIR)/common 
-I$(ZLIBWRAPPER_PATH) -std=gnu99
-+CFLAGS ?= 
-+CFLAGS += $(CPPFLAGS) -O3  $(LOC) -I$(PROGRAMS_PATH) -I$(ZSTDLIBDIR) 
-I$(ZSTDLIBDIR)/common -I$(ZLIBWRAPPER_PATH) -std=gnu99
- CFLAGS += -Wall -Wextra -Wcast-qual -Wcast-align -Wshadow -Wswitch-enum 
-Wdeclaration-after-statement -Wstrict-prototypes -Wundef
- LDFLAGS = $(LOC)
- RM = rm -f

-- 
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

Reply via email to