-
Committer:
Bazaar Package Importer
-
Author(s):
Jeremy Bicha
-
Date:
2011-08-12 06:16:31 UTC
-
mfrom:
(8.1.26 sid)
-
Revision ID:
james.westby@ubuntu.com-20110812061631-fejlqujqum33j1fa
Tags: 1:2.30+11ubuntu1
* Merge with Debian unstable. (LP: #796474) Remaining changes:
- gnome
+ Use system-config-printer-gnome instead of
system-config-printer.
+ Use gdm instead of gdm3; gdm-themes doesn't exist in Ubuntu
+ Comment out libreoffice-evolution as it's not in Ubuntu yet
- gnome-core-devel: Remove libgail-dev as gail is in gtk2.
- gnome-dbg:
+ Remove depend on libgail-dbg.
+ Recommend liboobs-1-5-dbg instead of liboobs-1-4-dbg.
+ Recommend libnspr4-dbg instead of libnspr4-0d-dbg
+ Recommend libnss3-dbg instead of libnss3-1d-dbg
+ Recommend libwebkitgtk-1.0-0-dbg instead of libwebkit-1.0-2-dbg
- gnome-desktop-environment: Don't depend on non-existing
gnome-mount (obsoleted by udisks).
- gnome-accessibility
+ Use sound-theme-freedesktop instead of freedesktop-sound-theme