[libreoffice] 01/02: remove hardcoded dependency on openjdk-7-jdk in -subsequentcheckbase
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch master
in repository libreoffice.
commit ddf508a74329502abb7b79ed88bf01f7f460b8d7
Author: Rene Engelhard <rene@debian.org>
Date: Sat Oct 3 16:14:13 2015 +0200
remove hardcoded dependency on openjdk-7-jdk in -subsequentcheckbase
---
changelog | 2 ++
control | 1 -
control.subsequentcheckbase.in | 2 +-
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/changelog b/changelog
index 9f19c7a..bb33cb0 100644
--- a/changelog
+++ b/changelog
@@ -10,6 +10,8 @@ libreoffice (1:5.0.2-2) UNRELEASED; urgency=medium
+ add various dependencies on fallback to the various -style-*
+ suggest -breeze instead of -crystal in common, crystal is disabled
+ depend on -style-default in libreoffice-core
+ * debian/control.subsequentcheckbase.in:
+ - remove hardcoded dependency openjdk-7-jdk; we get default-jdk in anyway
-- Rene Engelhard <rene@debian.org> Mon, 28 Sep 2015 15:53:59 +0200
diff --git a/control b/control
index 27ec7ec..ba96ed0 100644
--- a/control
+++ b/control
@@ -4466,7 +4466,6 @@ Depends: ant (>= 1.7.0),
maven-repo-helper,
npapi-sdk-dev,
opencollada-dev (>= 0.1.0~20140703.ddf8f47+dfsg1-2),
- openjdk-7-jdk,
pkg-config,
python3,
python3-dev (>= 3.3),
diff --git a/control.subsequentcheckbase.in b/control.subsequentcheckbase.in
index a63ceb8..5d85b5f 100644
--- a/control.subsequentcheckbase.in
+++ b/control.subsequentcheckbase.in
@@ -2,7 +2,7 @@ Package: libreoffice-subsequentcheckbase
Section: libs
Priority: extra
Architecture: all
-Depends: libreoffice, openjdk-7-jdk, build-essential, %BUILD_DEPS_ARCH_ALL%, ${misc:Depends}
+Depends: libreoffice, build-essential, %BUILD_DEPS_ARCH_ALL%, ${misc:Depends}
Description: LibreOffice java test libraries
LibreOffice subsequentchecks integration test suite
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: