./packages/openofficeorg/2.4.1/unstable r1138: update ooo-build; depend on ttf-liberation and stop suggesting msttcorefonts
------------------------------------------------------------
revno: 1138
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Sun 2008-06-22 03:23:38 +0200
message:
update ooo-build; depend on ttf-liberation and stop suggesting msttcorefonts
modified:
changelog
control
control.in
=== modified file 'changelog'
--- a/changelog 2008-06-18 17:21:41 +0000
+++ b/changelog 2008-06-22 01:23:38 +0000
@@ -1,12 +1,18 @@
openoffice.org (1:2.4.1-3.4pre) unstable; urgency=low
* ooo-build
- + update (r12913)
+ + update (r12931)
+ + sw-field-patch-fix-competing-protection.diff: for the competing
+ protection problem from n#400884 (really closes: #477653)
+ + distro-configs/Common.conf.in: randr reenabled per default
* debian/rules:
- reenable randr
- reenable mono, mono seems to be fixed on amd64
+ * debian/control.in:
+ - make openoffice.org metapackage depend on ttf-liberation. Remove
+ msttcorefonts suggestion.
- -- Rene Engelhard <rene@debian.org> Wed, 18 Jun 2008 19:19:50 +0200
+ -- Rene Engelhard <rene@debian.org> Sun, 22 Jun 2008 03:15:12 +0200
openoffice.org (1:2.4.1-3) unstable; urgency=medium
=== modified file 'control'
--- a/control 2008-06-18 17:39:09 +0000
+++ b/control 2008-06-22 01:23:38 +0000
@@ -13,9 +13,9 @@
Package: openoffice.org
Architecture: i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64
-Depends: openoffice.org-core (= ${Source-Version}), openoffice.org-writer, openoffice.org-calc, openoffice.org-impress, openoffice.org-draw, openoffice.org-math, openoffice.org-base, ttf-dejavu, ${ooo-officebean-dep}, ${writer-w2l-dep}, openoffice.org-filter-mobiledev, ${java-common-depends}
+Depends: openoffice.org-core (= ${Source-Version}), openoffice.org-writer, openoffice.org-calc, openoffice.org-impress, openoffice.org-draw, openoffice.org-math, openoffice.org-base, ttf-dejavu, ttf-liberation, ${ooo-officebean-dep}, ${writer-w2l-dep}, openoffice.org-filter-mobiledev, ${java-common-depends}
Recommends: ${ooo-binfilter-dep}
-Suggests: hunspell-dictionary, myspell-dictionary, openoffice.org-help-${help-l10n-virtual-version}, openoffice.org-l10n-${help-l10n-virtual-version}, menu, unixodbc, cupsys-bsd, libsane, openoffice.org-hyphenation, openoffice.org2-thesaurus, libxrender1, libgl1, msttcorefonts, openoffice.org-gnome | openoffice.org-kde, iceweasel | firefox | icedove | thunderbird | iceape-browser | mozilla-browser, ${java-runtime-depends}, openclipart-openoffice.org, pstoedit, graphicsmagick-imagemagick-compat | imagemagick, libpaper-utils, ${gstreamer-plugins-suggests}
+Suggests: hunspell-dictionary, myspell-dictionary, openoffice.org-help-${help-l10n-virtual-version}, openoffice.org-l10n-${help-l10n-virtual-version}, menu, unixodbc, cupsys-bsd, libsane, openoffice.org-hyphenation, openoffice.org2-thesaurus, libxrender1, libgl1, openoffice.org-gnome | openoffice.org-kde, iceweasel | firefox | icedove | thunderbird | iceape-browser | mozilla-browser, ${java-runtime-depends}, openclipart-openoffice.org, pstoedit, graphicsmagick-imagemagick-compat | imagemagick, libpaper-utils, ${gstreamer-plugins-suggests}
Conflicts: openoffice.org2 (<< ${Source-Version})
Replaces: openoffice.org2 (<< ${Source-Version}), openoffice.org-debian-files
Provides: openoffice.org2
@@ -56,7 +56,6 @@
* openclipart-openoffice.org: Open Clip Art Gallery with OOo index files
* iceweasel | firefox | icedove | thunderbird | iceape-browser | mozilla-browser:
Mozilla profile with Certificates needed for XML Security...
- * msttcorefonts: Installs standard MS truetype fonts (contrib)
* java-gcj-compat | sun-java5-jre | java2-runtime
Java Runtime Environment for use with OpenOffice.org
* pstoedit / imagemagick: helper tools for EPS thumbnails
=== modified file 'control.in'
--- a/control.in 2008-06-13 21:48:14 +0000
+++ b/control.in 2008-06-22 01:23:38 +0000
@@ -67,6 +67,7 @@
openoffice.orgVER-math,
openoffice.orgVER-base,
ttf-dejavu,
+ ttf-liberation,
${ooo-officebean-dep},
${writer-w2l-dep},
openoffice.orgVER-filter-mobiledev,
@@ -84,7 +85,6 @@
openoffice.org2-thesaurus,
libxrender1,
libgl1,
- msttcorefonts,
openoffice.orgVER-gnome | openoffice.orgVER-kde,
iceweasel | firefox | icedove | thunderbird | iceape-browser | mozilla-browser,
${java-runtime-depends},
@@ -133,7 +133,6 @@
* openclipart-openoffice.org: Open Clip Art Gallery with OOo index files
* iceweasel | firefox | icedove | thunderbird | iceape-browser | mozilla-browser:
Mozilla profile with Certificates needed for XML Security...
- * msttcorefonts: Installs standard MS truetype fonts (contrib)
* java-gcj-compat | sun-java5-jre | java2-runtime
Java Runtime Environment for use with OpenOffice.org
* pstoedit / imagemagick: helper tools for EPS thumbnails
Reply to: