lp:~noskcaj/ubuntu/wily/light-locker/merge
- Get this branch:
- bzr branch lp:~noskcaj/ubuntu/wily/light-locker/merge
Branch merges
- Daniel Holbach (community): Needs Fixing
-
Diff: 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)
Branch information
- Owner:
- Jackson Doak
- Status:
- Development
Recent 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 - 10. By Logan Rosen
-
* 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
-
* 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
-
d/p/lid-
closed. patch: Refresh patch from upstream.
Handle UPower lid event with systemd too. - 7. By Unit 193
-
* 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
-
* 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
-
* 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
-
[ Sean Davis ]
* New upstream release (lp: #1293100).[ Dmitry Shachnev ]
* Remove broken filenamemangle from debian/watch to make it working. - 3. By Stephen M. Webb
-
* 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