------------------------------------------------------------
revno: 990
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: debian
timestamp: Fri 2008-02-08 10:06:17 +0100
message:
update ooo-build; add conflicts, -3
modified:
changelog
control
control.in
=== modified file 'changelog'
--- a/changelog 2008-02-06 14:44:21 +0000
+++ b/changelog 2008-02-08 09:06:17 +0000
@@ -1,3 +1,13 @@
+openoffice.org (1:2.4.0~ooh680m6-3) experimental; urgency=low
+
+ * ooo-build:
+ - update (r11531)
+ * debian/control.in:
+ - make -calc conflict against openoffice.org-common (<< 1:2.3.0)
+ (closes: #464544)
+
+ -- Rene Engelhard <[EMAIL PROTECTED]> Fri, 08 Feb 2008 00:19:05 +0100
+
openoffice.org (1:2.4.0~ooh680m6-2) experimental; urgency=low
* ooo-build:
=== modified file 'control'
--- a/control 2008-02-06 14:44:21 +0000
+++ b/control 2008-02-08 09:06:17 +0000
@@ -158,7 +158,7 @@
Architecture: i386 powerpc sparc mips mipsel arm armel amd64 ppc64
Depends: openoffice.org-core (= ${Source-Version}), openoffice.org-base-core
(= ${Source-Version}), ${shlibs:Depends}, ${lpsolve-dep}
Replaces: openoffice.org2-core (<< 1.9.113-0pre1), openoffice.org (<< 1.9),
openoffice.org-debian-files, openoffice.org-core (<= 2.2.0-4),
openoffice.org2-calc (<< ${Source-Version}), openoffice.org-common (<<
2.0.3+2.0.4m179)
-Conflicts: openoffice.org-bin (<< 1.9), openoffice.org-debian-files,
openoffice.org2-calc (<< ${Source-Version})
+Conflicts: openoffice.org-bin (<< 1.9), openoffice.org-debian-files,
openoffice.org2-calc (<< ${Source-Version}), openoffice.org-common (<< 1:2.3.0)
Provides: openoffice.org2-calc
Description: OpenOffice.org office suite - spreadsheet
OpenOffice.org is a full-featured office productivity suite that provides
=== modified file 'control.in'
--- a/control.in 2008-01-27 11:17:11 +0000
+++ b/control.in 2008-02-08 09:06:17 +0000
@@ -348,7 +348,8 @@
openoffice.org-common (<< 2.0.3+2.0.4m179)
Conflicts: openoffice.org-bin (<< 1.9),
openoffice.org-debian-files,
- openoffice.org2-calc (<< ${Source-Version})
+ openoffice.org2-calc (<< ${Source-Version}),
+ openoffice.org-common (<< 1:2.3.0)
Provides: openoffice.org2-calc
Description: OpenOffice.org office suite - spreadsheet
OpenOffice.org is a full-featured office productivity suite that provides
