Last commit made on 2011-08-11
Get this branch:
git clone -b ubuntu/natty-proposed https://git.launchpad.net/ubuntu/+source/gnome-power-manager
Members of Ubuntu Server Dev import team can upload to this branch. Log in for directions.

Branch merges

Branch information


Recent commits

931434e... by Phillip Susi on 2011-06-13

Import patches-unapplied version 2.32.0-2ubuntu2.1 to ubuntu/natty-proposed

Imported using git-ubuntu import.

Changelog parent: 8d4b1a7e018574919d20438305c5b142d3508af4

New changelog entries:
  * 16-fix-duplicate-battery.patch: Don't add hot-added battery to device
    list, because libupower-glib already does that (LP: #675108)
    [ Maxim Levitsky <email address hidden> ]

8d4b1a7... by Chris Coulson on 2011-03-15

Import patches-unapplied version 2.32.0-2ubuntu2 to ubuntu/natty

Imported using git-ubuntu import.

Changelog parent: 5b402a363d0b990c60a5c56c1f93507c8aa26d18

New changelog entries:
  [ Alex Murray <email address hidden> ]
  * FFe: LP: #724324 - Add support to g-p-m for controlling keyboard
    backlight via upower.
    - add debian/patches/15-keyboard-backlight-support.patch
    - update debian/patches/series

5b402a3... by Artur Rona on 2011-01-26

Import patches-unapplied version 2.32.0-2ubuntu1 to ubuntu/natty

Imported using git-ubuntu import.

Changelog parent: 72b6b46206db1a54ce5ea3f57419f309a216d51f

New changelog entries:
  * Merge from debian unstable. Remaining changes: (LP: #708229)
    - debian/control:
      + Build-Depends on gnome-common, needed for autoreconf in rules.
      + Build-Depends on libappindicator-dev.
    - debian/gconf-defaults:
      + Remove default preference on
        /apps/gnome-power-manager/actions/sleep_type_battery (was set to
        "nothing", however sleep_type_ac is "suspend".). Let's keep
        default value "hibernate" currently.
    - debian/{install, source_gnome-power-manager.py}:
      + Apport package hook.
    - debian/patches/00git-devices-changed-signal.patch:
      + Add a "devices-changed" signal. This was already in 2.31.1,
        but got dropped from the 2.32 branch. However, our appindicator
        patch needs it now.
    - debian/patches/02_autostart_init.patch:
      + Dropped. This moved g-p-m to start in the initialization phase
        and was inherited from Debian. It doesn't really solve any
        problems for us, but does slow down login performance.
    - debian/patches/02-notify-osd-support.patch:
      + Support Notify OSD.
    - debian/patches/06-bugreport-debian.patch:
      + Dropped. It's actually wrong for Ubuntu, we use lsb_release,
        not /etc/debian_version.
    - debian/patches/08-desktop-bugreport-path.patch: Update headers.
    - debian/patches/12-add-appindicators.patch:
      + Add support for application indicators.
    - debian/patches/13-energy-star.patch: Change default timings
      to be Energy Star 5.0 compliant, except for automatic suspend
      on AC (since that might be both inconvenient, and suspend might
      not work at all).
    - debian/patches/14_fix_no_xbacklight_crash.patch:
      + Don't crash on systems which don't have XBACKLIGHT.
    - debian/rules:
      + Run autoreconf.
      + Disable gconf-defaults, we have debian/gconf-defaults.
      + Enable flags for notify-osd, policykit and Indicator Applet.
      + Added CFLAGS on -Wno-cast-align to disable a warning on ARM
        that's generated when GCC changes the size of a struct
        due to alignment.
      + Don't install gnome-power-statistics.desktop
    - debian/watch: Watch unstable series.

72b6b46... by Michael Biebl on 2010-10-19

Import patches-unapplied version 2.32.0-2 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 73d8edec867d975535a0d2e1a9c09fc7f3965c13

New changelog entries:
  * Upload to unstable.

73d8ede... by Michael Biebl on 2010-10-17

Import patches-unapplied version 2.32.0-1 to debian/experimental

Imported using git-ubuntu import.

Changelog parent: 90653b9887c5f01ca5099436debd4846b079b215

New changelog entries:
  [ Josselin Mouette ]
  * Move autostart file to /usr/share/gnome/autostart since Xfce now has
    its own power manager. Closes: #591776.
  [ Michael Biebl ]
  * New upstream release.
    - Port to libupower-glib. Closes: #595086
    - Provide a pkexec helper for systems that do not have XRandR backlight
      capability, i.e. we no longer require hal.
  * debian/control.in
    - Drop Build-Depends on libhal-dev.
    - Change Build-Depends on libdevkit-power-gobject-dev to
      libupower-glib-dev (>= 0.9.1).
    - Drop Suggests: hal.
    - Add Suggests: policykit-1 for pkexec.
    - Bump Standards-Version to 3.9.1. No further changes.
  * debian/rules
    - Drop obsolete --enable-hal from DEB_CONFIGURE_EXTRA_FLAGS.

90653b9... by Michael Biebl on 2010-04-29

Import patches-unapplied version 2.30.1-1 to debian/squeeze

Imported using git-ubuntu import.

Changelog parent: cc826c96ded6a2d81feda31062e6433d8699bdb6

New changelog entries:
  * New upstream bugfix release.
  * debian/rules
    - Explicitly turn on hal support as the upstream default is now off.
      Hal is still required for brightness control on systems that don't
      have XRandR backlight support yet. Closes: #577809
  * debian/patches/09-fix-critical-warning-from-gpmscreensaver.patch
    - Removed, merged upstream.

cc826c9... by Michael Biebl on 2010-03-31

Import patches-unapplied version 2.30.0-1 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 69e2b8a6591666b7d3114acd595152734d058484

New changelog entries:
  * New upstream release.
  * debian/patches/04_cast-align.patch
    - Removed, -Werror is no longer enforced by default.
  * debian/patches/07-bugreport-upower.patch
    - Removed, merged upstream.
  * debian/patches/09-inhibit-consolekit-events-after-resume.patch
    - Removed, merged upstream.
  * debian/patches/10-do-not-exit-if-hal-is-not-available.patch
    - Removed, merged upstream.
  * debian/patches/11-only-connect-to-hal-if-there-is-no-xrandr-hardware.patch
    - Removed, merged upstream.
  * debian/patches/12-DeviceKit-disks-is-now-called-UDisks.patch
    - Removed, merged upstream.
  * debian/patches/90_autoconf.patch
    - Removed, obsolete.
  * debian/rules
    - Remove obsolete configure switch --with-dpms-ext.
  * Switch to source format 3.0 (quilt).
    - Add debian/source/format.
    - Drop quilt from Build-Depends.
    - Remove /usr/share/cdbs/1/rules/patchsys-quilt.mk include.
  * debian/patches/09-fix-critical-warning-from-gpmscreensaver.patch
    - Fix up a critical warning from the GpmScreensaver code on startup. Patch
      pulled from upstream Git.
  * debian/copyright
    - Update list of copyright holders and add copyright years.

69e2b8a... by Michael Biebl on 2010-03-16

Import patches-unapplied version 2.28.3-4 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 8ae1e979b38e040da74dbf6f07993d4886ddd8e6

New changelog entries:
  * debian/control
    - Recommend udisks instead of devicekit-disks.
  * debian/patches/12-DeviceKit-disks-is-now-called-UDisks.patch
    - The org.freedesktop.DeviceKit.Disks D-Bus interface name was changed to
      org.freedesktop.UDisks. Update gnome-power-manager's disk spindown code
  * debian/patches/07-bugreport-upower.patch
    - Call upower instead of devkit-power in bug report script.

8ae1e97... by Michael Biebl on 2010-02-23

Import patches-unapplied version 2.28.3-3 to debian/sid

Imported using git-ubuntu import.

Changelog parent: c0dfd1f2d21ccfc69b1e394e6448134c7695d653

New changelog entries:
  * debian/control.in
    - Depend on upower instead of devicekit-power.

c0dfd1f... by Michael Biebl on 2010-02-03

Import patches-unapplied version 2.28.3-2 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 182c5d39e7a5b3fb532c3e63e50d99bc9757ca09

New changelog entries:
  * debian/patches/10-do-not-exit-if-hal-is-not-available.patch
    - Don't exit if hal is not available as we only need it as fallback for
      systems not supporting XBACKLIGHT.
  * debian/patches/11-only-connect-to-hal-if-there-is-no-xrandr-hardware.patch
    - If we find hardware with XRandR backlight support don't try to connect
      to the hal D-Bus service.
  * Bump Standards-Version to 3.8.4. No further changes.