[SCM] LibreOffice packaging repository branch, master, updated. libreoffice_4.0.4-1-5-g9a9c519

["Rene Engelhard" <rene@rene-engelhard.de>]

The following commit has been merged in the master branch:
commit 2e33c84bf9f64a4f498da602634a3a0fc7938fc7
Author: Rene Engelhard <rene@rene-engelhard.de>
Date:   Wed Jun 19 19:56:24 2013 +0200

    fix JAVA_MAINVER setting to actually set 6 for mips(el) and not for ia64

diff --git a/changelog b/changelog
index 52d1bcf..7f0b9ef 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,11 @@
+libreoffice (1:4.0.4-2) UNRELEASED; urgency=low
+
+  * debian/rules:
+    - fix JAVA_MAINVER setting to actually set 6 for mips(el) and not
+      for ia64. 
+
+ -- Rene Engelhard <rene@debian.org>  Wed, 19 Jun 2013 19:51:56 +0200
+
 libreoffice (1:4.0.4-1) unstable; urgency=low
 
   * new upstream release
diff --git a/rules b/rules
index 90de4d6..2d87776 100755
--- a/rules
+++ b/rules
@@ -813,7 +813,10 @@ ifeq "$(ENABLE_JAVA)" "y"
       # no 7 on mips(el)
       ifneq (,$(findstring mips,$(OOO_JAVA_ARCHS)))
 	BUILD_DEPS += , openjdk-6-jdk (>= 6b23~pre8-2) [mips mipsel]
-        ifeq "$(DEB_HOST_ARCH)" "ia64"
+        ifeq "$(DEB_HOST_ARCH)" "mips"
+          JAVA_MAINVER=6
+        endif
+        ifeq "$(DEB_HOST_ARCH)" "mipsel"
           JAVA_MAINVER=6
         endif
       endif

-- 
LibreOffice packaging repository