~psusi/ubuntu/natty/gnome-power-manager/sleep

Viewing all changes in revision 186.

  • Committer: Bazaar Package Importer
  • Author(s): Artur Rona
  • Date: 2011-01-26 17:20:06 UTC
  • mfrom: (24.1.13 sid)
  • Revision ID: james.westby@ubuntu.com-20110126172006-0536926payh165cg
Tags: 2.32.0-2ubuntu1
* 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.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: