~noskcaj/ubuntu/utopic/xfce4-session/merge

Viewing all changes in revision 82.

  • Committer: Jackson Doak
  • Date: 2014-07-21 06:56:11 UTC
  • mfrom: (4.2.21 sid)
  • Revision ID: noskcaj@ubuntu.com-20140721065611-69a83wb7q1hdhpg9
* 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
    + xflock4-light-locker-support.patch.
  - Add startxfce4.user-session.upstart
* Drop xubuntu_runtime-logind-support.patch, fixed in debian

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: