Merge lp://staging/~noskcaj/ubuntu/trusty/xfce4-power-manager/systemd into lp://staging/ubuntu/trusty/xfce4-power-manager
Proposed by
Jackson Doak
Status: | Merged |
---|---|
Merge reported by: | Martin Pitt |
Merged at revision: | not available |
Proposed branch: | lp://staging/~noskcaj/ubuntu/trusty/xfce4-power-manager/systemd |
Merge into: | lp://staging/ubuntu/trusty/xfce4-power-manager |
Diff against target: |
13750 lines (+2096/-11299) 33 files modified
.pc/01_Remove_custom_OSD_brightness_popup,_use_libnotify_instead.patch/po/POTFILES.in (+0/-19) .pc/01_Remove_custom_OSD_brightness_popup,_use_libnotify_instead.patch/src/Makefile.am (+0/-211) .pc/01_Remove_custom_OSD_brightness_popup,_use_libnotify_instead.patch/src/gsd-media-keys-window.c (+0/-1078) .pc/01_Remove_custom_OSD_brightness_popup,_use_libnotify_instead.patch/src/gsd-media-keys-window.h (+0/-71) .pc/01_Remove_custom_OSD_brightness_popup,_use_libnotify_instead.patch/src/xfpm-backlight.c (+0/-478) .pc/01_Remove_custom_OSD_brightness_popup,_use_libnotify_instead.patch/src/xfpm-notify.c (+0/-409) .pc/02_translations-fix-invalid-format-strings.patch/po/en_GB.po (+0/-1083) .pc/02_translations-fix-invalid-format-strings.patch/po/te.po (+0/-1061) .pc/02_translations-fix-invalid-format-strings.patch/po/tr.po (+0/-1486) .pc/03_fix-insert-battery.patch/src/xfpm-battery.c (+0/-916) .pc/03_fix-insert-battery.patch/src/xfpm-power.c (+0/-1755) .pc/04_fix-missing-icons-for-non-system-batteries.patch/src/xfpm-battery.c (+0/-918) .pc/06_fix-suspend-auth-check.patch/src/xfpm-power.c (+0/-1756) .pc/08_show_preferences_lxde.patch/settings/xfce4-power-manager-settings.desktop.in (+0/-14) .pc/applied-patches (+0/-6) debian/changelog (+7/-0) debian/patches/05_dont-allow-systemd-to-handle-suspend-hibernate-events.patch (+126/-0) debian/patches/06_add-shutdown-reboot-functionality-for-systemd.patch (+635/-0) debian/patches/06_fix-suspend-auth-check.patch (+7/-5) debian/patches/series (+3/-1) debian/rules (+3/-0) po/POTFILES.in (+0/-1) po/en_GB.po (+4/-2) po/te.po (+20/-0) po/tr.po (+20/-0) settings/xfce4-power-manager-settings.desktop.in (+1/-1) src/Makefile.am (+3/-1) src/gsd-media-keys-window.c (+1078/-0) src/gsd-media-keys-window.h (+71/-0) src/xfpm-backlight.c (+113/-19) src/xfpm-battery.c (+3/-5) src/xfpm-notify.c (+1/-1) src/xfpm-power.c (+1/-2) |
To merge this branch: | bzr merge lp://staging/~noskcaj/ubuntu/trusty/xfce4-power-manager/systemd |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Daniel Holbach | Approve | ||
Review via email:
|
Description of the change
Fix xfce4-power-
To post a comment you must log in.
Thanks. Uploaded.