[SCM] LibreOffice packaging repository branch, debian-experimental-3.6, updated. libreoffice_3.5.4-5-99-g67aa3c5

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

The following commit has been merged in the debian-experimental-3.6 branch:
commit 67aa3c5c9975db59aa9ebf23954e6a2770ab79ce
Author: Rene Engelhard <rene@debian.org>
Date:   Thu Jun 21 02:49:20 2012 +0200

    use --with-java-target-version=1.5 on any JDK...

diff --git a/rules b/rules
index 13c51ad..2a0c42f 100755
--- a/rules
+++ b/rules
@@ -729,6 +729,7 @@ ifneq "$(BUILD_ONLY_EN_US)" "y"
 endif
 
 ifeq "$(ENABLE_JAVA)" "y"
+	CONFIGURE_FLAGS += --with-java-target-version=1.5
   ifeq "$(JDK)" "default"
 	JAVA_HOME=/usr/lib/jvm/default-java
 	BUILD_DEPS += , default-jdk$(filter-out !ia64,$(OOO_NO_JAVA_ARCHS))
@@ -760,7 +761,6 @@ ifeq "$(ENABLE_JAVA)" "y"
 	BUILD_DEPS += , openjdk-$(JAVA_MAINVER)-jdk [$(filter-out $(OOO_GCJ_JDK_ARCHS),$(OOO_JAVA_ARCHS))]
     endif
 	JAVA_HOME=/usr/lib/jvm/java-$(JAVA_MAINVER)-openjdk-$(DEB_HOST_ARCH)
-	CONFIGURE_FLAGS += --with-java-target-version=1.5
   endif
         TEST_JAVA_HOME=$(JAVA_HOME)
   ifneq "$(OOO_GCJ_JDK_ARCHS)" ""

-- 
LibreOffice packaging repository