------------------------------------------------------------
revno: 1971
committer: Rene Engelhard <r...@debian.org>
branch nick: unstable
timestamp: Fri 2010-04-30 00:09:44 +0200
message:
stop suggesting/recommending java2-compiler, add the JAVA_RUNTIME_DEPENDS we
already use instead.
modified:
changelog
control
control.sdk.in
=== modified file 'changelog'
--- a/changelog 2010-04-29 21:54:31 +0000
+++ b/changelog 2010-04-29 22:09:44 +0000
@@ -27,8 +27,10 @@
- change the way components like -evolution or -filter-binfilter are
registered so that we do not need to pre-depends on
openoffice.org-core anymore (thanks Michael Vogt)
+ * debian/rules, debian/control.sdk.in: stop suggesting/recommending
java2-compiler,
+ add the JAVA_RUNTIME_DEPENDS we already use instead.
- -- Rene Engelhard <r...@debian.org> Wed, 28 Apr 2010 12:51:12 +0200
+ -- Rene Engelhard <r...@debian.org> Thu, 29 Apr 2010 23:58:39 +0200
openoffice.org (1:3.2.0-8) unstable; urgency=low
=== modified file 'control'
--- a/control 2010-04-27 18:13:50 +0000
+++ b/control 2010-04-29 22:09:44 +0000
@@ -3612,7 +3612,7 @@
Section: devel
Architecture: i386 m68k mips mipsel powerpc s390 kfreebsd-i386 alpha amd64
kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc
Depends: openoffice.org-core (= ${binary:Version}), ${shlibs:Depends},
${dev-stl-depends}, ${misc:Depends}
-Recommends: dmake, g++, java-gcj-compat-dev, ${java-common-depends}
+Recommends: dmake, g++, ${java-runtime-depends}, ${java-common-depends}
Suggests: openoffice.org-dev-doc, libmythes-dev, c-shell
Replaces: openoffice.org2-core (<= 1.9.108-1), openoffice.org2-dev,
openoffice.org-java, openoffice.org-common (<< 2.0.2-3), openoffice.org-dev-doc
(<< 2.0.2-4)
Conflicts: openoffice.org-debian-files, openoffice.org2-dev
@@ -3630,7 +3630,7 @@
Architecture: all
Depends: ${misc:Depends}
Recommends: www-browser
-Suggests: g++, java2-compiler, openoffice.org-dtd-officedocument1.0
+Suggests: openoffice.org-dtd-officedocument1.0
Replaces: openoffice.org-dev (<< 2.1), openoffice.org2-dev-doc
Provides: openoffice.org2-dev-doc
Conflicts: openoffice.org2-dev-doc
=== modified file 'control.sdk.in'
--- a/control.sdk.in 2010-03-18 17:18:34 +0000
+++ b/control.sdk.in 2010-04-29 22:09:44 +0000
@@ -7,7 +7,7 @@
${misc:Depends}
Recommends: dmake,
g++,
- java-gcj-compat-dev,
+ ${java-runtime-depends},
${java-common-depends}
Suggests: openoffice.org-dev-doc,
libmythes-dev,
@@ -32,9 +32,7 @@
Architecture: all
Depends: ${misc:Depends}
Recommends: www-browser
-Suggests: g++,
- java2-compiler,
- openoffice.orgVER-dtd-officedocument1.0
+Suggests: openoffice.orgVER-dtd-officedocument1.0
Replaces: openoffice.org-dev (<< 2.1),
openoffice.org2-dev-doc
Provides: openoffice.org2-dev-doc
