------------------------------------------------------------
revno: 1426
committer: Rene Engelhard <r...@debian.org>
branch nick: debian
timestamp: Thu 2009-03-05 22:33:07 +0100
message:
fix conflicts
modified:
control
control.ure.in
=== modified file 'control'
--- a/control 2009-03-05 18:35:23 +0000
+++ b/control 2009-03-05 21:33:07 +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), 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)
+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:1.0.5+3.0.1-5),
openoffice.org-wiki-publisher (<< 1:1.0+OOo3.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-03-05 18:35:23 +0000
+++ b/control.ure.in 2009-03-05 21:33:07 +0000
@@ -51,8 +51,8 @@
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-report-builder (<< 1:1.0.5+3.0.1-5),
+ openoffice.org-wiki-publisher (<< 1:1.0+OOo3.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
