-
Committer:
Bazaar Package Importer
-
Author(s):
Michael Terry
-
Date:
2010-12-08 11:28:26 UTC
-
mfrom:
(3.1.6 experimental)
-
Revision ID:
james.westby@ubuntu.com-20101208112826-6hcb5ixtesolmw75
Tags: 0.26-1ubuntu1
* Merge from debian experimental. Remaining changes:
- Use the Ubuntu sound theme as the default and fallback theme
- gnome-session-canberra recommends libcanberra-pulse
* debian/control:
- Dropped conflicts/replace for libcanberra-gnome(-dbg) because it's
been fixed since jaunty and natty needn't care about direct upgrades
from hardy or intrepid.
- Added breaks/replace for libcanberra-gtk-dev to new package
libcanberra-gtk-common-dev that took some of its files
* debian/gnome-session-canberra.install:
- Drop Ubuntu change to install ready-sound.desktop because Debian
does it too now.