[SCM] LibreOffice packaging repository branch, master, updated. libreoffice_3.4.3-2-8-g4a30920
The following commit has been merged in the master branch:
commit da444b7cb0c5efcbaff3f8b3620bcea7c7cdfa23
Author: Rene Engelhard <rene@debian.org>
Date: Fri Sep 23 04:25:59 2011 +0000
allow build with openjdk 7
diff --git a/changelog b/changelog
index 2285078..488470c 100644
--- a/changelog
+++ b/changelog
@@ -8,8 +8,9 @@ libreoffice (1:3.4.3-3) UNRELEASED; urgency=low
out how we best package the new, patched(?) versions (closes: #641594)
- build with -g on {,kfreebsd}{i386,amd64} (similar to linux-2.6's -dbgs)
as policy says. Compress with xz
+ - allow build with openjdk 7
- -- Rene Engelhard <rene@debian.org> Thu, 22 Sep 2011 20:31:46 +0200
+ -- Rene Engelhard <rene@debian.org> Thu, 22 Sep 2011 23:49:08 +0200
libreoffice (1:3.4.3-2) unstable; urgency=medium
diff --git a/rules b/rules
index d953f0c..339538b 100755
--- a/rules
+++ b/rules
@@ -132,6 +132,7 @@ BUILD_ONLY_EN_US=n
ENABLE_JAVA=y
ifeq "$(ENABLE_JAVA)" "y"
JDK=openjdk
+ JAVA_MAINVER=6
ifneq (,$(filter hppa ia64 kfreebsd%, $(ARCH)))
JDK=gcj-jdk
endif
@@ -723,11 +724,15 @@ ifeq "$(ENABLE_JAVA)" "y"
endif
ifeq "$(JDK)" "openjdk"
ifeq "$(SQUEEZE_BACKPORT)" "y"
- BUILD_DEPS += , openjdk-6-jdk [$(filter-out $(OOO_GCJ_JDK_ARCHS),$(OOO_JAVA_ARCHS))]
- JAVA_HOME=/usr/lib/jvm/java-6-openjdk
+ BUILD_DEPS += , openjdk-$(JAVA_MAINVER)-jdk [$(filter-out $(OOO_GCJ_JDK_ARCHS),$(OOO_JAVA_ARCHS))]
+ JAVA_HOME=/usr/lib/jvm/java-$(JAVA_MAINVER)-openjdk
else
- BUILD_DEPS += , openjdk-6-jdk (>= 6b23~pre8-2) [$(filter-out $(OOO_GCJ_JDK_ARCHS),$(OOO_JAVA_ARCHS))]
- JAVA_HOME=/usr/lib/jvm/java-6-openjdk-$(ARCH)
+ ifeq "$(JAVA_MAINVER)" "6"
+ BUILD_DEPS += , openjdk-$(JAVA_MAINVER)-jdk (>= 6b23~pre8-2) [$(filter-out $(OOO_GCJ_JDK_ARCHS),$(OOO_JAVA_ARCHS))]
+ else
+ 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-$(ARCH)
endif
CONFIGURE_FLAGS += --with-java-target-version=1.5
endif
--
LibreOffice packaging repository
Reply to: