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

Viewing all changes in revision 83.

  • Committer: Jackson Doak
  • Date: 2014-08-16 21:28:23 UTC
  • mfrom: (4.2.22 sid)
  • Revision ID: noskcaj@ubuntu.com-20140816212823-3np6cf0x54xk8a16
* 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
  - Add startxfce4.user-session.upstart
* Drop xflock4-light-locker-support.patch, fixed in debian
* debian/patches:
  - 02_add-light-locker-to-xflock4 added, add light-locker support to
    xflock4 now that it's in Jessie.                          closes: #757649

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: