-
Committer:
Bazaar Package Importer
-
Author(s):
Lionel Le Folgoc
-
Date:
2011-02-19 12:23:14 UTC
-
mfrom:
(4.1.3 experimental)
-
Revision ID:
james.westby@ubuntu.com-20110219122314-yn53fzko3xqacee5
Tags: 4.8.1-1ubuntu1
* Merge from Debian experimental, remaining Ubuntu changes:
- debian/control: build-depends on libgconf2-dev and libgnome-keyring-dev
to enable GNOME services support.
- debian/rules: pass --enable-gnome --enable-libgnome-keyring to
dh_auto_configure.
- debian/patches:
+ xubuntu_lock-the-screen-on-hibernate-suspend.patch: copy the behavior
of xfce4-power-manager for consistency.
+ xubuntu_force-xsettings-daemon.patch: start xfsettingsd with --force
to replace a spurious gnome-settings-daemon instance left by gdm.
Revert when gdm is fixed. lp: #709148
+ series: apply these patches.