Viewing all changes in revision 28.
- Committer: Bazaar Package Importer
- Date: 2010-05-28 11:06:28 UTC
- mfrom: (1.1.9 upstream) (3.1.5 squeeze)
- Revision ID: james.westby@ubuntu.com-20100528110628-oimp3fkqkldc4v7y
* Merge from debian unstable. Remaining changes:
- Let libcanberra-gtk0(-dbg) conflicts/replaces libcanberra-gnome(-dbg)
- Use the Ubuntu sound theme as the default and fallback theme
- gnome-session-canberra recommends libcanberra-pulse
- Add the login ready sound desktop file to gnome-session-canberra
- Let libcanberra-gtk0(-dbg) conflicts/replaces libcanberra-gnome(-dbg)
- Use the Ubuntu sound theme as the default and fallback theme
- gnome-session-canberra recommends libcanberra-pulse
- Add the login ready sound desktop file to gnome-session-canberra
- files removed:
- .pc
- debian/patches
- files modified:
- Makefile.in
expand all
collapse all
added
removed
