------------------------------------------------------------
revno: 1077
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: unstable
timestamp: Tue 2008-04-22 17:48:13 +0200
message:
suggest ttf-liberation as an alternative to msttcorefonts
modified:
changelog
control
control.in
=== modified file 'changelog'
--- a/changelog 2008-04-21 15:09:37 +0000
+++ b/changelog 2008-04-22 15:48:13 +0000
@@ -20,13 +20,15 @@
- only add a dependency on openoffice.org-officebean to openoffice.org
when openoffice.org-officebean is actually built (i.e. we build with
Java), thaks Chris Cheney
+ * debian/control.in:
+ - suggest msttcorefonts | ttf-liberation instead only msttcorefonts
* debian/changelog: mention the various security fixes in OOH680_m5 and
OOH680_m6
* merge from Ubuntu:
- debian/rules:
+ Correct control.mozilla.in inclusion regardless of host architecture
- -- Rene Engelhard <[EMAIL PROTECTED]> Mon, 21 Apr 2008 17:02:51 +0200
+ -- Rene Engelhard <[EMAIL PROTECTED]> Tue, 22 Apr 2008 17:47:32 +0200
openoffice.org (1:2.4.0-4) unstable; urgency=medium
=== modified file 'control'
--- a/control 2008-04-17 16:33:35 +0000
+++ b/control 2008-04-22 15:48:13 +0000
@@ -14,7 +14,7 @@
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, ${ooo-officebean-dep},
${ooo-binfilter-dep}, ${writer-w2l-dep}, openoffice.org-filter-mobiledev,
${java-common-depends}
-Suggests: hunspell-dictionary, myspell-dictionary,
openoffice.org-help-${help-l10n-virtual-version},
openoffice.org-l10n-${help-l10n-virtual-version}, menu, unixodbc, cupsys-bsd,
libsane, ttf-dejavu, 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, ttf-dejavu, openoffice.org-hyphenation, openoffice.org2-thesaurus,
libxrender1, libgl1, msttcorefonts | ttf-liberation, 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
@@ -55,7 +55,8 @@
* 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)
+ * msttcorefonts | ttf-liberation: Installs standard MS truetype fonts
+ (contrib) / contains "free" fonts matching the glyphs of e.g. Times
* 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-04-16 21:18:59 +0000
+++ b/control.in 2008-04-22 15:48:13 +0000
@@ -84,7 +84,7 @@
openoffice.org2-thesaurus,
libxrender1,
libgl1,
- msttcorefonts,
+ msttcorefonts | ttf-liberation,
openoffice.orgVER-gnome | openoffice.orgVER-kde,
iceweasel | firefox | icedove | thunderbird | iceape-browser |
mozilla-browser,
${java-runtime-depends},
@@ -133,7 +133,8 @@
* 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)
+ * msttcorefonts | ttf-liberation: Installs standard MS truetype fonts
+ (contrib) / contains "free" fonts matching the glyphs of e.g. Times
* java-gcj-compat | sun-java5-jre | java2-runtime
Java Runtime Environment for use with OpenOffice.org
* pstoedit / imagemagick: helper tools for EPS thumbnails
