[libreoffice] 02/03: don't try to do auto deployment when AUTO_DEPLOYMENT = NO...

[Rene Engelhard]

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

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

commit cc4b720d7869bc2a436984ba2eb55b7a16ee66df
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Mon Jul 17 19:23:23 2017 +0200

    don't try to do auto deployment when AUTO_DEPLOYMENT = NO...
---
 changelog                                          |  3 +++
 .../examples-fix-SDK_AUTO_DEPLOYMENT-check.diff    | 29 ++++++++++++++++++++++
 patches/series                                     |  1 +
 3 files changed, 33 insertions(+)

diff --git a/changelog b/changelog
index 4101f67..5e52304 100644
--- a/changelog
+++ b/changelog
@@ -5,6 +5,9 @@ libreoffice (1:5.3.4-4) unstable; urgency=medium
   * debian/tests/sdk-examples: export HOME=$WORKDIR in the hope it will fix
     the unopkg calls
 
+  * debian/patches/examples-fix-SDK_AUTO_DEPLOYMENT-check.diff: don't try
+    to do "auto deployment" when SDK_AUTO_DEPLOYMENT = NO...
+
   * debian/rules:
     - make i386 make check notfatal for now given the i386 Java Stack Clash
       regression
diff --git a/patches/examples-fix-SDK_AUTO_DEPLOYMENT-check.diff b/patches/examples-fix-SDK_AUTO_DEPLOYMENT-check.diff
new file mode 100644
index 0000000..d8bde1a
--- /dev/null
+++ b/patches/examples-fix-SDK_AUTO_DEPLOYMENT-check.diff
@@ -0,0 +1,29 @@
+From 77d6bb690865540577c04952ba685a0cfe3fa01e Mon Sep 17 00:00:00 2001
+From: Rene Engelhard <rene at debian.org>
+Date: Mon, 17 Jul 2017 10:53:29 +0200
+Subject: [PATCH] use ifeq "$(SDK_AUTO_DEPLOYMENT)" "YES"
+
+... instead of ifneq "$(SDK_AUTO_DEPLOYMENT)" "", as the variable is = NO
+if disabled
+
+Change-Id: I7dd2d165235f5cb7e55a8fed628ada71b04c7881
+---
+ odk/examples/DevelopersGuide/BasicAndDialogs/CreatingDialogs/Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/odk/examples/DevelopersGuide/BasicAndDialogs/CreatingDialogs/Makefile b/odk/examples/DevelopersGuide/BasicAndDialogs/CreatingDialogs/Makefile
+index bcd47ac1725f..3af249f9d4b0 100644
+--- a/odk/examples/DevelopersGuide/BasicAndDialogs/CreatingDialogs/Makefile
++++ b/odk/examples/DevelopersGuide/BasicAndDialogs/CreatingDialogs/Makefile
+@@ -106,7 +106,7 @@ $(COMPONENT_PACKAGE) : $(COMPONENT_JAR) $(COMPONENT_UNOPKG_MANIFEST)
+ 	cd $(subst /,$(PS),$(OUT_COMP_CLASS)/$(subst .$(UNOOXT_EXT),,$(@F))) && $(SDK_ZIP) -u ../../../bin/$(@F) META-INF/manifest.xml
+ 
+ $(REGISTERFLAG) : $(COMPONENT_PACKAGE)
+-ifneq "$(SDK_AUTO_DEPLOYMENT)" ""
++ifeq "$(SDK_AUTO_DEPLOYMENT)" "YES"
+ 	-$(DEL) $(subst \\,\,$(subst /,$(PS),$@))
+ 	-$(MKDIR) $(subst /,$(PS),$(@D))
+ 	$(DEPLOYTOOL) $(COMPONENT_PACKAGE_URL)
+-- 
+2.11.0
+
diff --git a/patches/series b/patches/series
index f0cb5d6..44776f0 100644
--- a/patches/series
+++ b/patches/series
@@ -34,3 +34,4 @@ m68k-use-mlong-jump-table-offsets.diff
 odk-settings-JAVA_PROC_TYPE.diff
 icu-59-uchar.diff
 sdk-cat-sed-bin.diff
+examples-fix-SDK_AUTO_DEPLOYMENT-check.diff

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