./packages/openofficeorg/3.1/experimental r1386: only suggest java2-runtime on ure; merge
------------------------------------------------------------
revno: 1386
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Thu 2009-01-15 07:46:03 +0100
message:
only suggest java2-runtime on ure; merge
modified:
changelog
control
control.ure.in
------------------------------------------------------------
revno: 1332.1.44
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Wed 2009-01-14 17:23:59 +0100
message:
make ure only Suggest a JRE
modified:
changelog
control
control.ure.in
------------------------------------------------------------
revno: 1332.1.45
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Thu 2009-01-15 07:42:02 +0100
message:
merge
modified:
changelog
rules
------------------------------------------------------------
revno: 1022.3.5
committer: Rene Engelhard <rene@debian.org>
branch nick: unstable
timestamp: Wed 2009-01-14 12:58:50 +0100
message:
backport some tiny, hopefully uncontroversial stuff
modified:
changelog
presubj
rules
------------------------------------------------------------
revno: 1022.3.6
committer: Rene Engelhard <rene@debian.org>
branch nick: unstable
timestamp: Wed 2009-01-14 14:34:26 +0100
message:
disable -gcj for ppc
modified:
changelog
control
control.gcj.in
rules
------------------------------------------------------------
revno: 1022.3.7
committer: Rene Engelhard <rene@debian.org>
branch nick: unstable
timestamp: Wed 2009-01-14 15:14:44 +0100
message:
some lintian fixes
added:
source.lintian-overrides
modified:
changelog
shell-lib.sh
------------------------------------------------------------
revno: 1022.3.8
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Thu 2009-01-15 00:01:30 +0100
message:
regenerate control
modified:
control
------------------------------------------------------------
revno: 1022.3.9
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Thu 2009-01-15 07:38:13 +0100
message:
mention lintian bug nr as the RT wants that documentation; update xulrunner build-dep in MOZILLA=libxul case for current reality
modified:
changelog
rules
=== modified file 'changelog'
--- a/changelog 2009-01-14 09:26:21 +0000
+++ b/changelog 2009-01-15 06:46:03 +0000
@@ -13,7 +13,6 @@
* debian/rules:
- bump minimal ICU version for sid to >= 4.0.0 to make sure
we have OOos patches included
- - update xulrunner build-dep in MOZILLA=libxul case for current reality
- various 3.1-related updates
- remove option for internal writer2latex as it's now a (bundled) extension
upstream too and we have it packaged already.
@@ -33,6 +32,15 @@
-- Rene Engelhard <rene@debian.org> Tue, 06 Jan 2009 16:06:56 +0100
+openoffice.org (1:3.0.1~rc2-1.2pre) experimental; urgency=low
+
+ * merge from Ubuntu:
+ - make ure only Suggest a JRE
+ * debian/rules:
+ - update xulrunner build-dep in MOZILLA=libxul case for current reality
+
+ -- Rene Engelhard <rene@debian.org> Wed, 14 Jan 2009 17:11:40 +0100
+
openoffice.org (1:3.0.1~rc2-1) experimental; urgency=low
* OpenOffice.org 3.0.1 rc2 (OOO300_m15)
@@ -83,7 +91,7 @@
- fixes usage of flash v9 plugin (closes: #434510)
* ooo-build
- switch to ooo-build-3-0-1 branch (r14903)
- * debian/source.lintian-overrides: override bogus
+ * debian/source.lintian-overrides: override bogus (lintian bug #511859)
missing-build-dependency-for-dh_-command
* debian/rules:
- update .so -> -dev merging to the fact that 3.0s SDK does not have
=== modified file 'control'
--- a/control 2009-01-08 21:31:04 +0000
+++ b/control 2009-01-15 06:46:03 +0000
@@ -3056,8 +3056,7 @@
Section: libs
Architecture: i386 powerpc sparc mips mipsel armel s390 m68k amd64 ia64 ppc64
Depends: uno-libs3 (= ${ure:Version}), ${shlibs:Depends}
-Recommends: java2-runtime
-Suggests: cli-uno-bridge
+Suggests: java2-runtime, cli-uno-bridge
Conflicts: cli-uno-bridge (<< 1:3.0.0~dev300m22)
Replaces: openoffice.org-java-common (<< 1:3.0.0~dev300m12)
Description: UNO runtime environment
=== modified file 'control.ure.in'
--- a/control.ure.in 2008-08-24 07:46:16 +0000
+++ b/control.ure.in 2009-01-14 16:23:59 +0000
@@ -47,8 +47,7 @@
Section: libs
Architecture: %OOO_ARCHS%
Depends: uno-libs3 (= ${ure:Version}), ${shlibs:Depends}
-Recommends: java2-runtime
-Suggests: cli-uno-bridge
+Suggests: java2-runtime, cli-uno-bridge
Conflicts: cli-uno-bridge (<< 1:3.0.0~dev300m22)
Replaces: openoffice.org-java-common (<< 1:3.0.0~dev300m12)
Description: UNO runtime environment
Reply to: