-
Committer:
Bazaar Package Importer
-
Author(s):
Ubuntu Merge-o-Matic
-
Date:
2009-02-27 01:15:02 UTC
-
mfrom:
(2.2.2 squeeze)
-
Revision ID:
james.westby@ubuntu.com-20090227011502-kmmlgac5u0i54xdn
Tags: 0.14.2-3ubuntu1
* Merge from debian unstable, Ubuntu remaining changes:
- debian/control:
+ Build-Depends on libavformat-dev to add ffmpeg support.
+ Don't build-depends on libmikmod2-dev (Debian bug #510675).
+ Move avahi-daemon from Suggests field to Recommends field.
- debian/mpd.init.d:
+ Read mpd user from mpd.conf.
- debian/rules:
+ Don't compile with --disable-ffmpeg to add ffmpeg support.