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

Created by Jackson Doak on 2015-07-24 and last modified on 2015-07-24
Get this branch:
bzr branch lp:~noskcaj/ubuntu/wily/light-locker/merge
Only Jackson Doak can upload to this branch. If you are Jackson Doak please log in for upload directions.

Branch merges

Related bugs

Related blueprints

Branch information

Owner:
Jackson Doak
Status:
Development

Recent revisions

12. By Jackson Doak on 2015-07-24

* 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

11. By Jackson Doak on 2015-07-24

Merging shared upstream rev into target branch.

10. By Logan Rosen on 2015-06-21

* Merge from Debian unstable. Remaining changes:
  - debian/control: Recommend light-locker settings | xfce4-power-manager.
  - debian/rules: Build with no-lock-on-suspend and late-locking support.
* Drop unnecessary dh-autoreconf usage.
* Build-depend on liblightdm-gobject-1-dev instead of
  liblightdm-gobject-dev.

9. By Logan Rosen on 2015-05-25

* Merge from Debian unstable. Remaining changes:
  - debian/control:
    + Build-depend on dh-autoreconf and xdt-autogen.
    + Add light-locker-settings | xfce4-power-manager to Recommends.
  - debian/patches/lid-closed.patch: Take patch from upstream to resolve
    black screen bugs.
  - debian/rules:
    - Use xdt-autogen and dh-autoreconf.
    - Build with no-lock-on-suspend and late-locking support.

8. By Unit 193 on 2015-02-24

d/p/lid-closed.patch: Refresh patch from upstream.
Handle UPower lid event with systemd too.

7. By Unit 193 on 2015-02-16

* New upstream release.
* d/p/lid-closed.patch: Take patch from upstream to resolve black screen
  bugs.
  - Use dh-autoreconf and xdt-autogen.

6. By Sean Davis on 2014-12-17

* New development release.
* Merged packaging from debian unstable, remaining changes:
  - debian/control:
    - Remove liblightdm-gobject-dev, not in Ubuntu and not required
      to build and operate
    - Add light-locker-settings | xfce4-power-manager to Recommends
    - Update standards version to 3.9.6
  - debian/rules:
    - Build with no-lock-on-suspend and late-locking support

5. By Sean Davis on 2014-03-23

* New upstream release (lp: #1296456)
* debian/control: Add light-locker-settings to Recommends (lp: #1289563)
* debian/rules: Build with no-lock-on-suspend and late-locking support

4. By Sean Davis on 2014-03-16

[ Sean Davis ]
* New upstream release (lp: #1293100).

[ Dmitry Shachnev ]
* Remove broken filenamemangle from debian/watch to make it working.

3. By Stephen M. Webb on 2014-02-16

* New upstream release (lp: #1280876).
* debian/rules: replace autogen.sh with xdg-autogen (upstream change)
  - added --fail-missing for extra Fun
* debian/control: update Standards-Version to 3.9.5 (no changes required)

Branch metadata

Branch format:
Branch format 7
Repository format:
Bazaar repository format 2a (needs bzr 1.16 or later)
Stacked on:
lp:ubuntu/wily/light-locker
This branch contains Public information 
Everyone can see this information.

Subscribers