~ubuntu-branches/ubuntu/vivid/xfce4-session/vivid-proposed

Viewing all changes in revision 67.

  • Committer: Package Import Robot
  • Author(s): Lionel Le Folgoc
  • Date: 2012-05-17 23:48:38 UTC
  • mfrom: (4.2.12 sid)
  • Revision ID: package-import@ubuntu.com-20120517234838-lrjyxhl3wg5ticj7
Tags: 4.8.3-2ubuntu1
* Merge from Debian testing, 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.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: