lp://staging/~noskcaj/ubuntu/trusty/xfce4-power-manager/systemd

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp://staging/ubuntu/trusty/xfce4-power-manager

Daniel Holbach: Approve on 2014-01-20

Diff: 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)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1222021: [SRU] xfce4-power-manager does not inhibit systemd from handling buttons and lid events

Medium

Fix Released

Link a bug report

Related blueprints

37. By Jackson Doak on 2014-01-19

Force run of xdt-autogen to continue to allow ppc64el to build

36. By Jackson Doak on 2014-01-19

Add patches from debian svn branch to fix systemd. LP: 1222021

35. By Jackson Doak on 2013-12-11

[ Jackson Doak ]
* Merged from debian unstable. Remaining changes:
  - 06_fix-suspend-auth-check.patch: added, correctly check for suspend
    permissions before disabling the corresponding drop-down menu item.
    lp #929537
  - 08_show_preferences_lxde.patch: Hide settings menu only on desktop
    environment which have another power manager.
  - Switch to using logind for session tracking. Depend on systemd-services
    instead of consolekit recommends, and add libsystemd-login-dev build
    dependency.
* Drop xubuntu_fix-status-icon-other-devices.patch, fixed in debian

[ Logan Rosen ]
* Get rid of 09_fix_insert_battery.patch, an Ubuntu patch that was applied
  in Debian.

34. By Jackson Doak on 2013-08-13

* Merged from debian unstable. Remaining changes:
  - 06_fix-suspend-auth-check.patch: added, correctly check for suspend
    permissions before disabling the corresponding drop-down menu item.
    lp #929537
  - 08_show_preferences_lxde.patch: Hide settings menu only on desktop
    environment which have another power manager.
  - xubuntu_fix-status-icon-other-devices.patch: fix broken status icons
    for other devices (phone, wireless kbd, mouse, etc.).
  - Switch to using logind for session tracking. Depend on systemd-services
  instead of consolekit recommends, and add libsystemd-login-dev build
  dependency.

33. By Benjamin Kerensa on 2013-03-11

Switch to using logind for session tracking. Depend on systemd-services
instead of consolekit recommends, and add libsystemd-login-dev build
dependency.

32. By Lionel Le Folgoc on 2012-10-29

* debian/patches:
  - 02_translations-fix-invalid-format-strings.patch: updated to fix
    crashes because of en_GB.po and tr.po. lp: #1054907

31. By Lionel Le Folgoc on 2012-05-18

* Merge from Debian experimental, remaining Ubuntu changes:
  - 06_fix-suspend-auth-check.patch: added, correctly check for suspend
    permissions before disabling the corresponding drop-down menu item.
    lp #929537
  - 08_show_preferences_lxde.patch: Hide settings menu only on desktop
    environment which have another power manager.
  - 09_fix_insert_battery.patch: Another patch to fix empty icon when
    removing a battery. Thanks Henry Gebhardt for the patch.
  - xubuntu_fix-status-icon-other-devices.patch: fix broken status icons
    for other devices (phone, wireless kbd, mouse, etc.).

30. By Lionel Le Folgoc on 2012-05-17

No change rebuild to pick updated xfce4-panel shlibs.

29. By Lionel Le Folgoc on 2012-04-08

* debian/patches:
  - 02_translations-fix-invalid-format-strings.patch: drop translated
    strings when format strings don't match the original ones. lp: #975880

28. By Lionel Le Folgoc on 2012-04-03

* New upstream bugfix release.
* debian/patches:
  - 0001-Solaris-specific-code-for-determining-the-start-time.patch,
    02_fix-notify-detect.patch,
    07_fix_broken_empty_icon_battery.patch: dropped, included upstream.
  - xubuntu_fix-status-icon-other-devices.patch: refreshed to apply cleanly.