[libreoffice] 02/02: remove also-suppress-odk-build-examples.diff...

[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 6f9e3ea8f0a8d6c62b51d6c8f8f8f588e58c3a52
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Fri Jun 9 05:18:59 2017 +0200

    remove also-suppress-odk-build-examples.diff...
---
 changelog                                     |  5 +++--
 patches/also-suppress-odk-build-examples.diff | 26 --------------------------
 patches/series                                |  1 -
 3 files changed, 3 insertions(+), 29 deletions(-)

diff --git a/changelog b/changelog
index d6d8a1f..8436c24 100644
--- a/changelog
+++ b/changelog
@@ -1,8 +1,9 @@
 libreoffice (1:5.4.0~beta2-3) experimental; urgency=medium
 
-  *  debian/patches/also-suppress-odk-build-examples.diff: sigh. fix.
+  *  debian/patches/series, also-suppress-odk-build-examples.diff: sigh.
+     don't do that yet, not yet ready....
 
- -- Rene Engelhard <rene at debian.org>  Fri, 09 Jun 2017 02:40:52 +0000
+ -- Rene Engelhard <rene at debian.org>  Fri, 09 Jun 2017 05:18:08 +0200
 
 libreoffice (1:5.4.0~beta2-2) experimental; urgency=medium
 
diff --git a/patches/also-suppress-odk-build-examples.diff b/patches/also-suppress-odk-build-examples.diff
deleted file mode 100644
index e752b3b..0000000
--- a/patches/also-suppress-odk-build-examples.diff
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/odk/CustomTarget_build-examples.mk b/odk/CustomTarget_build-examples.mk
-index 89e427348087..ea9172d8ae84 100644
---- a/odk/CustomTarget_build-examples.mk
-+++ b/odk/CustomTarget_build-examples.mk
-@@ -84,10 +84,12 @@ endif
- #    java/NotesAccess \
- #    java/Storage \
- 
--
- .PHONY: $(call gb_CustomTarget_get_target,odk/build-examples)
- 
- $(call gb_CustomTarget_get_target,odk/build-examples): \
-+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
- 
- $(call gb_CustomTarget_get_workdir,odk/build-examples)/setsdkenv: \
-         $(SRCDIR)/odk/config/setsdkenv_unix.sh.in \
diff --git a/patches/series b/patches/series
index 8bc068e..b9a5328 100644
--- a/patches/series
+++ b/patches/series
@@ -32,4 +32,3 @@ disable-sc_subsequent_filters_test-with-internal-cppunit.diff
 cppunit-optional.diff
 disable-unused-test-programs.diff
 gb_SUPPRESS_TESTS.diff
-also-suppress-odk-build-examples.diff

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