~ubuntu-branches/ubuntu/maverick/gnome-power-manager/maverick-proposed

Viewing all changes in revision 170.

  • Committer: Bazaar Package Importer
  • Author(s): Robert Ancell
  • Date: 2010-06-10 15:01:34 UTC
  • mfrom: (2.1.52 upstream) (24.1.12 squeeze)
  • Revision ID: james.westby@ubuntu.com-20100610150134-ml9iqs25qpdxenuk
Tags: 2.30.1-1ubuntu1
* Merge with Debian unstable, remaining Ubuntu changes:
* debian/control.in
  - Build-depend on gnome-common for autotools
  - Don't build-depend on libhal-dev, it's not needed even with HAL
    support.
  - Build-depend on libappindicator-dev
  - Add Vcs-Bzr link
* debian/rules
  - Run autotools on build
  - Enable libnotify
  - Enable policykit
  - Enable appindicator
  - 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/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 upstream
    default value "hibernate" currently
* debian/install:
  - Install apport hook
* debian/source_gnome-power-manager.py:
  - Add Apport hook
* debian/patches/02-notify-osd-support.patch:
  - Support Notify OSD
* debian/patches/06-bugreport-debian.patch:
  - Drop; It's actually wrong for Ubuntu, we use lsb_release, not
    /etc/debian_version.
* debian/patches/12-add-appindicators.patch
  - Adds support for application indicators
* debian/watch:
  - Watch unstable series

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: