[SCM] LibreOffice packaging repository branch, master, updated. libreoffice_3.4.3-2-12-ge4c4352
The following commit has been merged in the master branch:
commit 9237c8ade380970221415ee87809f90f7de7f9ba
Author: Rene Engelhard <rene@debian.org>
Date: Sat Sep 24 08:29:50 2011 +0000
don't add openjdk-6-jre to JAVA_RUNTIME_DEPENDS on ia64
diff --git a/rules b/rules
index b3d25be..943617e 100755
--- a/rules
+++ b/rules
@@ -760,7 +760,11 @@ endif
# JAVA_RUNTIME_DEPENDS += | $(GCJ_JAWT_DEPENDS)
# endif
ifneq (,$(filter $(ARCH), $(OOO_OPENJDK_ARCHS)))
+ ifneq "$(ARCH)" "ia64"
JAVA_RUNTIME_DEPENDS += | openjdk-6-jre | openjdk-7-jre
+ else
+ JAVA_RUNTIME_DEPENDS += | openjdk-7-jre
+ endif
endif
ifneq (,$(filter $(ARCH), amd64 i386))
JAVA_RUNTIME_DEPENDS += | sun-java5-jre | sun-java6-jre
--
LibreOffice packaging repository
Reply to: