[libreoffice] 01/02: debian/patches/also-suppress-odk-build-examples.diff: sigh. fix.

[Rene Engelhard]

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

rene pushed a commit to branch debian-experimental-5.4
in repository libreoffice.

commit 261f6163c7bcb4ffb134ab7544ec4c096ef14b8f
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Fri Jun 9 04:47:41 2017 +0200

    debian/patches/also-suppress-odk-build-examples.diff: sigh. fix.
---
 changelog                                     |  6 ++++++
 patches/also-suppress-odk-build-examples.diff | 24 ++++++++++++++----------
 2 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/changelog b/changelog
index 98efaed..d6d8a1f 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,9 @@
+libreoffice (1:5.4.0~beta2-3) experimental; urgency=medium
+
+  *  debian/patches/also-suppress-odk-build-examples.diff: sigh. fix.
+
+ -- Rene Engelhard <rene at debian.org>  Fri, 09 Jun 2017 02:40:52 +0000
+
 libreoffice (1:5.4.0~beta2-2) experimental; urgency=medium
 
   * debian/patches/disable-db-tests.diff: update
diff --git a/patches/also-suppress-odk-build-examples.diff b/patches/also-suppress-odk-build-examples.diff
index 121e786..e752b3b 100644
--- a/patches/also-suppress-odk-build-examples.diff
+++ b/patches/also-suppress-odk-build-examples.diff
@@ -1,22 +1,26 @@
 diff --git a/odk/CustomTarget_build-examples.mk b/odk/CustomTarget_build-examples.mk
-index 89e427348087..958fe7971ff9 100644
+index 89e427348087..ea9172d8ae84 100644
 --- a/odk/CustomTarget_build-examples.mk
 +++ b/odk/CustomTarget_build-examples.mk
-@@ -84,7 +84,9 @@ endif
+@@ -84,10 +84,12 @@ endif
  #    java/NotesAccess \
  #    java/Storage \
  
 -
-+ifneq ($(gb_SUPPRESS_TESTS),)
-+	@true
-+else
  .PHONY: $(call gb_CustomTarget_get_target,odk/build-examples)
  
  $(call gb_CustomTarget_get_target,odk/build-examples): \
-@@ -116,5 +118,6 @@ $(call gb_CustomTarget_get_workdir,odk/build-examples)/setsdkenv: \
-         -e 's!@OO_SDK_JAVA_HOME@!$(JAVA_HOME)!' \
-         -e 's!@OO_SDK_OUTPUT_DIR@!$(call gb_CustomTarget_get_workdir,odk/build-examples)/out!' \
-         -e 's!@SDK_AUTO_DEPLOYMENT@!YES!' $< > $@
++ifneq ($(gb_SUPPRESS_TESTS),)
++	@true
++else
+         $(call gb_CustomTarget_get_workdir,odk/build-examples)/setsdkenv
+ 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),CHK,1)
+ 	(saved_library_path=$${$(gb_Helper_LIBRARY_PATH_VAR)} && . $< \
+@@ -102,6 +104,7 @@ $(call gb_CustomTarget_get_target,odk/build-examples): \
+         || (RET=$$? \
+             && cat $(call gb_CustomTarget_get_workdir,odk/build-examples)/log \
+             && exit $$RET)
 +endif
  
- # vim: set noet sw=4 ts=4:
+ $(call gb_CustomTarget_get_workdir,odk/build-examples)/setsdkenv: \
+         $(SRCDIR)/odk/config/setsdkenv_unix.sh.in \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git