~noskcaj/ubuntu/wily/light-locker/merge

Viewing all changes in revision 12.

  • Committer: Jackson Doak
  • Date: 2015-07-24 21:33:13 UTC
  • mfrom: (0.1.7 sid)
  • Revision ID: noskcaj@ubuntu.com-20150724213313-rpstk76ny7l0lsz8
* Merge from Debian unstable. Remaining changes:
  - debian/control:
    + Recommend light-locker settings | xfce4-power-manager.
    + Build-depend on liblightdm-gobject-1-dev instead of
      liblightdm-gobject-dev.
  - debian/rules: Build with no-lock-on-suspend and late-locking support.
* debian/patches:
  - 02_libsystemd added, build against libsystemd, patch from Michael Biebl.
                                                              closes: #779749

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: