The following commit has been merged in the master branch:
commit 4a309202f2b74ccfe296b693062b683b33b624ca
Author: Rene Engelhard <r...@debian.org>
Date: Fri Sep 23 04:37:12 2011 +0000
add openjdk-7-jre to JAVA_RUNTIME_DEPENDS
diff --git a/changelog b/changelog
index 488470c..0da6fd3 100644
--- a/changelog
+++ b/changelog
@@ -8,7 +8,7 @@ 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
+ - allow openjdk 7
-- Rene Engelhard <r...@debian.org> Thu, 22 Sep 2011 23:49:08 +0200
diff --git a/rules b/rules
index 339538b..3fee75d 100755
--- a/rules
+++ b/rules
@@ -761,7 +761,7 @@ endif
# JAVA_RUNTIME_DEPENDS += | $(GCJ_JAWT_DEPENDS)
# endif
ifneq (,$(filter $(ARCH), $(OOO_OPENJDK_ARCHS)))
- JAVA_RUNTIME_DEPENDS += | openjdk-6-jre
+ JAVA_RUNTIME_DEPENDS += | openjdk-6-jre | openjdk-7-jre
endif
ifneq (,$(filter $(ARCH), amd64 i386))
JAVA_RUNTIME_DEPENDS += | sun-java5-jre | sun-java6-jre
--
LibreOffice packaging repository
--
To UNSUBSCRIBE, email to debian-openoffice-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1r6xwy-0004kw...@vasks.debian.org
