[libreoffice] 02/03: debian/control[, .subsequentcheckbase}.in: remove hardcoded Java depends, use ${java:Depends}
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch master
in repository libreoffice.
commit a60e42db1369098b6ffc02e3c19f7c00b5dabf77
Author: Rene Engelhard <rene@debian.org>
Date: Fri Mar 25 20:38:45 2016 +0100
debian/control[,.subsequentcheckbase}.in: remove hardcoded Java depends, use ${java:Depends}
---
changelog | 2 ++
control | 7 +++----
control.in | 5 ++---
control.subsequentcheckbase.in | 2 +-
rules | 7 ++++---
5 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/changelog b/changelog
index c2d2070..3a88b92 100644
--- a/changelog
+++ b/changelog
@@ -4,6 +4,8 @@ libreoffice (1:5.1.2~rc1-2) UNRELEASED; urgency=medium
.maintscripts calling dir_to_symlink to get proper dpkg Pre-Dependency.
Needed e.g. to fix wheezy+wheezy-backports -> jessie+jessie-backports
upgrades.
+ * debian/control[,.subsequentcheckbase}.in: remove hardcoded Java depends,
+ use ${java:Depends}
-- Rene Engelhard <rene@debian.org> Fri, 25 Mar 2016 18:53:37 +0100
diff --git a/control b/control
index 07c3196..2f7c416 100644
--- a/control
+++ b/control
@@ -800,9 +800,8 @@ Section: java
Pre-Depends: ${misc:Pre-Depends}
Depends: libreoffice-common (>= 1:3.5.0~alpha0~),
libreoffice-core (>= 1:3.5.0~alpha0~),
- libreoffice-java-common,
- ${bsh-depends},
${java-runtime-depends},
+ ${java:Depends},
${misc:Depends}
Replaces: libreoffice-java-common (<< 1:3.4~)
Description: BeanShell script support provider for LibreOffice scripting framework
@@ -823,8 +822,8 @@ Replaces: libreoffice-common (<< 1:3.4~)
Pre-Depends: ${misc:Pre-Depends}
Depends: libreoffice-common (>= 1:3.5.0~alpha0~),
libreoffice-core (>= 1:3.5.0~alpha0~),
- libreoffice-java-common,
${java-runtime-depends},
+ ${java:Depends},
${misc:Depends}
Description: JavaScript script support provider for LibreOffice scripting framework
LibreOffice is a full-featured office productivity suite that provides
@@ -4522,7 +4521,7 @@ Section: libs
Priority: extra
Architecture: all
Pre-Depends: ${misc:Pre-Depends}
-Depends: junit4 (>= 4.8.2-2), libreoffice-java-common, ure, ${misc:Depends}
+Depends: ${java:Depends}, ${misc:Depends}
Description: LibreOffice java test libraries
LibreOffice subsequentchecks integration test suite
diff --git a/control.in b/control.in
index 8b7f31d..4c5c333 100644
--- a/control.in
+++ b/control.in
@@ -631,8 +631,7 @@ Section: java
Pre-Depends: ${misc:Pre-Depends}
Depends: libreoffice-common (>= 1:3.5.0~alpha0~),
libreoffice-core (>= 1:3.5.0~alpha0~),
- libreoffice-java-common,
- ${bsh-depends},
+ ${java:Depends},
${java-runtime-depends},
${misc:Depends}
Replaces: libreoffice-java-common (<< 1:3.4~)
@@ -654,7 +653,7 @@ Replaces: libreoffice-common (<< 1:3.4~)
Pre-Depends: ${misc:Pre-Depends}
Depends: libreoffice-common (>= 1:3.5.0~alpha0~),
libreoffice-core (>= 1:3.5.0~alpha0~),
- libreoffice-java-common,
+ ${java:Depends},
${java-runtime-depends},
${misc:Depends}
Description: JavaScript script support provider for LibreOffice scripting framework
diff --git a/control.subsequentcheckbase.in b/control.subsequentcheckbase.in
index 53e341a..f16954d 100644
--- a/control.subsequentcheckbase.in
+++ b/control.subsequentcheckbase.in
@@ -3,7 +3,7 @@ Section: libs
Priority: extra
Architecture: all
Pre-Depends: ${misc:Pre-Depends}
-Depends: junit4 %JUNIT_MIN_VER%, libreoffice-java-common, ure, ${misc:Depends}
+Depends: ${java:Depends}, ${misc:Depends}
Description: LibreOffice java test libraries
LibreOffice subsequentchecks integration test suite
diff --git a/rules b/rules
index a405d70..69df815 100755
--- a/rules
+++ b/rules
@@ -1399,9 +1399,7 @@ ifeq "$(ENABLE_JAVA)" "y"
endif
ifeq "$(ENABLE_SCRIPT_PROVIDER_BSH)" "y"
ifneq (,$(filter beanshell, $(SYSTEM_STUFF)))
- # -gcj is gone
BUILD_DEPS_INDEP += , libbsh-java
- BSH_DEPENDS = libbsh-java
endif
CONFIGURE_FLAGS += --enable-scripting-beanshell
else
@@ -3336,6 +3334,10 @@ ifeq "$(ENABLE_JAVA)" "y"
perl -pi -e 's/^(java:Depends.*$$)/\1, ure/' \
debian/libreoffice-officebean.substvars
endif
+ifeq "$(BUILD_TEST_PACKAGE)" "y"
+ perl -pi -e 's/junit4/junit4 $(JUNIT_MIN_VER)/' \
+ debian/libreoffice-subsequentcheckbase.substvars
+endif
# This switch to dh_shlibdeps reduces the 'libXXX not found' warnings but
# causes ldd crashes sometimes when used with fakeroot:
# -l $(PKGDIR)-core/$(OPENOFFICEDIR)/program
@@ -3500,7 +3502,6 @@ endif
-V'oover=$(OOVER)' \
-V'next-oover=$(NEXT_OOVER)' \
-V'help-l10n-virtual-version=$(HELP_L10N_VIRTUAL_VERSION)' \
- -V'bsh-depends=$(BSH_DEPENDS)' \
-V'java-common-depends=$(JAVA_COMMON_DEPENDS)' \
-V'java-runtime-depends=$(JAVA_RUNTIME_DEPENDS)' \
-V'textcat-data-recommends=$(TEXTCAT_DATA_RECOMMENDS)' \
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: