------------------------------------------------------------
revno: 1688
committer: Rene Engelhard <r...@debian.org>
branch nick: unstable
timestamp: Fri 2009-10-02 14:23:41 +0200
message:
- stop making -common have a hard depends on the default iconset; make
it depend on openoffice.orgVER-style-default | openoffice.orgVER-style
and make -gtk/-kde only recommend -style-tango/-style-{crystal,oxgen}.
Provide openoffice.orgVER-style on all -style-* (closes: #423021)
Stop -style-* depending on -common (closes: #406778)
modified:
changelog
control
control.in
control.kde.in
=== modified file 'changelog'
--- a/changelog 2009-10-02 00:14:30 +0000
+++ b/changelog 2009-10-02 12:23:41 +0000
@@ -22,8 +22,13 @@
(closes: #548608)
- fix lang= handling for DEB_BUILD_OPTIONS
- point --with-external-{dict,hyph,thes}-dir to the new locations
- * debian/control.in: break dict/hyphen patterns/thesauri packages
- with the old location
+ * debian/control.in:
+ - break dict/hyphen patterns/thesauri packages with the old location
+ - stop making -common have a hard depends on the default iconset; make
+ it depend on openoffice.orgVER-style-default | openoffice.orgVER-style
+ and make -gtk/-kde only recommend -style-tango/-style-{crystal,oxgen}.
+ Provide openoffice.orgVER-style on all -style-* (closes: #423021)
+ Stop -style-* depending on -common (closes: #406778)
* debian/control.mysql.in: remove bogus conflicts, add Homepage:
* debian/shell-lib.sh:
- check whether OOo is running before (de-)registering extensions or
@@ -32,7 +37,7 @@
it breaks. Removing "Adding extension XY .. done" echos
* debian/templates, debian/po: add debconf error shown when OOo is running
- -- Rene Engelhard <r...@debian.org> Wed, 30 Sep 2009 13:49:29 +0200
+ -- Rene Engelhard <r...@debian.org> Fri, 02 Oct 2009 10:19:04 +0200
openoffice.org (1:3.1.1-2) unstable; urgency=low
=== modified file 'control'
--- a/control 2009-10-02 00:14:30 +0000
+++ b/control 2009-10-02 12:23:41 +0000
@@ -112,7 +112,7 @@
Package: openoffice.org-common
Architecture: all
-Depends: openoffice.org-style-galaxy, ${misc:Depends}
+Depends: openoffice.org-style-default | openoffice.org-style, ${misc:Depends}
Suggests: openoffice.org-style-industrial, openoffice.org-style-hicontrast
Recommends: openoffice.org-style-tango, openoffice.org-style-crystal,
openoffice.org-style-oxygen, xfonts-mathml
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)
@@ -249,9 +249,10 @@
Package: openoffice.org-style-crystal
Architecture: all
-Depends: openoffice.org-common (= ${source:Version}), ${misc:Depends}
+Depends: ${misc:Depends}
Suggests: kde-icons-crystal, crystalcursors
Replaces: openoffice.org-common (<< 2.1~m190)
+Provides: openoffice.org-style
Description: full-featured office productivity suite -- Crystal symbol style
OpenOffice.org is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
@@ -260,9 +261,10 @@
Package: openoffice.org-style-oxygen
Architecture: all
-Depends: openoffice.org-common (= ${source:Version}), ${misc:Depends}
+Depends: ${misc:Depends}
Suggests: kde-icons-oxygen, oxygencursors
Replaces: openoffice.org-common (<< 2.1~m190)
+Provides: openoffice.org-style
Description: full-featured office productivity suite -- Oxygen symbol style
OpenOffice.org is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
@@ -271,9 +273,10 @@
Package: openoffice.org-style-industrial
Architecture: all
-Depends: openoffice.org-common (= ${source:Version}), ${misc:Depends}
+Depends: ${misc:Depends}
Suggests: gtk2-engines, gnome-themes, industrial-cursor-theme
Replaces: openoffice.org-common (<< 2.1~m190)
+Provides: openoffice.org-style
Description: full-featured office productivity suite -- Industrial symbol style
OpenOffice.org is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
@@ -282,9 +285,10 @@
Package: openoffice.org-style-tango
Architecture: all
-Depends: openoffice.org-common (= ${source:Version}), ${misc:Depends}
+Depends: ${misc:Depends}
Suggests: tango-icon-theme
Replaces: openoffice.org-common (<< 2.1~m190)
+Provides: openoffice.org-style
Description: full-featured office productivity suite -- Tango symbol style
OpenOffice.org is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
@@ -294,9 +298,10 @@
Package: openoffice.org-style-hicontrast
Architecture: all
-Depends: openoffice.org-common (= ${source:Version}), ${misc:Depends}
+Depends: ${misc:Depends}
Suggests: gtk2-engines
Replaces: openoffice.org-common (<< 2.1~m190)
+Provides: openoffice.org-style
Description: full-featured office productivity suite -- Hicontrast symbol style
OpenOffice.org is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
@@ -306,10 +311,10 @@
Package: openoffice.org-style-galaxy
Architecture: all
-Depends: openoffice.org-common (= ${source:Version}), ${misc:Depends}
+Depends: ${misc:Depends}
Replaces: openoffice.org-common (<< 2.1~m190), openoffice.org-style-default,
openoffice.org-style-andromeda
Conflicts: openoffice.org-style-default
-Provides: openoffice.org-style-default
+Provides: openoffice.org-style-default, openoffice.org-style
Description: full-featured office productivity suite -- Galaxy (Default)
symbol style
OpenOffice.org is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
@@ -320,8 +325,9 @@
Package: openoffice.org-style-andromeda
Architecture: all
-Depends: openoffice.org-common (= ${source:Version}), ${misc:Depends}
+Depends: ${misc:Depends}
Replaces: openoffice.org-common (<< 2.1~m190)
+Provides: openoffice.org-style
Description: full-featured office productivity suite -- Andromeda (Classic)
symbol style
OpenOffice.org is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
@@ -333,7 +339,8 @@
Package: openoffice.org-gtk
Architecture: i386 powerpc mips mipsel armel s390 m68k amd64 ia64 ppc64 s390x
-Depends: openoffice.org-core (= ${binary:Version}),
openoffice.org-style-tango, ${shlibs:Depends}, ${misc:Depends}
+Depends: openoffice.org-core (= ${binary:Version}), ${shlibs:Depends},
${misc:Depends}
+Recommends: openoffice.org-style-tango,
Section: gnome
Enhances: openoffice.org
Replaces: openoffice.org-gnome (<< 2.0.4~rc1-0), openoffice.org-common (<<
2.0.4~rc1-0)
@@ -3462,7 +3469,8 @@
Package: openoffice.org-kde
Architecture: i386 powerpc mips mipsel armel s390 m68k amd64 ia64 ppc64 s390x
-Depends: openoffice.org-core (= ${binary:Version}), ${kde-iconset-dep},
${shlibs:Depends}, ${misc:Depends}
+Depends: openoffice.org-core (= ${binary:Version}), ${shlibs:Depends},
${misc:Depends}
+Recommends: ${kde-iconset-dep}
Suggests: konqueror, kmail, openoffice.org-kab
Section: kde
Enhances: openoffice.org
=== modified file 'control.in'
--- a/control.in 2009-10-02 00:14:30 +0000
+++ b/control.in 2009-10-02 12:23:41 +0000
@@ -259,7 +259,7 @@
Package: openoffice.orgVER-common
Architecture: all
-Depends: openoffice.orgVER-style-galaxy,
+Depends: openoffice.orgVER-style-default | openoffice.orgVER-style,
${misc:Depends}
Suggests: openoffice.orgVER-style-industrial,
openoffice.orgVER-style-hicontrast
@@ -500,10 +500,10 @@
Package: openoffice.orgVER-style-crystal
Architecture: all
-Depends: openoffice.orgVER-common (= ${source:Version}),
- ${misc:Depends}
+Depends: ${misc:Depends}
Suggests: kde-icons-crystal, crystalcursors
Replaces: openoffice.orgVER-common (<< 2.1~m190)
+Provides: openoffice.orgVER-style
Description: full-featured office productivity suite -- Crystal symbol style
OpenOffice.org is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
@@ -512,10 +512,10 @@
Package: openoffice.orgVER-style-oxygen
Architecture: all
-Depends: openoffice.orgVER-common (= ${source:Version}),
- ${misc:Depends}
+Depends: ${misc:Depends}
Suggests: kde-icons-oxygen, oxygencursors
Replaces: openoffice.orgVER-common (<< 2.1~m190)
+Provides: openoffice.orgVER-style
Description: full-featured office productivity suite -- Oxygen symbol style
OpenOffice.org is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
@@ -524,10 +524,10 @@
Package: openoffice.orgVER-style-industrial
Architecture: all
-Depends: openoffice.orgVER-common (= ${source:Version}),
- ${misc:Depends}
+Depends: ${misc:Depends}
Suggests: gtk2-engines, gnome-themes, industrial-cursor-theme
Replaces: openoffice.orgVER-common (<< 2.1~m190)
+Provides: openoffice.orgVER-style
Description: full-featured office productivity suite -- Industrial symbol style
OpenOffice.org is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
@@ -536,10 +536,10 @@
Package: openoffice.orgVER-style-tango
Architecture: all
-Depends: openoffice.orgVER-common (= ${source:Version}),
- ${misc:Depends}
+Depends: ${misc:Depends}
Suggests: tango-icon-theme
Replaces: openoffice.orgVER-common (<< 2.1~m190)
+Provides: openoffice.orgVER-style
Description: full-featured office productivity suite -- Tango symbol style
OpenOffice.org is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
@@ -549,10 +549,10 @@
Package: openoffice.orgVER-style-hicontrast
Architecture: all
-Depends: openoffice.orgVER-common (= ${source:Version}),
- ${misc:Depends}
+Depends: ${misc:Depends}
Suggests: gtk2-engines
Replaces: openoffice.orgVER-common (<< 2.1~m190)
+Provides: openoffice.orgVER-style
Description: full-featured office productivity suite -- Hicontrast symbol style
OpenOffice.org is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
@@ -562,11 +562,10 @@
Package: openoffice.orgVER-style-galaxy
Architecture: all
-Depends: openoffice.orgVER-common (= ${source:Version}),
- ${misc:Depends}
+Depends: ${misc:Depends}
Replaces: openoffice.orgVER-common (<< 2.1~m190),
openoffice.orgVER-style-default, openoffice.org-style-andromeda
Conflicts: openoffice.orgVER-style-default
-Provides: openoffice.orgVER-style-default
+Provides: openoffice.orgVER-style-default, openoffice.orgVER-style
Description: full-featured office productivity suite -- Galaxy (Default)
symbol style
OpenOffice.org is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
@@ -577,9 +576,9 @@
Package: openoffice.orgVER-style-andromeda
Architecture: all
-Depends: openoffice.orgVER-common (= ${source:Version}),
- ${misc:Depends}
+Depends: ${misc:Depends}
Replaces: openoffice.orgVER-common (<< 2.1~m190)
+Provides: openoffice.orgVER-style
Description: full-featured office productivity suite -- Andromeda (Classic)
symbol style
OpenOffice.org is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
@@ -592,9 +591,9 @@
Package: openoffice.orgVER-gtk
Architecture: %OOO_ARCHS%
Depends: openoffice.orgVER-core (= ${binary:Version}),
- openoffice.orgVER-style-tango,
${shlibs:Depends},
${misc:Depends}
+Recommends: openoffice.orgVER-style-tango,
Section: gnome
Enhances: openoffice.orgVER
Replaces: openoffice.org-gnome (<< 2.0.4~rc1-0),
=== modified file 'control.kde.in'
--- a/control.kde.in 2009-09-29 11:08:34 +0000
+++ b/control.kde.in 2009-10-02 12:23:41 +0000
@@ -1,9 +1,9 @@
Package: openoffice.orgVER-kde
Architecture: %OOO_ARCHS%
Depends: openoffice.orgVER-core (= ${binary:Version}),
- ${kde-iconset-dep},
${shlibs:Depends},
${misc:Depends}
+Recommends: ${kde-iconset-dep}
Suggests: konqueror,
kmail,
openoffice.orgVER-kab
