------------------------------------------------------------
revno: 991
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: debian
timestamp: Fri 2008-02-08 10:10:13 +0100
message:
fix logic error
modified:
changelog
control
control.in
=== modified file 'changelog'
--- a/changelog 2008-02-08 09:06:17 +0000
+++ b/changelog 2008-02-08 09:10:13 +0000
@@ -1,3 +1,12 @@
+openoffice.org (1:2.4.0~ooh680m6-3.4pre) experimental; urgency=low
+
+ * debian/control.in:
+ - fix logic error, we of course should conflict against old
+ openoffice.org-calcs in the new common, not the other way around
+ (really closes: #464544)
+
+ -- Rene Engelhard <[EMAIL PROTECTED]> Fri, 08 Feb 2008 10:06:26 +0100
+
openoffice.org (1:2.4.0~ooh680m6-3) experimental; urgency=low
* ooo-build:
=== modified file 'control'
--- a/control 2008-02-08 09:06:17 +0000
+++ b/control 2008-02-08 09:10:13 +0000
@@ -117,7 +117,7 @@
Architecture: all
Depends: dictionaries-common (>= 0.10) | openoffice.org-updatedicts,
openoffice.org-style-andromeda
Recommends: openoffice.org-style-industrial, openoffice.org-style-tango,
openoffice.org-style-crystal, openoffice.org-style-hicontrast
-Conflicts: openoffice.org-debian-files, openoffice.org-mimelnk,
openoffice.org2-common, openclipart-openoffice.org (<= 0.17+dfsg-4),
openoffice.org-l10n-en-us, openoffice.org-debian-menus, openoffice.org-core (=
2.0.4~rc3-1), openoffice.org-base (<< 2.2.0-1), openoffice.org-writer (<<
2.2.0-1), openoffice.org-calc (<< 2.2.0-1), openoffice.org-impress (<<
2.2.0-1), openoffice.org-draw (<< 2.2.0-1), openoffice.org-math (<< 2.2.0-1)
+Conflicts: openoffice.org-debian-files, openoffice.org-mimelnk,
openoffice.org2-common, openclipart-openoffice.org (<= 0.17+dfsg-4),
openoffice.org-l10n-en-us, openoffice.org-debian-menus, openoffice.org-core (=
2.0.4~rc3-1), openoffice.org-base (<< 2.2.0-1), openoffice.org-writer (<<
2.2.0-1), openoffice.org-calc (<< 1:2.3.0-1), openoffice.org-impress (<<
2.2.0-1), openoffice.org-draw (<< 2.2.0-1), openoffice.org-math (<< 2.2.0-1)
Provides: openoffice.org2-common, openoffice.org-l10n-en-us
Replaces: openoffice.org-debian-files, openoffice.org-mimelnk, openoffice.org
(<< 1.9), openoffice.org2-common, openoffice.org-l10n-en-us,
openoffice.org-l10n-en, openoffice.org-calc (<< 2.0.4~rc1), openoffice.org-base
(<< 2.0.4~rc1), openoffice.org-math (<< 2.0.4~rc1), broffice.org (<<
2.2.1~rc1-1)
Description: OpenOffice.org office suite architecture independent files
@@ -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}), openoffice.org-common (<< 1:2.3.0)
+Conflicts: openoffice.org-bin (<< 1.9), openoffice.org-debian-files,
openoffice.org2-calc (<< ${Source-Version})
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-02-08 09:06:17 +0000
+++ b/control.in 2008-02-08 09:10:13 +0000
@@ -267,7 +267,7 @@
openoffice.org-core (= 2.0.4~rc3-1),
openoffice.org-base (<< 2.2.0-1),
openoffice.org-writer (<< 2.2.0-1),
- openoffice.org-calc (<< 2.2.0-1),
+ openoffice.org-calc (<< 1:2.3.0-1),
openoffice.org-impress (<< 2.2.0-1),
openoffice.orgVER-draw (<< 2.2.0-1),
openoffice.orgVER-math (<< 2.2.0-1)
@@ -348,8 +348,7 @@
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.org-common (<< 1:2.3.0)
+ openoffice.org2-calc (<< ${Source-Version})
Provides: openoffice.org2-calc
Description: OpenOffice.org office suite - spreadsheet
OpenOffice.org is a full-featured office productivity suite that provides
