-
Committer:
Bazaar Package Importer
-
Author(s):
Stefan Ebner
-
Date:
2008-03-24 16:31:50 UTC
-
mfrom:
(1.1.8 upstream)
-
Revision ID:
james.westby@ubuntu.com-20080324163150-1csoel6vd91j3zjw
Tags: 1.5.0-1ubuntu1
* Merge from Debian unstable. (LP: #203919) Remaining Ubuntu changes:
+ debian/control:
- Add versioned conflicts/replaces against audacious-plugins-extra to
audacious-plugins, since the libpulse output plugin used to live in
audacious-plugins-extra
- Suggests timidiy since midi files won't be played without it
- Modify Maintainer value to match Debian-Maintainer-Field Spec
- PulseAudio plugin movement from extra package to main
because of the switchover to PulseAudio in hardy