[libreoffice] 01/01: fix i386 default-jdk build-dep

[Rene Engelhard]

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

rene pushed a commit to branch debian-stretch-backports
in repository libreoffice.

commit 603b94169175d426f568719016ac6e23b4ffba7d
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Sun Dec 10 01:27:52 2017 +0100

    fix i386 default-jdk build-dep
---
 changelog | 6 ++++++
 control   | 2 +-
 rules     | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/changelog b/changelog
index 1a457e1..485a209 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,9 @@
+libreoffice (1:5.4.3-4~bpo9+2) stretch-backports; urgency=medium
+
+  * revert one more change to actually add a default-jdk build-dep for i386...
+
+ -- Rene Engelhard <rene at debian.org>  Sun, 10 Dec 2017 01:20:09 +0100
+
 libreoffice (1:5.4.3-4~bpo9+1) stretch-backports; urgency=medium
 
   * Rebuild for stretch-backports.
diff --git a/control b/control
index ec41053..e2bfb26 100644
--- a/control
+++ b/control
@@ -15,7 +15,7 @@ Build-Depends: ant (>= 1.7.0) [!hppa !ia64 !mips64 !s390 !sparc],
                coinor-libcoinmp-dev (>= 1.7.6+dfsg1-2),
                coinor-libcoinutils-dev (>= 2.9.15-3.1),
                debhelper (>= 10),
-               default-jdk (>= 1:1.6) [!hppa !mips64 !s390 !sparc !i386],
+               default-jdk (>= 1:1.6) [!hppa !mips64 !s390 !sparc],
                default-jdk (>= 2:1.7-52.1) [kfreebsd-any],
                default-jdk (>= 2:1.8-55) [sparc64],
                default-libmysqlclient-dev,
diff --git a/rules b/rules
index 36490a5..2e5a1cd 100755
--- a/rules
+++ b/rules
@@ -1042,7 +1042,7 @@ ifeq "$(ENABLE_JAVA)" "y"
   ifeq "$(JDK)" "default"
 	BUILD_DEPS += , java-common (>= 0.49)
 	JAVA_HOME=/usr/lib/jvm/default-java
-	BUILD_DEPS += , default-jdk (>= 1:1.6) $(shell echo "$(filter-out !ia64,$(OOO_NO_JAVA_ARCHS))" | sed -e "s/\]/ !i386]/")
+	BUILD_DEPS += , default-jdk (>= 1:1.6) $(shell echo "$(filter-out !ia64,$(OOO_NO_JAVA_ARCHS))")
     ifneq (,$(findstring ia64,$(OOO_JAVA_ARCHS)))
 	BUILD_DEPS += , default-jdk (>= 1:1.7-48) [ia64]
     endif

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