./packages/openofficeorg/3.1/experimental r1424: update ooo-build; add conflicts against Java extensions using in their scripts
------------------------------------------------------------
revno: 1424
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Thu 2009-03-05 19:35:23 +0100
message:
update ooo-build; add conflicts against Java extensions using in their scripts
modified:
changelog
control
control.ure.in
=== modified file 'changelog'
--- a/changelog 2009-03-03 22:29:11 +0000
+++ b/changelog 2009-03-05 18:35:23 +0000
@@ -10,7 +10,7 @@
(closes: #512644)
- new orig without rfc314.txt (closes: #516784)
* ooo-build:
- - back on trunk (r15448)
+ - back on trunk (r15479)
- updates openoffice.1 to remove --version (closes: #505768)
* debian/shlibs.override.icu: update for new icu
* debian/shlibs.override.xmlsec: remove, xmlsec went static
@@ -45,11 +45,13 @@
* debian/rules, debian/startcenter.desktop: remove own startcenter.desktop;
OOo now has one upstream
* debian/control.ure.in: suggest java5-runtime instead of java2-runtime as
- jvmfwk stopped displaying JVMs < 1.5.0
+ jvmfwk stopped displaying JVMs < 1.5.0 and conflict against Java
+ extensions using the (wrong for OOo 3) $ORIGIN in their maintainer
+ scripts to not break upgrades as the old Java config is invalidated....
* debian/control.mediawiki.in: depend on liblucene2-java until i#98680 is
fixed
- -- Rene Engelhard <rene@debian.org> Tue, 03 Mar 2009 23:25:51 +0100
+ -- Rene Engelhard <rene@debian.org> Thu, 05 Mar 2009 16:16:03 +0100
openoffice.org (1:3.0.1-4.5pre) unstable; urgency=low
=== modified file 'control'
--- a/control 2009-03-03 22:29:11 +0000
+++ b/control 2009-03-05 18:35:23 +0000
@@ -3053,7 +3053,7 @@
Architecture: i386 powerpc sparc mips mipsel armel s390 m68k amd64 ia64 ppc64
Depends: uno-libs3 (= ${ure:Version}), ${shlibs:Depends}
Suggests: java5-runtime, cli-uno-bridge
-Conflicts: cli-uno-bridge (<< 1:3.0.0~dev300m22)
+Conflicts: cli-uno-bridge (<< 1:3.0.0~dev300m22), openoffice.org-writer2latex (<< 0.5.0.2-3), openoffice.org-writer2xhtml (<< 0.5.0.2-3), openoffice.org-report-builder (<< 1:3.0.1-5), openoffice.org-wiki-publisher (<< 1:3.0.1-5), openoffice.org-coooder (<< 1.1.1+ooo-build3.0.0.9+r14588-3)
Replaces: openoffice.org-java-common (<< 1:3.0.0~dev300m12)
Description: UNO runtime environment
The Uno Runtime Environment (URE) is the well-known UNO component model
=== modified file 'control.ure.in'
--- a/control.ure.in 2009-01-20 15:51:52 +0000
+++ b/control.ure.in 2009-03-05 18:35:23 +0000
@@ -48,7 +48,12 @@
Architecture: %OOO_ARCHS%
Depends: uno-libs3 (= ${ure:Version}), ${shlibs:Depends}
Suggests: java5-runtime, cli-uno-bridge
-Conflicts: cli-uno-bridge (<< 1:3.0.0~dev300m22)
+Conflicts: cli-uno-bridge (<< 1:3.0.0~dev300m22),
+ openoffice.org-writer2latex (<< 0.5.0.2-3),
+ openoffice.org-writer2xhtml (<< 0.5.0.2-3),
+ openoffice.org-report-builder (<< 1:3.0.1-5),
+ openoffice.org-wiki-publisher (<< 1:3.0.1-5),
+ openoffice.org-coooder (<< 1.1.1+ooo-build3.0.0.9+r14588-3)
Replaces: openoffice.org-java-common (<< 1:3.0.0~dev300m12)
Description: UNO runtime environment
The Uno Runtime Environment (URE) is the well-known UNO component model
Reply to: