Merge lp://staging/~noskcaj/ubuntu/saucy/xfce4-power-manager/systemd into lp://staging/ubuntu/saucy/xfce4-power-manager
Proposed by
Jackson Doak
| Status: | Needs review |
|---|---|
| Proposed branch: | lp://staging/~noskcaj/ubuntu/saucy/xfce4-power-manager/systemd |
| Merge into: | lp://staging/ubuntu/saucy/xfce4-power-manager |
| Diff against target: |
13764 lines (+2097/-11300) 34 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/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) .pc/xubuntu_fix-status-icon-other-devices.patch/src/xfpm-battery.c (+0/-918) debian/changelog (+7/-0) debian/control (+1/-1) 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 (+2/-0) debian/rules (+4/-1) 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/saucy/xfce4-power-manager/systemd |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Micah Gersten | Disapprove | ||
|
Review via email:
|
|||
Description of the change
SRU fixes from trusty to saucy
To post a comment you must log in.
Unmerged revisions
- 37. By Jackson Doak
-
Run dh-autoreconf to continue to allow arm64 to build
- 36. By Jackson Doak
-
Add the patches
- 35. By Jackson Doak
-
Add patches from debian svn branch to fix systemd. LP: #1222021
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff is not usable due to .pc dir and other things, attaching debdiff to bug