-
Committer:
Jackson Doak
-
Date:
2013-10-23 21:13:30 UTC
-
mfrom:
(4.2.17 sid)
-
Revision ID:
noskcaj@ubuntu.com-20131023211330-0tpnt8lzdpskmkid
* Merge from Debian unstable, remaining Ubuntu changes:
- debian/patches:
+ 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.
+ xubuntu_set-xdg-current-desktop.patch: added. Taken from xfce4-utils,
export XDG_CURRENT_DESKTOP=XFCE, can be useful with alacarte and
gnome-menus.
+ debian/patches/xubuntu_runtime-logind-support.patch:
Check for logind support at runtime
- debian/rules:
+ call xdt-autogen after patching
+ clean up autogenerated files modified by xdt-autogen.
- debian/control:
+ add build-dep on libpolkit-gobject-1-dev (>= 0.100).
+ add build-dep on xfce4-dev-tools and libtool in order to run xdt-autogen
after patching.
+ don't recommend consolekit anymore.