lp:~noskcaj/ubuntu/saucy/xfce4-power-manager/1.2.0-2ubuntu1

Branch merges

Propose for merging

No branches dependent on this one.

Ready for review for merging into lp:ubuntu/saucy/xfce4-power-manager

Daniel Holbach (community): Approve on 2013-08-13

Diff: 12657 lines (+6506/-4889)

29 files modified

.pc/01_Remove_custom_OSD_brightness_popup,_use_libnotify_instead.patch/po/POTFILES.in (+19/-0)
.pc/01_Remove_custom_OSD_brightness_popup,_use_libnotify_instead.patch/src/Makefile.am (+211/-0)
.pc/01_Remove_custom_OSD_brightness_popup,_use_libnotify_instead.patch/src/gsd-media-keys-window.c (+1078/-0)
.pc/01_Remove_custom_OSD_brightness_popup,_use_libnotify_instead.patch/src/gsd-media-keys-window.h (+71/-0)
.pc/01_Remove_custom_OSD_brightness_popup,_use_libnotify_instead.patch/src/xfpm-backlight.c (+478/-0)
.pc/01_Remove_custom_OSD_brightness_popup,_use_libnotify_instead.patch/src/xfpm-notify.c (+409/-0)
.pc/03_fix-insert-battery.patch/src/xfpm-battery.c (+916/-0)
.pc/03_fix-insert-battery.patch/src/xfpm-power.c (+1755/-0)
.pc/06_fix-suspend-auth-check.patch/src/xfpm-power.c (+1/-0)
.pc/09_fix_insert_battery.patch/src/xfpm-battery.c (+0/-916)
.pc/09_fix_insert_battery.patch/src/xfpm-power.c (+0/-1755)
.pc/applied-patches (+2/-1)
debian/changelog (+35/-0)
debian/control (+4/-2)
debian/patches/01_Remove_custom_OSD_brightness_popup,_use_libnotify_instead.patch (+1423/-0)
debian/patches/02_translations-fix-invalid-format-strings.patch (+18/-12)
debian/patches/03_fix-insert-battery.patch (+44/-0)
debian/patches/06_fix-suspend-auth-check.patch (+5/-3)
debian/patches/08_show_preferences_lxde.patch (+2/-2)
debian/patches/series (+3/-1)
debian/patches/xubuntu_fix-status-icon-other-devices.patch (+5/-3)
debian/rules (+5/-1)
po/POTFILES.in (+1/-0)
po/ast.po (+0/-927)
src/Makefile.am (+1/-3)
src/gsd-media-keys-window.c (+0/-1078)
src/gsd-media-keys-window.h (+0/-71)
src/xfpm-backlight.c (+19/-113)
src/xfpm-notify.c (+1/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

34. By Jackson Doak on 2013-08-12

* 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.

27. By Julien Lavergne on 2012-03-18

* debian/patches:
 - 07_fix_broken_empty_icon_battery.patch: From upstream, fix empty icons in
   the systray (LP: #846878)
 - 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.
 - 10_dim_brightness.patch: From upstream, only dim brightness if the current
   level is brighter. (LP: #900592)

26. By Lionel Le Folgoc on 2012-02-09

* Merge from Debian unstable for the hardening changes (added patches
  were already included in 1.0.10-4ubuntu1 and 1.0.10-4ubuntu2), remaining
  Ubuntu changes:
  - debian/patches:
    + xubuntu_fix-xfconf-type-brightness-level.patch: use the same type when
      writing and reading the brightness level with xfconf.
    + xubuntu_fix-status-icon-other-devices.patch: fix broken status icons
      for other devices (phone, wireless kbd, mouse, etc.).

* debian/patches:
  - 06_fix-suspend-auth-check.patch: added, correctly check for suspend
    permissions before disabling the corresponding drop-down menu item.
    lp: #929537

25. By Lionel Le Folgoc on 2012-01-31

* debian/patches:
  - 04_clear-idles-for-removed-batteries.patch: added, fix crash when xfpm
    tries to refresh the status icon of a removed battery. lp: #713173
  - 05_fix-brightness-key-modifiers.patch: added, let the brightness keys
    work even when numlock is on.
  - xubuntu_fix-xfconf-type-brightness-level.patch: added, use the same type
    when writing and reading the brightness level with xfconf. lp: #923136
  - xubuntu_fix-status-icon-other-devices.patch: added, should fix broken
    status icons for other devices (phone, wireless kbd, mouse, etc.).