-
Committer:
Bazaar Package Importer
-
Author(s):
Matthias Klose
-
Date:
2008-06-25 11:08:02 UTC
-
mfrom:
(1.1.6 upstream)
(0.1.4 lenny)
-
Revision ID:
james.westby@ubuntu.com-20080625110802-r4ou6gkwalr9cjzz
Tags: 2.6.0-1ubuntu1
* Merge with Debian; remaining changes:
- conf.d/40-nonlatin.conf: Add `MgOpen Moderna' to the list of fonts
for which we might fall back to sans-serif.
- conf.d/60-latin.conf: Prefer DejaVu over Bitstream Vera,
as done for dapper.
- 52-languageselector.conf loads language-selector.conf.
- Include 52-languageselector.conf in the lists in conf.d/Makefile.am so
that it actually gets installed and used. Fixes LP 73714.
- Some hackery in the debconf config script which attempts to upgrade
user preferences across the many changes which have occurred to the
debconf questions. In particular:
+ Do not attempt to divine enable_bitmaps option by reading the
symlinks in /etc. This leaves the only way to permanently change
the behaviour being dpkg-reconfigure. The divination code was
wrong and was intended by Debian to preserve pre-debconf
configuration. It would be nicer to preserve handmade updates to
the /etc directory.
+ Always create /etc/fontconfig/conf.d/ symlink for enabling or
disabling bitmap fonts. This records the state from debconf
unambiguously into the filesystem and will make it possible for
future upgrades (from Edgy or later) to preserve handmade changes.
- Add a (optional) include for "language-selector.conf" in fonts.conf
- debian/patches/03_preferred_symbol_font.patch:
+ prefer "Standard Symbols L" as symbol font (Ubuntu: #37745)
- Fix incorrect location of /usr/share/X11/fonts.
- Correctly fix the (eg) firefox vs. (eg) evince font metrics problem:
+ New FC_ANY_METRICS property, boolean.
+ Change URW Nimbus and AMT font aliases in 30-{urw,metric}-aliases.conf
into equivalent <match> directives so that we can add an additional
test which disables them when the anymetrics property is true.
- debian/rules (clean): Clean doc directory.
- add debian/patches/05_ubuntu_hinting_and_antialias_confs.patch:
- adds 10-antialias.conf, 10-hinting.conf, 10-hinting-full.conf,
10-hinting-medium.conf and 10-hinting-slight.conf
- modified conf.d/Makefile.am and conf.d/Makefile.in so that
10-antialias.conf, 10-hinting.conf, 10-hinting-medium.conf and
10-no-subpixel.conf get linked by default to have te same default
settings for all Ubuntu flavors. 10-hinting-full.conf and
10-hinting-slight.conf will go into conf.avail/ .