[med-svn] [libzstd] 07/08: Do not clean up not existing examples dir

[Andreas Tille]

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

tille pushed a commit to branch master
in repository libzstd.

commit 4a2f2b029170a298072c69ed090d153c8cf06a5d
Author: Andreas Tille <tille at debian.org>
Date:   Wed Sep 6 15:29:08 2017 +0200

    Do not clean up not existing examples dir
---
 debian/patches/0008-Address-embedded-zlib.patch |  4 ++--
 debian/patches/0010-do_not_make_examples.patch  | 25 +++++++++++++++++++++++++
 debian/patches/series                           |  1 +
 3 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/debian/patches/0008-Address-embedded-zlib.patch b/debian/patches/0008-Address-embedded-zlib.patch
index 87a81cb..6ea1b58 100644
--- a/debian/patches/0008-Address-embedded-zlib.patch
+++ b/debian/patches/0008-Address-embedded-zlib.patch
@@ -2,7 +2,7 @@ Description: Fix use of fprintf
 Author: Sascha Steinbiss <satta at debian.org>
 --- a/zlibWrapper/Makefile
 +++ b/zlibWrapper/Makefile
-@@ -13,7 +13,7 @@
+@@ -13,7 +13,7 @@ ZLIB_PATH ?= .
  ZSTDLIBDIR = ../lib
  ZSTDLIBRARY = $(ZSTDLIBDIR)/libzstd.a
  ZLIBWRAPPER_PATH = .
@@ -11,7 +11,7 @@ Author: Sascha Steinbiss <satta at debian.org>
  EXAMPLE_PATH = examples
  PROGRAMS_PATH = ../programs
  TEST_FILE = ../doc/zstd_compression_format.md
-@@ -67,16 +67,16 @@
+@@ -70,16 +70,16 @@ valgrindTest: clean example fitblk examp
  #.c.o:
  #	$(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $<
  
diff --git a/debian/patches/0010-do_not_make_examples.patch b/debian/patches/0010-do_not_make_examples.patch
new file mode 100644
index 0000000..8cb1f69
--- /dev/null
+++ b/debian/patches/0010-do_not_make_examples.patch
@@ -0,0 +1,25 @@
+Author: Andreas Tille <tille at debian.org>
+Last-Update: Wed, 06 Sep 2017 14:57:07 +0200
+Bug-Debian: https://bugs.debian.org/869581
+Descriptions: examples needed to be removed from upstream tarball - do not try to
+ clean this directory which does not exist any more
+
+--- a/Makefile
++++ b/Makefile
+@@ -26,7 +26,7 @@ endif
+ default: lib-release zstd-release
+ 
+ .PHONY: all
+-all: | allmost examples manual
++all: | allmost manual
+ 
+ .PHONY: allmost
+ allmost:
+@@ -97,7 +97,6 @@ clean:
+ 	@$(MAKE) -C $(PRGDIR) $@ > $(VOID)
+ 	@$(MAKE) -C $(TESTDIR) $@ > $(VOID)
+ 	@$(MAKE) -C $(ZWRAPDIR) $@ > $(VOID)
+-	@$(MAKE) -C examples/ $@ > $(VOID)
+ 	@$(MAKE) -C contrib/gen_html $@ > $(VOID)
+ 	@$(RM) zstd$(EXT) zstdmt$(EXT) tmp*
+ 	@echo Cleaning completed
diff --git a/debian/patches/series b/debian/patches/series
index cc7dacd..e43cf25 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,3 +7,4 @@
 #0007-Fix-use-of-fprintf.patch
 0008-Address-embedded-zlib.patch
 0009-Add-shebang-for-scripts.patch
+0010-do_not_make_examples.patch

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