Ubuntu
light-locker package

Merge lp://qastaging/~noskcaj/ubuntu/wily/light-locker/merge into lp://qastaging/ubuntu/wily/light-locker

  1. Wily (15.10)
  2. merge
  3. Merge into wily
Proposed by Jackson Doak
Status: Needs review
Proposed branch: lp://qastaging/~noskcaj/ubuntu/wily/light-locker/merge
Merge into: lp://qastaging/ubuntu/wily/light-locker
Diff against target: 9712 lines (+37/-4752)
18 files modified
.pc/01_lid-closed.patch/README (+0/-42)
.pc/01_lid-closed.patch/configure.ac (+0/-676)
.pc/01_lid-closed.patch/data/apps.light-locker.gschema.xml.in.in (+0/-28)
.pc/01_lid-closed.patch/data/light-locker.1 (+0/-52)
.pc/01_lid-closed.patch/src/gs-bus.h (+0/-75)
.pc/01_lid-closed.patch/src/gs-listener-dbus.c (+0/-2015)
.pc/01_lid-closed.patch/src/gs-listener-dbus.h (+0/-89)
.pc/01_lid-closed.patch/src/gs-manager.c (+0/-795)
.pc/01_lid-closed.patch/src/gs-manager.h (+0/-78)
.pc/01_lid-closed.patch/src/gs-monitor.c (+0/-498)
.pc/01_lid-closed.patch/src/light-locker.c (+0/-159)
.pc/01_lid-closed.patch/src/ll-config.c (+0/-240)
.pc/applied-patches (+0/-1)
debian/changelog (+19/-0)
debian/control (+3/-3)
debian/patches/02_libsystemd.patch (+13/-0)
debian/patches/series (+1/-0)
debian/rules (+1/-1)
To merge this branch: bzr merge lp://qastaging/~noskcaj/ubuntu/wily/light-locker/merge
Reviewer Review Type Date Requested Status
Daniel Holbach (community) Needs Fixing
Review via email: mp+265880@code.qastaging.launchpad.net

Description of the change

Merge from debian

To post a comment you must log in.
Revision history for this message
Daniel Holbach (dholbach) wrote :

daniel@daydream:~/light-locker$ bzr merge lp:~noskcaj/ubuntu/wily/light-locker/merge
Warning: criss-cross merge encountered. See bzr help criss-cross.
Unapplying quilt patches to prevent spurious conflicts
 M debian/changelog
 M debian/control
Text conflict in debian/changelog
Text conflict in debian/control
Auf 2 Konflikte gestoßen.
daniel@daydream:~/light-locker$

review: Needs Fixing
Reply

Unmerged revisions

12. By Jackson Doak

* 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

Merging shared upstream rev into target branch.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: