Created by Bilal Akhtar on 2010-07-16 and last modified on 2010-07-16
Get this branch:
bzr branch lp:~bilalakhtar/ubuntu/maverick/gnome-power-manager/papercut-fix-540826
Only Bilal Akhtar can upload to this branch. If you are Bilal Akhtar please log in for upload directions.

Branch merges

Related bugs

Related blueprints

Branch information

Bilal Akhtar

Recent revisions

172. By Bilal Akhtar on 2010-07-07

Added quilt patch for changes in previous revision

171. By Bilal Akhtar on 2010-07-07

Renamed "Suspend" to "Sleep" in PO files. (LP: #540826)

170. By Robert Ancell on 2010-06-10

* 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
  - 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
* debian/patches/12-add-appindicators.patch
  - Adds support for application indicators
* debian/watch:
  - Watch unstable series

169. By Martin Pitt on 2010-03-29

* New upstream release:
 - Check for libpanel only if building the applets
 - Check for XRR* functions using library version instead of proto version
 - Use pkg-config instead of autoconf macros to find X libs and protos
 - Declare GError in gpm_brightness_hal_init to fix build failure
 - Do not set a charge warning if the device is on AC
 - Do not use EggDbusProxy in GpmScreensaver
 - Don't query the capabilities of the notification daemon
 - Ensure we close any 'battery low' notifications when we switch to being
   on AC
 - Fix a problem where the critical action is not done in the case of a UPS
 - Fix a race condition where we can miss the idle reset alarm
 - Fix up a translation using ngettext rather than assuming the plural.
 - Fix wrong suspends with docked laptops
 - If a battery charge is low but not critical don't play the sound meant
   for a critical charge event
 - Play a sound loop if the charge of a laptop battery/ups reaches a
   critical level.
 - Remove the pointy-finger status icon when the idletime code fails to work
 - Replace devkit-power call with upower in gnome-power-bugreport.sh
* Drop patches which went upstream:
 - 01-suspend-on-vt-change.patch
 - 10-proxy-by-name.patch
 - 13-dont-query-notify-caps.patch
 - 14-critical-message-timeout.patch
 - 15-declare-gerror.patch
 - 16-upower-bugreport.patch
 - 18-fix-idletime-reset-race.patch
* Drop 06-bugreport-debian.patch: It's actually wrong for Ubuntu, we use
  lsb_release, not /etc/debian_version.
* 90-autotools.patch: Regenerate.
* 08-desktop-bugreport-path.patch, 12-add-appindicators.patch: Update to
  current patch tagging guidelines.
* debian/control.in: Set Maintainer from "Ted Gould" to "Ubuntu Developers".
* Synchronize with Debian:
  - Build/binary dependency cleanup/shuffling.
  - Bump Standards-Version to 3.8.4.
  - Add debian/preinst for upgrade conffile cleanup.
  - Drop obsolete debian/README.Debian

168. By Chris Coulson on 2010-03-27

* debian/patches/03-dont-dim-when-inactive.patch:
  - Don't dim or blank the screen on idle when we are not on the
    active console

167. By Martin Pitt on 2010-03-26

12-add-appindicators.patch: Drop bogus hunk which always showed "(null) is
present" in the battery status notification. (LP: #546564)

166. By Martin Pitt on 2010-03-24

Drop 17-unify-power-strings.patch entirely, as per recent discussion we
will not push that into lucid any more.

165. By Martin Pitt on 2010-03-24

[ Chris Coulson ]
* Updated patch tag information now some patches are upstream

[ Martin Pitt ]
* 17-unify-power-strings.patch:
  - Revert "Shut down" → "Switch off" change for lucid, as in other
    packages. This is still being debated.
  - Revert all the "your computer" → "the computer" (and similar) changes.
    No reason to break hundreds of translations for such unimportant changes.
* Add 01-suspend-on-vt-change.patch: Fix wrong suspends with docked laptops.
  (LP: #515465)

164. By Chris Coulson on 2010-03-12

[ Chris Coulson ]
* Updated patch tag information
* debian/local/source_gnome-power-manager.py
  - Fetch inhibitors from gnome-session and add them to the submitted bug
    report (under the 'GnomeSessionInhibitors' key). Also provide an overall
    summary indicating if the session has been inhibited from going idle
    (the 'GnomeSessionIdleInhibited' key) or if the session has been
    inhibited from suspending (the 'GnomeSessionSuspendInhibited' key).
    This is copied from the gnome-screensaver apport hook, and can be
    useful when debugging issues where a users display doesn't blank or
    the machine doesn't sleep.
* debian/patches/14-critical-message-timeout.patch:
  - Update to revert another upstream change to use a non-expiring
    notification. This prevents it being displayed as a fallback alert
    box with notify-osd (LP: #533652)

[ Jan Arne Petersen ]
* debian/patches/12-add-appindicators.patch:
  - Fix icon theme include path (LP: #529911)

[ Scott Howard ]
* Adds hardware information to apport hook (LP: #522972)

163. By Chris Coulson on 2010-03-05

* debian/patches/18-fix-idletime-reset-race.patch:
  - Fix a race condition where we might miss the idle reset alarm,
    causing unwanted display blanking later on (LP: #423694)

Branch metadata

Branch format:
Branch format 7
Repository format:
Bazaar repository format 2a (needs bzr 1.16 or later)
Stacked on:
This branch contains Public information 
Everyone can see this information.