./packages/openofficeorg/3.0/experimental r1285: merge
------------------------------------------------------------
revno: 1285
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Mon 2008-10-13 13:36:06 +0200
message:
merge
modified:
changelog
control
control.qa.in
------------------------------------------------------------
revno: 1022.1.178
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Mon 2008-10-13 13:30:23 +0200
message:
ake -qa-api-tests depend on Java
modified:
changelog
control
control.qa.in
------------------------------------------------------------
revno: 1022.1.179
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Mon 2008-10-13 13:34:14 +0200
message:
suggest Java at -qa-tools
modified:
changelog
control
control.qa.in
=== modified file 'changelog'
--- a/changelog 2008-10-13 08:28:46 +0000
+++ b/changelog 2008-10-13 11:36:06 +0000
@@ -1,9 +1,14 @@
openoffice.org (1:3.0.0-1.2pre) experimental; urgency=low
+ * ooo-build:
+ - update (r14294)
* debian/rules:
- make ootestapi find OOoRunnerLight.jar by setting the necessary symlink
+ * debian/control.qa.in:
+ - make -qa-api-tests depend on Java as it needs OOoRunnerLight.jar to be
+ run to be used. Make -qa-tools suggest it.
- -- Rene Engelhard <rene@debian.org> Mon, 13 Oct 2008 10:26:20 +0200
+ -- Rene Engelhard <rene@debian.org> Mon, 13 Oct 2008 13:34:58 +0200
openoffice.org (1:3.0.0-1) experimental; urgency=low
=== modified file 'control'
--- a/control 2008-10-13 08:28:46 +0000
+++ b/control 2008-10-13 11:36:06 +0000
@@ -3177,7 +3177,8 @@
Section: devel
Priority: extra
Depends: ${shlibs:Depends}, openoffice.org (>> ${base-version}), ${ooo-binfilter-dep}, ${java-common-depends}
-Recommends: openoffice.org-qa-api-tests, openoffice.org-qa-ui-tests
+Recommends: openoffice.org-qa-api-tests, openoffice.org-qa-ui-tests,
+Suggests: ${java-runtime-depends}
Conflicts: openoffice.org-core (<< 1:2.3.0~oog680m2)
Replaces: openoffice.org-common (<< 2.0.4~ood680m2)
Architecture: i386 powerpc sparc mips mipsel armel s390 m68k amd64 ia64 ppc64
@@ -3195,7 +3196,7 @@
Package: openoffice.org-qa-api-tests
Section: devel
Priority: extra
-Depends: openoffice.org-qa-tools
+Depends: openoffice.org-qa-tools, ${java-runtime-depends}
Architecture: all
Description: OpenOffice.org API Test Data
OpenOffice.org is a full-featured office productivity suite that provides
=== modified file 'control.qa.in'
--- a/control.qa.in 2008-05-11 13:52:00 +0000
+++ b/control.qa.in 2008-10-13 11:34:14 +0000
@@ -6,7 +6,8 @@
${ooo-binfilter-dep},
${java-common-depends}
Recommends: openoffice.orgVER-qa-api-tests,
- openoffice.orgVER-qa-ui-tests
+ openoffice.orgVER-qa-ui-tests,
+Suggests: ${java-runtime-depends}
Conflicts: openoffice.org-core (<< 1:2.3.0~oog680m2)
Replaces: openoffice.org-common (<< 2.0.4~ood680m2)
Architecture: %OOO_ARCHS%
@@ -24,7 +25,7 @@
Package: openoffice.orgVER-qa-api-tests
Section: devel
Priority: extra
-Depends: openoffice.orgVER-qa-tools
+Depends: openoffice.orgVER-qa-tools, ${java-runtime-depends}
Architecture: all
Description: OpenOffice.org API Test Data
OpenOffice.org is a full-featured office productivity suite that provides
Reply to: