[SCM] LibreOffice packaging repository branch, debian-experimental-4.1, updated. libreoffice_4.1.0_beta1-1-9-g651013c

["Rene Engelhard" <rene@debian.org>]

The following commit has been merged in the debian-experimental-4.1 branch:
commit 651013ce3e034dbb82311afd17d3d8a5b99f5907
Author: Rene Engelhard <rene@debian.org>
Date:   Tue May 28 19:18:12 2013 +0200

    fix JAVA_MAINVER=6 setting

diff --git a/rules b/rules
index c9b1b41..cd25e27 100755
--- a/rules
+++ b/rules
@@ -831,9 +831,9 @@ 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"
-          JAVA_MAINVER=6
-        endif
+        ifneq (,$(findstring mips,$(DEB_HOST_ARCH)))
+	JAVA_MAINVER=6
+	endif
       endif
     endif
 	JAVA_HOME=/usr/lib/jvm/java-$(JAVA_MAINVER)-openjdk-$(DEB_HOST_ARCH)

-- 
LibreOffice packaging repository