-
Committer:
Bazaar Package Importer
-
Author(s):
Steve Langasek, Jeff Licquia
-
Date:
2009-06-02 20:20:07 UTC
-
mfrom:
(1.1.3 squeeze)
-
Revision ID:
james.westby@ubuntu.com-20090602202007-yrfljcu970v0kcqd
Tags: 4.0-0ubuntu1
* Merge from Debian unstable, remaining changes:
- lsb-base-logging-ubuntu.sh: change log_{success,warning,failure}_msg()
to use usplash_write "TEXT" instead of "STATUS" to avoid unreadable
line-wrapping when using usplash in verbose mode.
- Don't conflict with python (>= 2.6).
- Depend on postfix rather than exim4 as preferred mail-transport-agent
alternative.
- Depend on libgl1-mesa-glx rather than libgl1-mesa as preferred libgl1
alternative.
- Since /etc/lsb-release overrides detected information, there's no
need to try and detect that information if lsb-release contains
everything we need. This saves us calling the hugely expensive
apt-cache.
- Add Ubuntu logging functions.
[ Jeff Licquia ]
* Upgrade to support LSB 4.0.