./packages/openofficeorg/3.2.1/experimental r1986: merge
------------------------------------------------------------
revno: 1986 [merge]
committer: Rene Engelhard <rene@debian.org>
branch nick: experimental
timestamp: Mon 2010-05-17 17:12:54 +0200
message:
merge
modified:
changelog
control
control.in
=== modified file 'changelog'
--- a/changelog 2010-05-14 17:55:33 +0000
+++ b/changelog 2010-05-17 15:12:54 +0000
@@ -2,6 +2,9 @@
* debian/control.lenny_squeeze_transitional.in: move packages to
localization, where they belong
+ * debian/control.in:
+ - add Breaks: -style-* as with new -common and old -style the newly branded
+ startcenter is broken, thanks Mechtilde Stehmann
-- Rene Engelhard <rene@debian.org> Fri, 14 May 2010 16:39:37 +0200
=== modified file 'control'
--- a/control 2010-05-14 17:55:33 +0000
+++ b/control 2010-05-17 15:12:54 +0000
@@ -122,6 +122,13 @@
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-base (<< ${base-version}), openoffice.org-writer (<< ${base-version}), openoffice.org-calc (<< ${base-version}), openoffice.org-impress (<< ${base-version}), openoffice.org-draw (<< ${base-version}), openoffice.org-math (<< ${base-version}), broffice.org (<< ${base-version}), openclipart-openoffice.org (<= 0.18+dfsg-7), dictionaries-common (<< 0.98.14), openoffice.org-core (<< 1:${basis-version}), openoffice.org-core (>= 1:${basis-version}.99), openoffice.org-writer2latex (<< 1.0-5), openoffice.org-coooder (<< 1.1.1+ooo-build3.0.0.9+r14588-8), libtextcat-data
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), openoffice.org-core (<< 1:3.0.1~rc1-3)
+Breaks: openoffice.org-style-crystal (<< 1:3.2.1~),
+ openoffice.org-style-oxygen (<< 1:3.2.1~),
+ openoffice.org-style-industrial (<< 1:3.2.1~),
+ openoffice.org-style-tango (<< 1:3.2.1~)
+ openoffice.org-style-hicontrast (<< 1:3.2.1~),
+ openoffice.org-style-galaxy (<< 1:3.2.1~),
+ openoffice.org-style-andromeda (<< 1:3.2.1~)
Description: office productivity suite -- arch-independent files
OpenOffice.org is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
=== modified file 'control.in'
--- a/control.in 2010-05-11 22:40:01 +0000
+++ b/control.in 2010-05-17 15:12:54 +0000
@@ -308,6 +308,13 @@
openoffice.org-math (<< 2.0.4~rc1),
broffice.org (<< 2.2.1~rc1-1),
openoffice.org-core (<< 1:3.0.1~rc1-3)
+Breaks: openoffice.orgVER-style-crystal (<< 1:3.2.1~),
+ openoffice.orgVER-style-oxygen (<< 1:3.2.1~),
+ openoffice.orgVER-style-industrial (<< 1:3.2.1~),
+ openoffice.orgVER-style-tango (<< 1:3.2.1~)
+ openoffice.orgVER-style-hicontrast (<< 1:3.2.1~),
+ openoffice.orgVER-style-galaxy (<< 1:3.2.1~),
+ openoffice.orgVER-style-andromeda (<< 1:3.2.1~)
Description: office productivity suite -- arch-independent files
OpenOffice.org is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
Reply to: