-
Committer:
Package Import Robot
-
Author(s):
Lionel Le Folgoc
-
Date:
2013-07-01 19:35:39 UTC
-
mfrom:
(4.2.15 sid)
-
Revision ID:
package-import@ubuntu.com-20130701193539-tqwsq1uwaau0sxpi
Tags: 4.10.1-1ubuntu1
* 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. lp #927172
* debian/patches:
- xfsm-startup-random-crash.patch: dropped, included in 4.10.1.
- xubuntu_ignore-gdm-lang.patch: updated to apply cleanly.
* Check for logind support at runtime (lp: #1178373):
- debian/patches/xubuntu_runtime-logind-support.patch: added.
- 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.