./packages/openofficeorg/3.1/experimental r1508: merge
------------------------------------------------------------
revno: 1508
committer: Rene Engelhard <rene@debian.org>
branch nick: experimental
timestamp: Thu 2009-04-23 13:30:58 +0200
message:
merge
modified:
changelog
control
control.in
------------------------------------------------------------
revno: 1332.1.131
committer: Rene Engelhard <rene@debian.org>
branch nick: unstable
timestamp: Thu 2009-04-23 13:26:14 +0200
message:
recommend xfonts-mathml
modified:
changelog
control
control.in
=== modified file 'changelog'
--- a/changelog 2009-04-19 20:22:16 +0000
+++ b/changelog 2009-04-23 11:30:58 +0000
@@ -25,6 +25,8 @@
- remove Python26 special-casing, we now have a generic patch for 2.4 and
2.6
- remove scsolver stuff, scsolver is gone from ooo-build
+ * debian/control.in:
+ - make openoffice.org-common recommends xfonts-mathml (closes: #525245)
-- Rene Engelhard <rene@debian.org> Sun, 19 Apr 2009 21:38:52 +0200
=== modified file 'control'
--- a/control 2009-04-19 18:33:42 +0000
+++ b/control 2009-04-23 11:30:58 +0000
@@ -115,7 +115,7 @@
Architecture: all
Depends: openoffice.org-style-galaxy, ${misc:Depends}
Suggests: openoffice.org-style-industrial, openoffice.org-style-hicontrast
-Recommends: openoffice.org-style-tango, openoffice.org-style-crystal
+Recommends: openoffice.org-style-tango, openoffice.org-style-crystal, 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-core (= 2.0.4~rc3-1), 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-5), dictionaries-common (<< 0.98.14)
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)
=== modified file 'control.in'
--- a/control.in 2009-04-17 18:40:12 +0000
+++ b/control.in 2009-04-23 11:30:58 +0000
@@ -263,9 +263,10 @@
Depends: openoffice.orgVER-style-galaxy,
${misc:Depends}
Suggests: openoffice.orgVER-style-industrial,
- openoffice.orgVER-style-hicontrast
+ openoffice.orgVER-style-hicontrast,
Recommends: openoffice.orgVER-style-tango,
- openoffice.orgVER-style-crystal
+ openoffice.orgVER-style-crystal,
+ xfonts-mathml
Conflicts: openoffice.org-debian-files,
openoffice.org-mimelnk,
openoffice.org2-common,
Reply to: