-
Committer:
Bazaar Package Importer
-
Author(s):
Lionel Le Folgoc
-
Date:
2011-06-26 21:54:49 UTC
-
mfrom:
(4.2.6 sid)
-
Revision ID:
james.westby@ubuntu.com-20110626215449-apw575fsjrp18az5
Tags: 4.8.1-3ubuntu1
* Merge from Debian unstable, 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_ignore-gdm-lang.patch: do not set $LANG to $GDM_LANG, there's
already an xsession script to do that, and $GDM_LANG might not contain
a valid locale code.
+ series: apply these patches.