./packages/openofficeorg/3.0/experimental r1211: conflict against libuno-cli-types1.1-cil
------------------------------------------------------------
revno: 1211
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Fri 2008-08-08 17:28:26 +0200
message:
conflict against libuno-cli-types1.1-cil
modified:
changelog
control
control.mono.in
=== modified file 'changelog'
--- a/changelog 2008-08-07 20:04:18 +0000
+++ b/changelog 2008-08-08 15:28:26 +0000
@@ -6,7 +6,7 @@
editable) (closes: #490549)
- package-ooo: fix install to make help land properly in -help-xx.
* ooo-build:
- - update (r13491)
+ - update (r13495)
- src: get OOO300 GSIs from ftp.linux.cz
* debian/rules:
- Add SYSTEM_LUCENE conditional, disable it yet as liblucene2-java is
@@ -37,7 +37,8 @@
to the three layer OOo; Section: libs to fix override disparity. Install
more (upstream-generated) .config and policy* files. Don't make ure
contain/depend on cli*dll as that would make all OOo packages depend on
- mono and people might not need it
+ mono and people might not need it. Make cli-uno-bridge conflict against
+ the old libuno-cli-types1.1-cil
* debian/control.in:
- Standards-Version: 3.8.0 (already following it)
- fix -andromedas Replaces:
@@ -50,7 +51,7 @@
openoffice.org-headless.lintian-overrides: libvclplug_svp is now in
-coreXY upstream. Follow.
- -- Rene Engelhard <rene@debian.org> Thu, 07 Aug 2008 00:57:37 +0200
+ -- Rene Engelhard <rene@debian.org> Fri, 08 Aug 2008 17:27:28 +0200
openoffice.org (1:3.0.0~beta2-1) experimental; urgency=low
=== modified file 'control'
--- a/control 2008-08-07 20:04:18 +0000
+++ b/control 2008-08-08 15:28:26 +0000
@@ -3103,7 +3103,7 @@
Section: libs
Architecture: i386 sparc amd64 ia64
Depends: ${shlibs:Depends}, openoffice.org-core (>> ${base-version}), libuno-cli-basetypes1.0-cil, libuno-cli-uretypes1.0-cil, libuno-cli-oootypes1.0-cil, libuno-cli-cppuhelper1.0-cil, libuno-cli-ure1.0-cil, ${cli:Depends}
-Conflicts: libuno-cil
+Conflicts: libuno-cil, libuno-cli-types1.1-cil
Provides: libuno-cil
Replaces: libuno-cil
Description: CLI binding for OpenOffice.org
=== modified file 'control.mono.in'
--- a/control.mono.in 2008-07-28 16:33:29 +0000
+++ b/control.mono.in 2008-08-08 15:28:26 +0000
@@ -9,7 +9,7 @@
libuno-cli-cppuhelper1.0-cil,
libuno-cli-ure1.0-cil,
${cli:Depends}
-Conflicts: libuno-cil
+Conflicts: libuno-cil, libuno-cli-types1.1-cil
Provides: libuno-cil
Replaces: libuno-cil
Description: CLI binding for OpenOffice.org
Reply to: