--- gnome-power-manager-2.22.1.orig/config.log
+++ gnome-power-manager-2.22.1/config.log
@@ -0,0 +1,480 @@
+This file contains any messages produced by compilers while
+running configure, to aid debugging if configure makes a mistake.
+
+It was created by gnome-power-manager configure 2.22.1, which was
+generated by GNU Autoconf 2.61.  Invocation command line was
+
+  $ /root/src/gnome-power-manager-2.22.1.netbook/./configure --build=i686-linux-gnulp --prefix=/usr --includedir=${prefix}/include --mandir=${prefix}/share/man --infodir=${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --libexecdir=${prefix}/lib/gnome-power-manager --disable-maintainer-mode --disable-dependency-tracking --srcdir=. --without-gconf-source --enable-libnotify --with-dpms-ext --with-dbus-services=/usr/share/dbus-1/services/ --disable-scrollkeeper --with-doc-dir=/usr/share/doc/gnome-power-manager/ --disable-policykit --enable-applets
+
+## --------- ##
+## Platform. ##
+## --------- ##
+
+hostname = bfiller-ironhorse
+uname -m = i686
+uname -r = 2.6.24-19-generic
+uname -s = Linux
+uname -v = #1 SMP Fri Jul 11 23:41:49 UTC 2008
+
+/usr/bin/uname -p = unknown
+/bin/uname -X     = unknown
+
+/bin/arch              = unknown
+/usr/bin/arch -k       = unknown
+/usr/convex/getsysinfo = unknown
+/usr/bin/hostinfo      = unknown
+/bin/machine           = unknown
+/usr/bin/oslevel       = unknown
+/bin/universe          = unknown
+
+PATH: /usr/sbin
+PATH: /usr/bin
+PATH: /sbin
+PATH: /bin
+PATH: /usr/bin/X11
+
+
+## ----------- ##
+## Core tests. ##
+## ----------- ##
+
+configure:2159: checking for a BSD-compatible install
+configure:2215: result: /usr/bin/install -c
+configure:2226: checking whether build environment is sane
+configure:2269: result: yes
+configure:2297: checking for a thread-safe mkdir -p
+configure:2336: result: /bin/mkdir -p
+configure:2349: checking for gawk
+configure:2379: result: no
+configure:2349: checking for mawk
+configure:2365: found /usr/bin/mawk
+configure:2376: result: mawk
+configure:2387: checking whether make sets $(MAKE)
+configure:2408: result: yes
+configure:2647: checking for gcc
+configure:2674: result: cc
+configure:2912: checking for C compiler version
+configure:2919: cc --version >&5
+cc (GCC) 4.2.3 (Ubuntu 4.2.3-2ubuntu7)
+Copyright (C) 2007 Free Software Foundation, Inc.
+This is free software; see the source for copying conditions.  There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+configure:2922: $? = 0
+configure:2929: cc -v >&5
+Using built-in specs.
+Target: i686-linux-gnulp
+Configured with: ../src/configure -v --enable-languages=c,c++,fortran,objc,obj-c++,treelang --prefix=/usr --enable-shared --with-system-zlib --libexecdir=/usr/lib --without-included-gettext --enable-threads=posix --enable-nls --with-gxx-include-dir=/usr/include/c++/4.2 --program-suffix=-4.2 --enable-clocale=gnu --enable-libstdcxx-debug --enable-objc-gc --enable-mpfr --with-arch=i686 --with-tune=i586 --enable-checking=release --build=i686-linux-gnulp --host=i686-linux-gnulp --target=i686-linux-gnulp
+Thread model: posix
+gcc version 4.2.3 (Ubuntu 4.2.3-2ubuntu7)
+configure:2932: $? = 0
+configure:2939: cc -V >&5
+cc: '-V' option must have argument
+configure:2942: $? = 1
+configure:2965: checking for C compiler default output file name
+configure:2992: cc -g -Wall -O2   conftest.c  >&5
+configure:2995: $? = 0
+configure:3033: result: a.out
+configure:3050: checking whether the C compiler works
+configure:3060: ./a.out
+configure:3063: $? = 0
+configure:3080: result: yes
+configure:3087: checking whether we are cross compiling
+configure:3089: result: no
+configure:3092: checking for suffix of executables
+configure:3099: cc -o conftest -g -Wall -O2   conftest.c  >&5
+configure:3102: $? = 0
+configure:3126: result: 
+configure:3132: checking for suffix of object files
+configure:3158: cc -c -g -Wall -O2  conftest.c >&5
+configure:3161: $? = 0
+configure:3184: result: o
+configure:3188: checking whether we are using the GNU C compiler
+configure:3217: cc -c -g -Wall -O2  conftest.c >&5
+configure:3223: $? = 0
+configure:3240: result: yes
+configure:3245: checking whether cc accepts -g
+configure:3275: cc -c -g  conftest.c >&5
+configure:3281: $? = 0
+configure:3380: result: yes
+configure:3397: checking for cc option to accept ISO C89
+configure:3471: cc  -c -g -Wall -O2  conftest.c >&5
+configure:3477: $? = 0
+configure:3500: result: none needed
+configure:3529: checking for style of include used by make
+configure:3557: result: GNU
+configure:3582: checking dependency style of cc
+configure:3673: result: none
+configure:3701: checking for a BSD-compatible install
+configure:3757: result: /usr/bin/install -c
+configure:3846: checking build system type
+configure:3864: result: i686-pc-linux-gnulp
+configure:3886: checking host system type
+configure:3901: result: i686-pc-linux-gnulp
+configure:3923: checking for a sed that does not truncate output
+configure:3979: result: /bin/sed
+configure:3982: checking for grep that handles long lines and -e
+configure:4056: result: /bin/grep
+configure:4061: checking for egrep
+configure:4139: result: /bin/grep -E
+configure:4155: checking for ld used by cc
+configure:4222: result: /usr/bin/ld
+configure:4231: checking if the linker (/usr/bin/ld) is GNU ld
+configure:4246: result: yes
+configure:4251: checking for /usr/bin/ld option to reload object files
+configure:4258: result: -r
+configure:4276: checking for BSD-compatible nm
+configure:4325: result: /usr/bin/nm -B
+configure:4329: checking whether ln -s works
+configure:4333: result: yes
+configure:4340: checking how to recognize dependent libraries
+configure:4526: result: pass_all
+configure:4768: checking how to run the C preprocessor
+configure:4808: cc -E  conftest.c
+configure:4814: $? = 0
+configure:4845: cc -E  conftest.c
+conftest.c:10:28: error: ac_nonexistent.h: No such file or directory
+configure:4851: $? = 1
+configure: failed program was:
+| /* confdefs.h.  */
+| #define PACKAGE_NAME "gnome-power-manager"
+| #define PACKAGE_TARNAME "gnome-power-manager"
+| #define PACKAGE_VERSION "2.22.1"
+| #define PACKAGE_STRING "gnome-power-manager 2.22.1"
+| #define PACKAGE_BUGREPORT ""
+| #define PACKAGE "gnome-power-manager"
+| #define VERSION "2.22.1"
+| /* end confdefs.h.  */
+| #include <ac_nonexistent.h>
+configure:4884: result: cc -E
+configure:4913: cc -E  conftest.c
+
+## ---------------- ##
+## Cache variables. ##
+## ---------------- ##
+
+ac_cv_build=i686-pc-linux-gnulp
+ac_cv_c_compiler_gnu=yes
+ac_cv_env_CCC_set=
+ac_cv_env_CCC_value=
+ac_cv_env_CC_set=set
+ac_cv_env_CC_value=cc
+ac_cv_env_CFLAGS_set=set
+ac_cv_env_CFLAGS_value='-g -Wall -O2'
+ac_cv_env_CPPFLAGS_set=set
+ac_cv_env_CPPFLAGS_value=
+ac_cv_env_CPP_set=
+ac_cv_env_CPP_value=
+ac_cv_env_CXXCPP_set=
+ac_cv_env_CXXCPP_value=
+ac_cv_env_CXXFLAGS_set=set
+ac_cv_env_CXXFLAGS_value='-g -Wall -O2'
+ac_cv_env_CXX_set=set
+ac_cv_env_CXX_value=g++
+ac_cv_env_DBUS_CFLAGS_set=
+ac_cv_env_DBUS_CFLAGS_value=
+ac_cv_env_DBUS_LIBS_set=
+ac_cv_env_DBUS_LIBS_value=
+ac_cv_env_F77_set=
+ac_cv_env_F77_value=
+ac_cv_env_FFLAGS_set=
+ac_cv_env_FFLAGS_value=
+ac_cv_env_GDK_CFLAGS_set=
+ac_cv_env_GDK_CFLAGS_value=
+ac_cv_env_GDK_LIBS_set=
+ac_cv_env_GDK_LIBS_value=
+ac_cv_env_GLIB_CFLAGS_set=
+ac_cv_env_GLIB_CFLAGS_value=
+ac_cv_env_GLIB_LIBS_set=
+ac_cv_env_GLIB_LIBS_value=
+ac_cv_env_GNOME_CFLAGS_set=
+ac_cv_env_GNOME_CFLAGS_value=
+ac_cv_env_GNOME_LIBS_set=
+ac_cv_env_GNOME_LIBS_value=
+ac_cv_env_GSTREAMER_CFLAGS_set=
+ac_cv_env_GSTREAMER_CFLAGS_value=
+ac_cv_env_GSTREAMER_LIBS_set=
+ac_cv_env_GSTREAMER_LIBS_value=
+ac_cv_env_GTKUNIQUE_CFLAGS_set=
+ac_cv_env_GTKUNIQUE_CFLAGS_value=
+ac_cv_env_GTKUNIQUE_LIBS_set=
+ac_cv_env_GTKUNIQUE_LIBS_value=
+ac_cv_env_HAL_CFLAGS_set=
+ac_cv_env_HAL_CFLAGS_value=
+ac_cv_env_HAL_LIBS_set=
+ac_cv_env_HAL_LIBS_value=
+ac_cv_env_LDFLAGS_set=set
+ac_cv_env_LDFLAGS_value=
+ac_cv_env_LIBNOTIFY_CFLAGS_set=
+ac_cv_env_LIBNOTIFY_CFLAGS_value=
+ac_cv_env_LIBNOTIFY_LIBS_set=
+ac_cv_env_LIBNOTIFY_LIBS_value=
+ac_cv_env_LIBS_set=
+ac_cv_env_LIBS_value=
+ac_cv_env_PKG_CONFIG_set=
+ac_cv_env_PKG_CONFIG_value=
+ac_cv_env_XMKMF_set=
+ac_cv_env_XMKMF_value=
+ac_cv_env_build_alias_set=set
+ac_cv_env_build_alias_value=i686-linux-gnulp
+ac_cv_env_host_alias_set=
+ac_cv_env_host_alias_value=
+ac_cv_env_target_alias_set=
+ac_cv_env_target_alias_value=
+ac_cv_host=i686-pc-linux-gnulp
+ac_cv_objext=o
+ac_cv_path_EGREP='/bin/grep -E'
+ac_cv_path_GREP=/bin/grep
+ac_cv_path_install='/usr/bin/install -c'
+ac_cv_path_mkdir=/bin/mkdir
+ac_cv_prog_AWK=mawk
+ac_cv_prog_CPP='cc -E'
+ac_cv_prog_ac_ct_CC=cc
+ac_cv_prog_cc_c89=
+ac_cv_prog_cc_g=yes
+ac_cv_prog_make_make_set=yes
+am_cv_CC_dependencies_compiler_type=none
+lt_cv_deplibs_check_method=pass_all
+lt_cv_file_magic_cmd='$MAGIC_CMD'
+lt_cv_file_magic_test_file=
+lt_cv_ld_reload_flag=-r
+lt_cv_path_LD=/usr/bin/ld
+lt_cv_path_NM='/usr/bin/nm -B'
+lt_cv_path_SED=/bin/sed
+lt_cv_prog_gnu_ld=yes
+
+## ----------------- ##
+## Output variables. ##
+## ----------------- ##
+
+ACLOCAL='${SHELL} /root/src/gnome-power-manager-2.22.1.netbook/missing --run aclocal-1.10'
+ALL_LINGUAS=''
+AMDEPBACKSLASH=''
+AMDEP_FALSE=''
+AMDEP_TRUE='#'
+AMTAR='${SHELL} /root/src/gnome-power-manager-2.22.1.netbook/missing --run tar'
+AR=''
+AUTOCONF='${SHELL} /root/src/gnome-power-manager-2.22.1.netbook/missing --run autoconf'
+AUTOHEADER='${SHELL} /root/src/gnome-power-manager-2.22.1.netbook/missing --run autoheader'
+AUTOMAKE='${SHELL} /root/src/gnome-power-manager-2.22.1.netbook/missing --run automake-1.10'
+AWK='mawk'
+BINDIR=''
+CAIRO_REQUIRED=''
+CATALOGS=''
+CATOBJEXT=''
+CC='cc'
+CCDEPMODE='depmode=none'
+CFLAGS='-g -Wall -O2'
+CPP='cc -E'
+CPPFLAGS=''
+CXX='g++'
+CXXCPP=''
+CXXDEPMODE=''
+CXXFLAGS='-g -Wall -O2'
+CYGPATH_W='echo'
+DATADIR=''
+DATADIRNAME=''
+DBUS_CFLAGS=''
+DBUS_LIBS=''
+DBUS_REQUIRED=''
+DBUS_SERVICES_DIR=''
+DEFS=''
+DEPDIR='.deps'
+DOCBOOK2MAN=''
+DOCBOOK_DOCS_ENABLED_FALSE=''
+DOCBOOK_DOCS_ENABLED_TRUE=''
+DOCDIR=''
+DOC_USER_FORMATS=''
+ECHO='echo'
+ECHO_C=''
+ECHO_N='-n'
+ECHO_T=''
+EGREP='/bin/grep -E'
+ENABLE_SK_FALSE=''
+ENABLE_SK_TRUE=''
+EXEEXT=''
+F77=''
+FFLAGS=''
+GCONFTOOL=''
+GCONF_SCHEMAS_INSTALL_FALSE=''
+GCONF_SCHEMAS_INSTALL_TRUE=''
+GCONF_SCHEMA_CONFIG_SOURCE=''
+GCONF_SCHEMA_FILE_DIR=''
+GDK_CFLAGS=''
+GDK_LIBS=''
+GDK_REQUIRED=''
+GETTEXT_PACKAGE=''
+GLIB_CFLAGS=''
+GLIB_GENMARSHAL=''
+GLIB_LIBS=''
+GLIB_REQUIRED=''
+GMOFILES=''
+GMSGFMT=''
+GNOME_CFLAGS=''
+GNOME_LIBS=''
+GPM_EXTRA_LIBS=''
+GREP='/bin/grep'
+GSTREAMER_CFLAGS=''
+GSTREAMER_LIBS=''
+GSTREAMER_REQUIRED=''
+GTKUNIQUE_CFLAGS=''
+GTKUNIQUE_LIBS=''
+GTKUNIQUE_REQUIRED=''
+GTK_REQUIRED=''
+HAL_CFLAGS=''
+HAL_LIBS=''
+HAL_REQUIRED=''
+HAVE_APPLETS_FALSE=''
+HAVE_APPLETS_TRUE=''
+HAVE_DOCBOOK2MAN_FALSE=''
+HAVE_DOCBOOK2MAN_TRUE=''
+HAVE_GNOME_DOC_UTILS_FALSE=''
+HAVE_GNOME_DOC_UTILS_TRUE=''
+HAVE_GTKUNIQUE_FALSE=''
+HAVE_GTKUNIQUE_TRUE=''
+HAVE_LIBNOTIFY_FALSE=''
+HAVE_LIBNOTIFY_TRUE=''
+HAVE_TESTS_FALSE=''
+HAVE_TESTS_TRUE=''
+HELP_DIR=''
+INSTALL_DATA='${INSTALL} -m 644'
+INSTALL_PROGRAM='${INSTALL}'
+INSTALL_SCRIPT='${INSTALL}'
+INSTALL_STRIP_PROGRAM='$(install_sh) -c -s'
+INSTOBJEXT=''
+INTLLIBS=''
+INTLTOOL_CAVES_RULE=''
+INTLTOOL_DESKTOP_RULE=''
+INTLTOOL_DIRECTORY_RULE=''
+INTLTOOL_EXTRACT=''
+INTLTOOL_KBD_RULE=''
+INTLTOOL_KEYS_RULE=''
+INTLTOOL_MERGE=''
+INTLTOOL_OAF_RULE=''
+INTLTOOL_PERL=''
+INTLTOOL_POLICY_RULE=''
+INTLTOOL_PONG_RULE=''
+INTLTOOL_PROP_RULE=''
+INTLTOOL_SCHEMAS_RULE=''
+INTLTOOL_SERVER_RULE=''
+INTLTOOL_SERVICE_RULE=''
+INTLTOOL_SHEET_RULE=''
+INTLTOOL_SOUNDLIST_RULE=''
+INTLTOOL_THEME_RULE=''
+INTLTOOL_UI_RULE=''
+INTLTOOL_UPDATE=''
+INTLTOOL_XAM_RULE=''
+INTLTOOL_XML_NOMERGE_RULE=''
+INTLTOOL_XML_RULE=''
+LDFLAGS=''
+LIBGLADE_REQUIRED=''
+LIBGNOMEUI_REQUIRED=''
+LIBGNOME_REQUIRED=''
+LIBNOTIFY_CFLAGS=''
+LIBNOTIFY_LIBS=''
+LIBNOTIFY_REQUIRED=''
+LIBOBJS=''
+LIBPANEL_REQUIRED=''
+LIBS=''
+LIBTOOL=''
+LIBWNCK_REQUIRED=''
+LN_S='ln -s'
+LTLIBOBJS=''
+MAKEINFO='${SHELL} /root/src/gnome-power-manager-2.22.1.netbook/missing --run makeinfo'
+MKINSTALLDIRS=''
+MSGFMT=''
+MSGFMT_OPTS=''
+OBJEXT='o'
+OMF_DIR=''
+PACKAGE='gnome-power-manager'
+PACKAGE_BUGREPORT=''
+PACKAGE_NAME='gnome-power-manager'
+PACKAGE_STRING='gnome-power-manager 2.22.1'
+PACKAGE_TARNAME='gnome-power-manager'
+PACKAGE_VERSION='2.22.1'
+PATH_SEPARATOR=':'
+PKG_CONFIG=''
+POFILES=''
+POSUB=''
+PO_IN_DATADIR_FALSE=''
+PO_IN_DATADIR_TRUE=''
+RANLIB=''
+SBINDIR=''
+SED='/bin/sed'
+SET_MAKE=''
+SHELL='/bin/bash'
+STRIP=''
+SYSCONFDIR=''
+USE_NLS=''
+VERSION='2.22.1'
+WARN_CFLAGS=''
+XGETTEXT=''
+XMKMF=''
+XMLTO=''
+X_CFLAGS=''
+X_EXTRA_LIBS=''
+X_LIBS=''
+X_PRE_LIBS=''
+ac_ct_CC='cc'
+ac_ct_CXX=''
+ac_ct_F77=''
+am__fastdepCC_FALSE=''
+am__fastdepCC_TRUE='#'
+am__fastdepCXX_FALSE=''
+am__fastdepCXX_TRUE=''
+am__include='include'
+am__isrc=''
+am__leading_dot='.'
+am__quote=''
+am__tar='${AMTAR} chof - "$$tardir"'
+am__untar='${AMTAR} xf -'
+bindir='${exec_prefix}/bin'
+build='i686-pc-linux-gnulp'
+build_alias='i686-linux-gnulp'
+build_cpu='i686'
+build_os='linux-gnulp'
+build_vendor='pc'
+datadir='${datarootdir}'
+datarootdir='${prefix}/share'
+docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
+dvidir='${docdir}'
+exec_prefix='NONE'
+host='i686-pc-linux-gnulp'
+host_alias=''
+host_cpu='i686'
+host_os='linux-gnulp'
+host_vendor='pc'
+htmldir='${docdir}'
+includedir='${prefix}/include'
+infodir='${prefix}/share/info'
+install_sh='$(SHELL) /root/src/gnome-power-manager-2.22.1.netbook/install-sh'
+libdir='${exec_prefix}/lib'
+libexecdir='${prefix}/lib/gnome-power-manager'
+localedir='${datarootdir}/locale'
+localstatedir='/var'
+mandir='${prefix}/share/man'
+mkdir_p='/bin/mkdir -p'
+oldincludedir='/usr/include'
+pdfdir='${docdir}'
+prefix='/usr'
+program_transform_name='s,x,x,'
+psdir='${docdir}'
+sbindir='${exec_prefix}/sbin'
+sharedstatedir='${prefix}/com'
+sysconfdir='/etc'
+target_alias=''
+
+## ----------- ##
+## confdefs.h. ##
+## ----------- ##
+
+#define PACKAGE_NAME "gnome-power-manager"
+#define PACKAGE_TARNAME "gnome-power-manager"
+#define PACKAGE_VERSION "2.22.1"
+#define PACKAGE_STRING "gnome-power-manager 2.22.1"
+#define PACKAGE_BUGREPORT ""
+#define PACKAGE "gnome-power-manager"
+#define VERSION "2.22.1"
+
+configure: caught signal 2
+configure: exit 1
--- gnome-power-manager-2.22.1.orig/help/gnome-power-manager.pot
+++ gnome-power-manager-2.22.1/help/gnome-power-manager.pot
@@ -0,0 +1,887 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2008-07-16 17:48+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: C/gnome-power-manager.xml:162(None) 
+msgid "@@image: 'figures/gpm-unplugged.png'; md5=e9e38fa48737547a19b20af6a15d9e95"
+msgstr ""
+
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: C/gnome-power-manager.xml:182(None) 
+msgid "@@image: 'figures/gpm-charged.png'; md5=bfdfc5dbe4a51f993f59aadef35707d6"
+msgstr ""
+
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: C/gnome-power-manager.xml:214(None) 
+msgid "@@image: 'figures/gpm-low.png'; md5=6cd86acf26f251d78060dd2ecb6b6506"
+msgstr ""
+
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: C/gnome-power-manager.xml:239(None) 
+msgid "@@image: 'figures/gpm-critical.png'; md5=77b0848ed3bd0510b65f89e0d07a2fed"
+msgstr ""
+
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: C/gnome-power-manager.xml:258(None) 
+msgid "@@image: 'figures/gpm-suspend-problem.png'; md5=4e4c1fafda61c5ace02f957717ea7ce6"
+msgstr ""
+
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: C/gnome-power-manager.xml:290(None) 
+msgid "@@image: 'figures/gpm-stats-graph.png'; md5=75c81029ce17746af7ea57fd0637d27b"
+msgstr ""
+
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: C/gnome-power-manager.xml:396(None) 
+msgid "@@image: 'figures/gpm-prefs-ac.png'; md5=1fa2bebdf4c21f46a803d2946f717642"
+msgstr ""
+
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: C/gnome-power-manager.xml:410(None) 
+msgid "@@image: 'figures/gpm-prefs-battery.png'; md5=42dd086571ffdeebc021b57b93846478"
+msgstr ""
+
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: C/gnome-power-manager.xml:526(None) 
+msgid "@@image: 'figures/gpm-prefs-general.png'; md5=57143cf4820ffa42856e4138fac70f18"
+msgstr ""
+
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: C/gnome-power-manager.xml:553(None) 
+msgid "@@image: 'figures/gs-prefs.png'; md5=edaf461e61b3d8c5c87f58b00581d0fa"
+msgstr ""
+
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: C/gnome-power-manager.xml:660(None) 
+msgid "@@image: 'figures/applet-brightness.png'; md5=e2a0a772f3e5908648cabe468f7b7991"
+msgstr ""
+
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: C/gnome-power-manager.xml:688(None) 
+msgid "@@image: 'figures/applet-inhibit.png'; md5=44199e392cc0698076a1326048104484"
+msgstr ""
+
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: C/gnome-power-manager.xml:722(None) 
+msgid "@@image: 'figures/gpm-cell-capacity.png'; md5=7635c3b846f39faf7b16a921a6ebb55c"
+msgstr ""
+
+#: C/gnome-power-manager.xml:25(title) 
+msgid "<application>GNOME Power Manager</application> Manual"
+msgstr ""
+
+#: C/gnome-power-manager.xml:27(para) 
+msgid "<application>GNOME Power Manager</application> is a session daemon for the GNOME Desktop that manages the power settings for your laptop or desktop computer."
+msgstr ""
+
+#: C/gnome-power-manager.xml:33(year) 
+msgid "2006"
+msgstr ""
+
+#: C/gnome-power-manager.xml:34(holder) 
+msgid "Richard Hughes (richard@hughsie.com)"
+msgstr ""
+
+#: C/gnome-power-manager.xml:50(publishername) C/gnome-power-manager.xml:86(para) 
+msgid "Richard Hughes"
+msgstr ""
+
+#: C/gnome-power-manager.xml:2(para) 
+msgid "Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License (GFDL), Version 1.1 or any later version published by the Free Software Foundation with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. You can find a copy of the GFDL at this <ulink type=\"help\" url=\"ghelp:fdl\">link</ulink> or in the file COPYING-DOCS distributed with this manual."
+msgstr ""
+
+#: C/gnome-power-manager.xml:12(para) 
+msgid "This manual is part of a collection of GNOME manuals distributed under the GFDL. If you want to distribute this manual separately from the collection, you can do so by adding a copy of the license to the manual, as described in section 6 of the license."
+msgstr ""
+
+#: C/gnome-power-manager.xml:19(para) 
+msgid "Many of the names used by companies to distinguish their products and services are claimed as trademarks. Where those names appear in any GNOME documentation, and the members of the GNOME Documentation Project are made aware of those trademarks, then the names are in capital letters or initial capital letters."
+msgstr ""
+
+#: C/gnome-power-manager.xml:35(para) 
+msgid "DOCUMENT IS PROVIDED ON AN \"AS IS\" BASIS, WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE DOCUMENT OR MODIFIED VERSION OF THE DOCUMENT IS FREE OF DEFECTS MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY, ACCURACY, AND PERFORMANCE OF THE DOCUMENT OR MODIFIED VERSION OF THE DOCUMENT IS WITH YOU. SHOULD ANY DOCUMENT OR MODIFIED VERSION PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE INITIAL WRITER, AUTHOR OR ANY CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY DOCUMENT OR MODIFIED VERSION OF THE DOCUMENT IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER; AND"
+msgstr ""
+
+#: C/gnome-power-manager.xml:55(para) 
+msgid "UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER IN TORT (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL THE AUTHOR, INITIAL WRITER, ANY CONTRIBUTOR, OR ANY DISTRIBUTOR OF THE DOCUMENT OR MODIFIED VERSION OF THE DOCUMENT, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER DAMAGES OR LOSSES ARISING OUT OF OR RELATING TO USE OF THE DOCUMENT AND MODIFIED VERSIONS OF THE DOCUMENT, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF SUCH DAMAGES."
+msgstr ""
+
+#: C/gnome-power-manager.xml:28(para) 
+msgid "DOCUMENT AND MODIFIED VERSIONS OF THE DOCUMENT ARE PROVIDED UNDER THE TERMS OF THE GNU FREE DOCUMENTATION LICENSE WITH THE FURTHER UNDERSTANDING THAT: <placeholder-1/>"
+msgstr ""
+
+#: C/gnome-power-manager.xml:60(firstname) 
+msgid "Richard"
+msgstr ""
+
+#: C/gnome-power-manager.xml:61(surname) 
+msgid "Hughes"
+msgstr ""
+
+#: C/gnome-power-manager.xml:62(email) 
+msgid "richard@hughsie.com"
+msgstr ""
+
+#: C/gnome-power-manager.xml:80(revnumber) 
+msgid "2.0"
+msgstr ""
+
+#: C/gnome-power-manager.xml:81(date) 
+msgid "2006-08-30"
+msgstr ""
+
+#: C/gnome-power-manager.xml:83(para) 
+msgid "Richard Hughes <email>richard@hughsie.com</email>"
+msgstr ""
+
+#: C/gnome-power-manager.xml:92(title) 
+msgid "Feedback"
+msgstr ""
+
+#: C/gnome-power-manager.xml:93(para) 
+msgid "To report a bug or make a suggestion regarding the GNOME Power Manager application or this manual, follow the directions in the <ulink url=\"http://www.gnome.org/projects/gnome-power-manager/\" type=\"http\"><application>GNOME Power Manager</application> Contact Page</ulink>."
+msgstr ""
+
+#: C/gnome-power-manager.xml:0(application) C/gnome-power-manager.xml:0(application) 
+msgid "GNOME Power Manager"
+msgstr ""
+
+#: C/gnome-power-manager.xml:107(primary) C/gnome-power-manager.xml:120(tertiary) 
+msgid "gnome-power-manager"
+msgstr ""
+
+#: C/gnome-power-manager.xml:113(title) 
+msgid "Introduction"
+msgstr ""
+
+#: C/gnome-power-manager.xml:119(secondary) 
+msgid "Manual"
+msgstr ""
+
+#: C/gnome-power-manager.xml:123(para) 
+msgid "The GNOME Power Manager session daemon is a power management daemon for the <systemitem>GNOME desktop</systemitem>"
+msgstr ""
+
+#: C/gnome-power-manager.xml:131(title) 
+msgid "Usage"
+msgstr ""
+
+#: C/gnome-power-manager.xml:132(para) 
+msgid "<application>GNOME Power Manager</application> is usually started in GNOME startup, but you can manually start <application>GNOME Power Manager</application> by doing:"
+msgstr ""
+
+#: C/gnome-power-manager.xml:138(term) 
+msgid "Command line"
+msgstr ""
+
+#: C/gnome-power-manager.xml:140(para) 
+msgid "Type <command>gnome-power-manager --verbose --no-daemon</command>, then press <keycap>Return</keycap>:"
+msgstr ""
+
+#: C/gnome-power-manager.xml:150(title) 
+msgid "Notification Messages"
+msgstr ""
+
+#: C/gnome-power-manager.xml:151(para) 
+msgid "When <application>GNOME Power Manager</application> has started, the following notifications may be displayed."
+msgstr ""
+
+#: C/gnome-power-manager.xml:156(title) 
+msgid "AC Adapter Unplugged"
+msgstr ""
+
+#: C/gnome-power-manager.xml:158(title) 
+msgid "GNOME Power Manager Notification when AC adapter is removed"
+msgstr ""
+
+#: C/gnome-power-manager.xml:168(para) 
+msgid "You can disable this notification by changing the GConf key <command>/apps/gnome-power-manager/notify/discharging</command>."
+msgstr ""
+
+#: C/gnome-power-manager.xml:176(title) 
+msgid "Fully Charged"
+msgstr ""
+
+#: C/gnome-power-manager.xml:178(title) 
+msgid "GNOME Power Manager Notification when laptop primary battery is fully charged"
+msgstr ""
+
+#: C/gnome-power-manager.xml:188(para) 
+msgid "You can disable this notification by changing the GConf key <command>/apps/gnome-power-manager/notify/fully_charged</command>."
+msgstr ""
+
+#: C/gnome-power-manager.xml:194(para) 
+msgid "You will only get a repeat notification if your battery percentage charge drops below 95% and then is again fully charged. This prevents some machines from showing unwanted repeat notifications if the battery is incorrectly reporting the charged status."
+msgstr ""
+
+#: C/gnome-power-manager.xml:204(title) 
+msgid "Power Low"
+msgstr ""
+
+#: C/gnome-power-manager.xml:205(para) 
+msgid "When the battery is low, you will receive the following notification. You should consider switching to AC power really soon."
+msgstr ""
+
+#: C/gnome-power-manager.xml:210(title) 
+msgid "GNOME Power Manager Notification when battery power is low"
+msgstr ""
+
+#: C/gnome-power-manager.xml:220(para) 
+msgid "You can disable this notification by changing the GConf key <command>/apps/gnome-power-manager/notify/low_power</command>."
+msgstr ""
+
+#: C/gnome-power-manager.xml:228(title) 
+msgid "Power Critical"
+msgstr ""
+
+#: C/gnome-power-manager.xml:229(para) 
+msgid "When the computer has run out of power, it will show this notification explaining what action is required. You can change the critical low action using the preferences tool."
+msgstr ""
+
+#: C/gnome-power-manager.xml:235(title) 
+msgid "GNOME Power Manager Notification when the system power is critically low"
+msgstr ""
+
+#: C/gnome-power-manager.xml:247(title) 
+msgid "Suspend Failure"
+msgstr ""
+
+#: C/gnome-power-manager.xml:248(para) 
+msgid "When a suspend failure occurs you may get this following warning. The most common reason for this notification is that the current user does not have permission to suspend or hibernate the computer."
+msgstr ""
+
+#: C/gnome-power-manager.xml:254(title) 
+msgid "GNOME Power Manager Notification when suspend failure occurs"
+msgstr ""
+
+#: C/gnome-power-manager.xml:264(para) 
+msgid "You can disable this notification by changing the GConf key <command>/apps/gnome-power-manager/notify/sleep_failed</command>."
+msgstr ""
+
+#: C/gnome-power-manager.xml:273(title) 
+msgid "Statistics"
+msgstr ""
+
+#: C/gnome-power-manager.xml:274(para) 
+msgid "The statistics program allows you to visualize the power consumption of your laptop hardware."
+msgstr ""
+
+#: C/gnome-power-manager.xml:279(para) 
+msgid "This has been removed from the information window of previous versions of GNOME Power Manager as the data interface is now using DBUS rather than internal IPC. This allows other applications to query and display the data if required."
+msgstr ""
+
+#: C/gnome-power-manager.xml:286(title) 
+msgid "Power History going from battery power to AC"
+msgstr ""
+
+#: C/gnome-power-manager.xml:296(para) 
+msgid "You may not see some options or graphs if your computer does not have the required hardware. You may also see other hardware not shown here (for example UPS devices) but these are treated the same way as other devices."
+msgstr ""
+
+#: C/gnome-power-manager.xml:305(title) 
+msgid "Charge History"
+msgstr ""
+
+#: C/gnome-power-manager.xml:306(para) 
+msgid "This graph shows the percentage charge available for the composite primary battery, so if you have a main laptop battery and an auxiliary battery then only the averaged value will be shown. A legend is not shown with this graph."
+msgstr ""
+
+#: C/gnome-power-manager.xml:315(title) 
+msgid "Power History"
+msgstr ""
+
+#: C/gnome-power-manager.xml:316(para) 
+msgid "This graph shows the power history charge used by the composite primary battery. This line represents the amount of power that is either being used to charge the batteries in the system, or the power being used by the system from the batteries. You should see the line go up when processor intensive tasks are performed, and down when the system is at idle, or when the screen is dimmed. A legend is shown with this graph when data events have been received."
+msgstr ""
+
+#: C/gnome-power-manager.xml:329(para) 
+msgid "You do will not receive rate data from your computer if it is not charging or discharging, or if the computer is suspended. This is due to hardware limitations where the rate is only sent from the battery management chip, rather than the power management chip on the motherboard."
+msgstr ""
+
+#: C/gnome-power-manager.xml:340(title) 
+msgid "Estimated Time History"
+msgstr ""
+
+#: C/gnome-power-manager.xml:341(para) 
+msgid "This graph shows the estimated charge history for the composite primary battery. This line represents the amount of time required until charged, or the amount of time until discharge. This line should go proportionally up when the rate decreases and down when the rate increases. A legend is shown with this graph when data events have been received."
+msgstr ""
+
+#: C/gnome-power-manager.xml:354(title) 
+msgid "Preferences"
+msgstr ""
+
+#: C/gnome-power-manager.xml:356(para) 
+msgid "The preferences window allows you to control:"
+msgstr ""
+
+#: C/gnome-power-manager.xml:360(para) 
+msgid "The LCD brightness when on AC and battery power"
+msgstr ""
+
+#: C/gnome-power-manager.xml:365(para) 
+msgid "The idle time for the screen power-down and suspend action"
+msgstr ""
+
+#: C/gnome-power-manager.xml:370(para) 
+msgid "The actions to perform when the laptop lid is closed"
+msgstr ""
+
+#: C/gnome-power-manager.xml:375(para) 
+msgid "The notification area icon policy"
+msgstr ""
+
+#: C/gnome-power-manager.xml:382(para) 
+msgid "Some sliders or option boxes may be disabled if the GConf policy keys are not writable. This allows administrators to lock-down the actions that a user can select."
+msgstr ""
+
+#: C/gnome-power-manager.xml:390(title) 
+msgid "AC Preferences"
+msgstr ""
+
+#: C/gnome-power-manager.xml:392(title) 
+msgid "GNOME Power Manager AC tab"
+msgstr ""
+
+#: C/gnome-power-manager.xml:404(title) 
+msgid "Battery Preferences"
+msgstr ""
+
+#: C/gnome-power-manager.xml:406(title) 
+msgid "GNOME Power Manager battery tab"
+msgstr ""
+
+#: C/gnome-power-manager.xml:415(para) 
+msgid "Modern computers allow the speed of the processor to be reduced to save power. This allows a powerful computer to reduce the power usage when idle, or when the full capabilities are not required. This dramatically increases battery life as the processor is not running continuously at 100%."
+msgstr ""
+
+#: C/gnome-power-manager.xml:431(para) 
+msgid "All Pentium 4 - Ms"
+msgstr ""
+
+#: C/gnome-power-manager.xml:434(para) 
+msgid "Pentium III Ms 600MHz to 1GHz"
+msgstr ""
+
+#: C/gnome-power-manager.xml:437(para) 
+msgid "Pentium III Ms 700+ MHz"
+msgstr ""
+
+#: C/gnome-power-manager.xml:424(para) 
+msgid "Not all processors support speed control, and you will not see the options to select a policy if your computer does not have a compatible processor installed. The following processors are known to support frequency scaling: <placeholder-1/> Intel Mobile Celeron processors do not have the required functionality and the frequency cannot be controlled."
+msgstr ""
+
+#: C/gnome-power-manager.xml:444(para) 
+msgid "There are several ways to control the power consumption of the processor. You can have profiles, for example, to select maximum performance on AC power and maximum power saving on battery power. The easiest way to control the power saving is set the policy to \"Automatic\" as this will adjust the speed of the processor to the current state of the system automatically."
+msgstr ""
+
+#: C/gnome-power-manager.xml:457(para) 
+msgid "Maximum power saving: This sets the computer operating speed always to the lowest available setting to save battery power. (Linux kernel name: <command>powersave</command>.)"
+msgstr ""
+
+#: C/gnome-power-manager.xml:465(para) 
+msgid "Always maximum speed: This governor sets the processor operating speed to the highest available. (Linux kernel name: <command>performance</command>.)"
+msgstr ""
+
+#: C/gnome-power-manager.xml:473(para) 
+msgid "Automatic power saving: This option changes the frequency of the processor in relation to current processor load. If the processor is being used, then the frequency will increase, but if it is not then will slowly reduce. This provides a nice middle ground between power saving and application speed. This option will keep the processor at high frequency for a few seconds after recent processor activity. This governor may not work correctly on older notebook computers. (Linux kernel name: <command>conservative</command>.)"
+msgstr ""
+
+#: C/gnome-power-manager.xml:488(para) 
+msgid "Based on processor load: This driver is a dynamic processor frequency policy. It will change the frequency of the processor in direct relation to processor load. Due to the number of frequency changes, this may not work reliably for older notebook computers. (Linux kernel name: <command>ondemand</command>.)"
+msgstr ""
+
+#: C/gnome-power-manager.xml:453(para) 
+msgid "You may not have all the options listed below: <placeholder-1/>"
+msgstr ""
+
+#: C/gnome-power-manager.xml:502(para) 
+msgid "Some policies (ondemand and conservative) only increase the processor frequency from minimum when a process has a positive nice value even though a load greater than 1 occurs. This means user applications work well as the processor speed automatically increases. This can however result in a significant performance reduction for system daemons and some background session services. To rectify this, use another policy (e.g. Always maximum speed) or set the following GConf key: <command>/apps/gnome-power-manager/cpufreq/consider_nice</command>."
+msgstr ""
+
+#: C/gnome-power-manager.xml:520(title) 
+msgid "General Preferences"
+msgstr ""
+
+#: C/gnome-power-manager.xml:522(title) 
+msgid "GNOME Power Manager general tab"
+msgstr ""
+
+#: C/gnome-power-manager.xml:534(title) 
+msgid "Session and system idle times"
+msgstr ""
+
+#: C/gnome-power-manager.xml:535(para) 
+msgid "<command>gnome-screensaver</command> is a session daemon that monitors user input, and if the mouse has not been moved, or the keyboard been pressed then it starts a timeout. When the value of this timeout reaches the value set in <command>gnome-screensaver-preferences</command>, then the login is marked as 'session idle'. This is when <application>GNOME Power Manager</application> performs all the session idle actions such as enabling low-power mode and lowering the laptop panel brightness."
+msgstr ""
+
+#: C/gnome-power-manager.xml:547(title) 
+msgid "Changing the session idle timeout in <command>gnome-screensaver-preferences</command>"
+msgstr ""
+
+#: C/gnome-power-manager.xml:558(para) 
+msgid "As soon as the session is marked at idle, <application>GNOME Power Manager</application> starts its own 'system' timer. When the timeout set in <command>gnome-power-preferences</command> is reached, and the CPU load is idle, then the idle action is performed, which is usually to turn off the screen, or to suspend or hibernate."
+msgstr ""
+
+#: C/gnome-power-manager.xml:565(para) 
+msgid "To make this clearer, the sliders in <command>gnome-power-preferences</command> are set to start at the value of the session-timeout + 1 minute, as we cannot logically trigger before the session is marked as idle. If you adjust the value of the 'session idle' timeout in <command>gnome-screensaver-preferences</command> then the start of the sliders in <command>gnome-power-preferences</command> will change accordingly."
+msgstr ""
+
+#: C/gnome-power-manager.xml:577(title) 
+msgid "Advanced Preferences"
+msgstr ""
+
+#: C/gnome-power-manager.xml:580(title) 
+msgid "Screen Dim Brightness"
+msgstr ""
+
+#: C/gnome-power-manager.xml:582(para) 
+msgid "You can change the idle laptop panel brightness by changing the GConf key <command>/apps/gnome-power-manager/backlight/idle_brightness</command>."
+msgstr ""
+
+#: C/gnome-power-manager.xml:590(title) 
+msgid "Screen Locking"
+msgstr ""
+
+#: C/gnome-power-manager.xml:591(para) 
+msgid "By default, <application>GNOME Power Manager</application> supports a simple locking scheme. This means that the screen will lock if set to \"Lock screen\" in gnome-screensaver when the lid is closed, or the system performs a suspend or hibernate action."
+msgstr ""
+
+#: C/gnome-power-manager.xml:597(para) 
+msgid "There is a complex locking scheme available for power users that allows locking policy to change for the lid, suspend and hibernate actions. To enable this complex mode, you will have to disable the GConf key:"
+msgstr ""
+
+#: C/gnome-power-manager.xml:606(command) 
+msgid "/apps/gnome-power-manager/lock/use_screensaver_settings"
+msgstr ""
+
+#: C/gnome-power-manager.xml:610(para) 
+msgid "Then the policy keys can be set to force a gnome-screensaver lock and unlock when the action is performed:"
+msgstr ""
+
+#: C/gnome-power-manager.xml:618(command) 
+msgid "/apps/gnome-power-manager/lock/blank_screen"
+msgstr ""
+
+#: C/gnome-power-manager.xml:623(command) 
+msgid "/apps/gnome-power-manager/lock/suspend"
+msgstr ""
+
+#: C/gnome-power-manager.xml:628(command) 
+msgid "/apps/gnome-power-manager/lock/hibernate"
+msgstr ""
+
+#: C/gnome-power-manager.xml:634(para) 
+msgid "The lock policy for gnome-screensaver is ignored until the simple mode is re-enabled."
+msgstr ""
+
+#: C/gnome-power-manager.xml:643(title) 
+msgid "GNOME Power Applets"
+msgstr ""
+
+#: C/gnome-power-manager.xml:646(title) 
+msgid "Brightness Applet"
+msgstr ""
+
+#: C/gnome-power-manager.xml:647(para) 
+msgid "The brightness applet allows the user to change the brightness temporarily without changing the default policy. This may be useful if you have got a laptop without brightness buttons, as you can now change the brightness easily."
+msgstr ""
+
+#: C/gnome-power-manager.xml:654(title) 
+msgid "Brightness applet drop-down."
+msgstr ""
+
+#: C/gnome-power-manager.xml:666(para) 
+msgid "You will not get the slider if your hardware is not supported."
+msgstr ""
+
+#: C/gnome-power-manager.xml:673(title) 
+msgid "Inhibit Applet"
+msgstr ""
+
+#: C/gnome-power-manager.xml:674(para) 
+msgid "The inhibit applet allows the user to prevent the computer auto-sleeping when inactive. This may be required with old or proprietary programs such as VMWare or Matlab. Just click the icon for the auto-suspend to be inhibited, and click it again for normal operation."
+msgstr ""
+
+#: C/gnome-power-manager.xml:682(title) 
+msgid "Inhibit applet in inhibited state."
+msgstr ""
+
+#: C/gnome-power-manager.xml:694(para) 
+msgid "Don't use this applet if you just use GNOME software, instead file a bug to make the application use the Inhibit() and UnInhibit() methods as this should 'just work'."
+msgstr ""
+
+#: C/gnome-power-manager.xml:704(title) 
+msgid "Frequently Asked Questions"
+msgstr ""
+
+#: C/gnome-power-manager.xml:705(para) 
+msgid "These are questions the mailing list gets asked frequently."
+msgstr ""
+
+#: C/gnome-power-manager.xml:709(title) 
+msgid "What is battery capacity?"
+msgstr ""
+
+#: C/gnome-power-manager.xml:710(para) 
+msgid "Capacity is how much charge your battery can store compared to its manufacturer's guidelines."
+msgstr ""
+
+#: C/gnome-power-manager.xml:715(title) 
+msgid "This graph shows the capacity of a typical lithium ion battery over a few hundred charge-discharge cycles."
+msgstr ""
+
+#: C/gnome-power-manager.xml:730(title) 
+msgid "What's the difference between suspend and hibernate?"
+msgstr ""
+
+#: C/gnome-power-manager.xml:731(para) 
+msgid "The Suspend state is a power saving feature which is the lowest level of power consumption that preserves program data in the computer's memory. When your computer is in the Suspended state, computation will not be performed until normal activity is resumed. It will not resume until signaled by an external event such as a keyboard button press. It generally takes a few seconds to suspend and then resume your computer."
+msgstr ""
+
+#: C/gnome-power-manager.xml:741(para) 
+msgid "You still use a small amount of battery power whilst suspended, so is not recommended for the low power action. If you remove AC power on a desktop, or run out of battery power on a laptop then you will lose your work."
+msgstr ""
+
+#: C/gnome-power-manager.xml:748(para) 
+msgid "The Hibernation state saves the complete state of the computer to hard disk and turns off the power, so that the computer appears to be off. It will not resume until signaled by an external event such as a keyboard button press. This is the lowest power sleeping state available. If you remove AC power on a desktop, or run out of battery power on a laptop then work will not be lost. It can take up to a minute or more to hibernate and wake your computer."
+msgstr ""
+
+#: C/gnome-power-manager.xml:761(title) 
+msgid "My monitor is broken and treats DPMS standby and off states as 'no-signal' which leaves the monitor powered on."
+msgstr ""
+
+#: C/gnome-power-manager.xml:765(para) 
+msgid "You have to change the DPMS suspend mode <application>GNOME Power Manager</application> uses. Open <command>gconf-editor</command>, and then change the keys <literal>/apps/gnome-power-manager/backlight/dpms_method_ac</literal> and <literal>/apps/gnome-power-manager/backlight/dpms_method_battery</literal> to one of the modes that work, e.g. standby, suspend or off."
+msgstr ""
+
+#: C/gnome-power-manager.xml:775(title) 
+msgid "I've set the computer inactive timeout to one minute and it still takes longer than that to suspend."
+msgstr ""
+
+#: C/gnome-power-manager.xml:779(para) 
+msgid "gnome-screensaver is a session daemon that monitors user input, and if the mouse has not been moved, or the keyboard been pressed then it starts a timeout. When the value of this timeout reaches the value set in gnome-screensaver-preferences, then the login is marked as 'session idle'. This is when <application>GNOME Power Manager</application> performs all the session idle actions such as enabling low-power mode and lowering the laptop panel brightness."
+msgstr ""
+
+#: C/gnome-power-manager.xml:789(para) 
+msgid "As soon as the session is marked at idle, <application>GNOME Power Manager</application> starts its own 'system' timer. When the timeout set in gnome-power-preferences is reached, and the CPU load is idle, then the idle action is performed, which is usually to turn off the screen, or to suspend or hibernate."
+msgstr ""
+
+#: C/gnome-power-manager.xml:796(para) 
+msgid "In <application>GNOME Power Manager</application> 2.14 the timeouts were not obviously linked to gnome-screensaver, but the timeouts are linked in reality. This is because the gnome-screensaver declares the session \"idle\" and then <application>GNOME Power Manager</application> starts. Therefore the real time to suspend is actually the GNOME Screensaver timeout PLUS the <application>GNOME Power Manager</application> time."
+msgstr ""
+
+#: C/gnome-power-manager.xml:804(para) 
+msgid "In <application>GNOME Power Manager</application> 2.16 and newer, the sliders in <command>gnome-power-preferences</command> are set to start at the value of the session-timeout + 1 minute, as we cannot logically trigger before the session is marked as idle. If you adjust the value of the 'session idle' timeout in <command>gnome-screensaver-preferences</command> then the start of the sliders in <command>gnome-power-preferences</command> will change accordingly. This makes it more obvious for new users."
+msgstr ""
+
+#: C/gnome-power-manager.xml:817(title) 
+msgid "My time to discharge is always incorrect due to a faulty battery, what can I do?"
+msgstr ""
+
+#: C/gnome-power-manager.xml:821(para) 
+msgid "You might be able to use the percentage charge for g-p-m to use as the policy data. Open <command>gconf-editor</command>, and then change the key <command>/apps/gnome-power-manager/general/use_time_for_policy</command> to false. You can do this easily by doing: <command> gconftool-2 --set --type bool /apps/gnome-power-manager/general/use_time_for_policy false </command>"
+msgstr ""
+
+#: C/gnome-power-manager.xml:832(para) 
+msgid "This should get the policy actions working for you, but of course the time remaining will still be incorrect."
+msgstr ""
+
+#: C/gnome-power-manager.xml:839(title) 
+msgid "Why does not my IBM laptop have the brightness sliders in Power Preferences?"
+msgstr ""
+
+#: C/gnome-power-manager.xml:843(para) 
+msgid "You need to add to <command>/etc/modprobe.conf</command> the following text: <command>options ibm_acpi experimental=1</command>"
+msgstr ""
+
+#: C/gnome-power-manager.xml:847(para) 
+msgid "This will enable the experimental features and make the LCD work."
+msgstr ""
+
+#: C/gnome-power-manager.xml:851(para) 
+msgid "You will have to use sudo or a root account to edit this file."
+msgstr ""
+
+#: C/gnome-power-manager.xml:858(title) 
+msgid "Why does my lid state get confused after suspending or hibernating? (and) My laptop suspended when I didn't expect it to when I removed the power cord!"
+msgstr ""
+
+#: C/gnome-power-manager.xml:863(para) 
+msgid "When you suspend and then resume, ACPI does not seem to send the \"lid open\" event like it should, which I presume is because userspace is not in a position to handle the kernel event when we start to thaw userspace processes."
+msgstr ""
+
+#: C/gnome-power-manager.xml:869(para) 
+msgid "What we have to do it manually refresh the lid device using HAL when we resume, so that the new \"lid open\" value is propagated to <application>GNOME Power Manager</application>."
+msgstr ""
+
+#: C/gnome-power-manager.xml:874(para) 
+msgid "You need to update to a newer version of HAL, or use your updated distribution bug-fix packages."
+msgstr ""
+
+#: C/gnome-power-manager.xml:881(title) 
+msgid "Does <application>GNOME Power Manager</application> support APM?"
+msgstr ""
+
+#: C/gnome-power-manager.xml:882(para) 
+msgid "It supports whatever backends HAL supports! At the moment this includes:"
+msgstr ""
+
+#: C/gnome-power-manager.xml:888(para) 
+msgid "APM (Pre-2000 Intel computers)"
+msgstr ""
+
+#: C/gnome-power-manager.xml:891(para) 
+msgid "ACPI (most modern Intel compatible computers)"
+msgstr ""
+
+#: C/gnome-power-manager.xml:894(para) 
+msgid "PMU (Powerbook, and iBook PPC computers)"
+msgstr ""
+
+#: C/gnome-power-manager.xml:900(title) 
+msgid "Why does <application>GNOME Power Manager</application> not let me suspend or hibernate?"
+msgstr ""
+
+#: C/gnome-power-manager.xml:901(para) 
+msgid "Before showing items such as \"Suspend\" and \"Hibernate\" in the menu g-p-m checks two things:"
+msgstr ""
+
+#: C/gnome-power-manager.xml:908(para) 
+msgid "If HAL can detect a sleep handler in the kernel. You can test this doing <command>lshal | grep can_suspend</command>. HAL works this out from looking at <command>/sys/power/state</command>, and also checking for the presence of suspend2."
+msgstr ""
+
+#: C/gnome-power-manager.xml:916(para) 
+msgid "If your administrator (or you!) has disabled the ability to do a certain action. You can test this using <command>gconftool-2 -R /apps/gnome-power-manager | grep can</command> and change the values to be something more suitable."
+msgstr ""
+
+#: C/gnome-power-manager.xml:924(para) 
+msgid "For instance, my PowerBook reports from HAL that it can suspend and hibernate, but because I know my hibernate does not work, I can disable it in <command>gconf-editor</command> removing the option from <command>gnome-power-preferences</command> and the drop-down menu."
+msgstr ""
+
+#: C/gnome-power-manager.xml:930(para) 
+msgid "If HAL does not list the options you want, then maybe you need to check your BIOS to check that it's running in the correct mode, and also that you have compiled your kernel with the correct options."
+msgstr ""
+
+#: C/gnome-power-manager.xml:935(para) 
+msgid "If there are no gconf keys returned by the second check above, you need to reinstall your gconf schema as per gnomebug:341256: (as root):"
+msgstr ""
+
+#: C/gnome-power-manager.xml:940(programlisting) 
+#, no-wrap
+msgid "\nexport GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`\ngconftool-2 --makefile-install-rule data/gnome-power-manager.schemas\nkillall -HUP gconfd-2\n"
+msgstr ""
+
+#: C/gnome-power-manager.xml:948(title) 
+msgid "Why does my screen dim or screensaver start even when I'm clicking the mouse?"
+msgstr ""
+
+#: C/gnome-power-manager.xml:952(para) 
+msgid "If you click the mouse, or scroll the scroll-wheel without moving the pointer, then gnome-screensaver will detect the session as being idle. This is a limitation of X.org, but is worked around in newer versions of gnome-screensaver."
+msgstr ""
+
+#: C/gnome-power-manager.xml:961(title) 
+msgid "How do I make my application stop the computer auto-suspending?"
+msgstr ""
+
+#: C/gnome-power-manager.xml:964(para) 
+msgid "If your application is doing a long operation, you might want to disable the ability to suspend for a little while. You should use this method if you really don't want the user to be able to suspend, or for the computer to save power by hibernating or suspending during:"
+msgstr ""
+
+#: C/gnome-power-manager.xml:973(para) 
+msgid "Copying files in Nautilus"
+msgstr ""
+
+#: C/gnome-power-manager.xml:976(para) 
+msgid "Doing a long kernel compile or Matlab simulation"
+msgstr ""
+
+#: C/gnome-power-manager.xml:979(para) 
+msgid "During a SELinux relabel"
+msgstr ""
+
+#: C/gnome-power-manager.xml:982(para) 
+msgid "Many others..."
+msgstr ""
+
+#: C/gnome-power-manager.xml:985(para) 
+msgid "Then you can use the Inhibit() and UnInhibit() DBUS methods built into the newest versions of <application>GNOME Power Manager</application>. Here is a simple demonstration in python:"
+msgstr ""
+
+#: C/gnome-power-manager.xml:990(programlisting) 
+#, no-wrap
+msgid "\n#!/usr/bin/python\nimport dbus\nimport time\nbus = dbus.Bus(dbus.Bus.TYPE_SESSION)\ndevobj = bus.get_object('org.freedesktop.PowerManagement', '/org/freedesktop/PowerManagement/Inhibit')\ndev = dbus.Interface(devobj, \"org.freedesktop.PowerManagement.Inhibit\")\ncookie = dev.Inhibit('Nautilus', 'Copying files')\ntime.sleep(100)\ndev.UnInhibit(cookie)\n"
+msgstr ""
+
+#: C/gnome-power-manager.xml:1001(para) 
+msgid "There is an <ulink url=\"http://svn.gnome.org/viewcvs/gnome-power-manager/trunk/test/gpm-inhibit-test.c?view=markup\">example</ulink> which shows developers how to add Inhibit and UnInhibit DBUS methods into existing programs."
+msgstr ""
+
+#: C/gnome-power-manager.xml:1009(title) 
+msgid "Are <application>GNOME Power Manager</application> and GNOME Screensaver inhibit methods the same?"
+msgstr ""
+
+#: C/gnome-power-manager.xml:1012(para) 
+msgid "If you call the inhibit methods on gnome-screensaver, then gnome-screensaver will not mark your session as idle. This means that the screen will not dim, the screensaver will not start and the computer will not suspend automatically."
+msgstr ""
+
+#: C/gnome-power-manager.xml:1018(para) 
+msgid "While playing a movie full-screen, totem should use the gnome-screensaver inhibit methods. The idea is that totem does not have to worry at all about power management. The only thing it wants to assert is that even though there are no key presses or mouse movements, the session is still being used."
+msgstr ""
+
+#: C/gnome-power-manager.xml:1026(para) 
+msgid "The only applications that should use the <application>GNOME Power Manager</application> inhibit method are things that want to assert that the session can be marked as idle, but important things are still happening, so it should not power down. For example, when copying 4.5GB of files in Nautilus, you want the screensaver to display, and the LCD panel to dim, but you don't want the computer to think that it is idle and shutdown, suspend or hibernate."
+msgstr ""
+
+#: C/gnome-power-manager.xml:1038(title) 
+msgid "<application>GNOME Power Manager</application> does not spin down my hard-drive!"
+msgstr ""
+
+#: C/gnome-power-manager.xml:1039(para) 
+msgid "After numerous debates, the consensus was that is was not a good idea to add this functionality to HAL. It was decided user-configurable power management was not really required when modern hard disks have really intelligent power management."
+msgstr ""
+
+#: C/gnome-power-manager.xml:1045(para) 
+msgid "Here the power consumption data for a typical notebook hard disk (IDE/SATA):"
+msgstr ""
+
+#: C/gnome-power-manager.xml:1050(programlisting) 
+#, no-wrap
+msgid "\nStartup (peak, max.)\t\t5.5W \tNC\nSeek\t\t\t\t2.3W\t2.7W\nRead (avg.)\t\t\t2.0W\t2.3W\nWrite (avg.)\t\t\t2.0W\t2.3W\nActive idle (avg.)\t\t1.1W\t1.2W\nLow power idle (avg.)\t\t0.85W\t0.9W\nStandby (avg.)\t\t\t0.2W\t0.25W\nSleep\t\t\t\t0.1W\tNC\n"
+msgstr ""
+
+#: C/gnome-power-manager.xml:1060(para) 
+msgid "The conclusions you can take from this are:"
+msgstr ""
+
+#: C/gnome-power-manager.xml:1065(para) 
+msgid "A disk on low power idle mode needs less than 1 Watt. For a normal battery with 50Wh you could run the hard disk for over 50 hours."
+msgstr ""
+
+#: C/gnome-power-manager.xml:1072(para) 
+msgid "If you do not read/write from/to the hard disk the disk regulates power, but never shuts down the device. The reason is easy: you lost more power with each startup than to leave the hard disk online somewhere between 'Active idle' and 'Low power idle' (depends on the model/manufacturer)."
+msgstr ""
+
+#: C/gnome-power-manager.xml:1081(para) 
+msgid "The other reason to leave this to the internal power management of the disk is: the time needed to reactivate the device. You lose more performance than you lose power between 'Active idle' and 'Low power idle'."
+msgstr ""
+
+#: C/gnome-power-manager.xml:1089(para) 
+msgid "If you use a journaling file system you normally need to flush periodically. This could run in a race between shut down device and restart device by system to flush. This means more power consumption as you change nothing."
+msgstr ""
+
+#: C/gnome-power-manager.xml:1098(para) 
+msgid "You can't set power management for external USB hard disks, because you can't send the needed commands over the USB link to the disk."
+msgstr ""
+
+#: C/gnome-power-manager.xml:1107(title) 
+msgid "I'm running ACPI. Why do events (such as removing the AC adapter) take so long to register?"
+msgstr ""
+
+#: C/gnome-power-manager.xml:1111(para) 
+msgid "One of two things might be the problem."
+msgstr ""
+
+#: C/gnome-power-manager.xml:1116(para) 
+msgid "HAL might not be running the addon that captures the ACPI event."
+msgstr ""
+
+#: C/gnome-power-manager.xml:1121(para) 
+msgid "You BIOS could be faulty, and might need a work-around. Please send a bug report."
+msgstr ""
+
+#: C/gnome-power-manager.xml:1127(para) 
+msgid "For the first case, try to find the HAL processes that are running: <command>ps -eaf | grep hal</command>"
+msgstr ""
+
+#: C/gnome-power-manager.xml:1131(para) 
+msgid "And check for the process <command>hald-addon-acpi</command>. If it is not being run, then please make sure that HAL is being run with the <command>--retain-privileges</command> option in the <command>haldaemon</command> initscript. An alternative to this is to use acpid, rather than the kernel proc file."
+msgstr ""
+
+#: C/gnome-power-manager.xml:1141(title) 
+msgid "How do I query or do actions on <application>GNOME Power Manager</application> from my shell script?"
+msgstr ""
+
+#: C/gnome-power-manager.xml:1144(para) 
+msgid "You can use the dbus-send program. For example, you can set the DPMS mode by running the following:"
+msgstr ""
+
+#: C/gnome-power-manager.xml:1148(programlisting) 
+#, no-wrap
+msgid "\ndbus-send --session \\\n\t  --dest=org.freedesktop.PowerManagement \\\n\t  --type=method_call \\\n\t  --print-reply \\\n\t  --reply-timeout=2000 \\\n\t  /org/freedesktop/PowerManagement \\\n\t  org.freedesktop.PowerManagement.SetDpmsMode \\\n\t  string:suspend\n"
+msgstr ""
+
+#: C/gnome-power-manager.xml:1158(para) 
+msgid "You can put the system into hibernation using the following:"
+msgstr ""
+
+#: C/gnome-power-manager.xml:1161(programlisting) 
+#, no-wrap
+msgid "\ndbus-send --session \\\n\t  --dest=org.freedesktop.PowerManagement \\\n\t  --type=method_call \\\n\t  --print-reply \\\n\t  --reply-timeout=2000 \\\n\t  /org/freedesktop/PowerManagement \\\n\t  org.freedesktop.PowerManagement.Hibernate\n"
+msgstr ""
+
+#: C/gnome-power-manager.xml:1170(para) 
+msgid "See the developers guide file in CVS for the full list."
+msgstr ""
+
+#: C/gnome-power-manager.xml:1176(title) 
+msgid "Nothing happens when I click suspend or hibernate!"
+msgstr ""
+
+#: C/gnome-power-manager.xml:1177(para) 
+msgid "HAL might not *yet* support your distro, or you might have found a bug in <application>GNOME Power Manager</application>. Refer to the reporting bugs section."
+msgstr ""
+
+#: C/gnome-power-manager.xml:1185(title) 
+msgid "Why does not my video adaptor come back after a suspend? It just displays black!"
+msgstr ""
+
+#: C/gnome-power-manager.xml:1189(para) 
+msgid "You may need to add a s3 command to your kernel boot string so that the kernel can re-initialize your video card. See <ulink url=\"http://www.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=blob;hb=HEAD;f=Documentation/power/video.txt\">this document</ulink> for more details, or to see if your system has been identified as needing any extra switches."
+msgstr ""
+
+#: C/gnome-power-manager.xml:1197(para) 
+msgid "Using the new pm-utils should make all this stuff just work in the future using HAL fdi matching against machine DMI and video card vendor and product IDs."
+msgstr ""
+
+#: C/gnome-power-manager.xml:1207(title) 
+msgid "About"
+msgstr ""
+
+#: C/gnome-power-manager.xml:1208(para) 
+msgid "GNOME Power Manager was written by Richard Hughes <email>richard@hughsie.com</email>. To find more information about GNOME Power Manager, please visit the <ulink url=\"http://www.gnome.org/projects/gnome-power-manager\" type=\"http\"><application>GNOME Power Manager</application> web page</ulink>."
+msgstr ""
+
+#: C/gnome-power-manager.xml:1214(para) 
+msgid "To report a bug or make a suggestion regarding this application or this manual, follow the directions at the <ulink url=\"http://www.gnome.org/projects/gnome-power-manager/bugs.html\" type=\"http\"><application>GNOME Power Manager</application> Bug Page</ulink>."
+msgstr ""
+
+#: C/gnome-power-manager.xml:1220(para) 
+msgid "This program is distributed under the terms of the GNU General Public license as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. A copy of this license can be found at this <ulink url=\"gnome-power-manager:gpl\" type=\"help\">link</ulink>, or in the file COPYING included with the source code of this program."
+msgstr ""
+
+#. Put one translator per line, in the form of NAME <EMAIL>, YEAR1, YEAR2.
+#: C/gnome-power-manager.xml:0(None) 
+msgid "translator-credits"
+msgstr ""
+
--- gnome-power-manager-2.22.1.orig/debian/changelog
+++ gnome-power-manager-2.22.1/debian/changelog
@@ -0,0 +1,527 @@
+gnome-power-manager (2.22.1-1ubuntu4.1netbook4) netbook-common; urgency=low
+
+  * 12_prefs_width.patch: Change width of combo boxes to not necessarily be
+    half the width of the page.
+
+ -- Michael Terry <michael.terry@canonical.com>  Wed, 24 Jun 2009 11:20:52 -0400
+
+gnome-power-manager (2.22.1-1ubuntu4.1netbook3) netbook-common; urgency=low
+
+  * 11_round_percentage.patch: Restore brightness level to original value.
+    LP: #369609.
+
+ -- Matthias Klose <doko@ubuntu.com>  Tue, 23 Jun 2009 08:23:18 -0400
+
+gnome-power-manager (2.22.1-1ubuntu4.1netbook2) netbook-common; urgency=low
+
+  * 24-bump-max-timeout.patch:
+    - Set upper value on sleep slider to the NEVER value.  LP: #344236
+
+ -- Michael Terry <michael.terry@canonical.com>  Wed, 18 Mar 2009 11:39:39 -0400
+
+gnome-power-manager (2.22.1-1ubuntu4.1netbook1) netbook-common; urgency=low
+
+  * New hardy release.
+  * Remaining netbook changes:
+    * 20-reset-state-if-it-reverses.patch
+    * 95-allow-inaccurate-policy.patch
+    * 97-battery-icon-fix.patch
+  * New netbook changes:
+    * 24-bump-max-timeout.patch:
+      - Lets timeout sliders go to just a tad over 2 hours.  Otherwise,
+        if the screensaver is set to a large amount (over 1 hour), g-p-m
+        freaks out and shows the wrong values.  LP: #325895
+
+ -- Michael Terry <michael.terry@canonical.com>  Wed, 25 Feb 2009 14:12:03 -0500
+
+gnome-power-manager (2.22.1-1ubuntu4.1) hardy-proposed; urgency=low
+
+  * Add 75-ignore-long-failed-suspends.patch to prevent inaccurately
+    indicating failed suspends when they were >= 6 hours. (LP: #242713)
+
+ -- Mario Limonciello <mario_limonciello@dell.com>  Tue, 02 Sep 2008 17:40:15 -0500
+
+gnome-power-manager (2.22.1-1ubuntu4usg3) hardy; urgency=low
+
+  * 20-reset-state-if-it-reverses.patch:
+    - If charge level raises while we weren't paying attention (like
+      when computer is off), reset state so that we don't miss warning
+      the user.
+
+ -- Michael Terry <michael.terry@canonical.com>  Fri, 30 Jan 2009 10:24:04 -0500
+
+gnome-power-manager (2.22.1-1ubuntu4usg2) hardy; urgency=low
+
+  * No change. Just reverted to old versioning scheme (usg vs. netbook) since
+    we shipped a version with this scheme and want to be able to update it.
+
+ -- Debbie Beliveau <debbie.beliveau@canonical.com>  Tue, 14 Oct 2008 17:50:54 +0000
+
+gnome-power-manager (2.22.1-1ubuntu4netbook4) hardy; urgency=low
+
+  * added patch 97-battery-icon-fix.patch to fix LP: #261953 
+
+ -- Bill Filler <bill.filler@canonical.com>  Wed, 17 Sep 2008 16:35:57 -0400
+
+gnome-power-manager (2.22.1-1ubuntu4netbook3) hardy; urgency=low
+
+  * 90-broken-battery.patch: Removing 90-broken-battery.patch as it does not
+    fix LP#255208. 
+
+ -- Debbie Beliveau <debbie.beliveau@canonical.com>  Tue, 09 Sep 2008 22:54:31 +0000
+
+gnome-power-manager (2.22.1-1ubuntu4netbook2) hardy; urgency=low
+
+  * 95-allow-inaccurate-policy.patch: Rename 95-belmont.patch to more
+    appropriate, cross-project name
+  * 90-broken-battery.patch: Integrated following upstream change to fix
+    LP#255208:
+
+  [ Matthew Garrett ]
+  * src/gpmcellunit.c: (gpm_cell_unit_init):
+  * src/gpmcellunit.h:
+  * src/gpmcell.c: (gpm_cell_refresh_hal_all):
+  The ACPI spec has the following:
+
+  Notice that when the battery is a primary battery (a nonrechargeable
+  battery such as an AlkalineManganese battery) and cannot provide
+  accurate information about the battery to use in the calculation of the
+  remaining battery life, the Control Method Battery can report the
+  percentage directly to OS. It does so by reporting the Last Full
+  Charged Capacity = 100 and BatteryPresentRate=0xFFFFFFFF.
+  This means that Battery Remaining Capacity directly reports the
+  battery's remaining capacity [%] as a value in the range 0 through 100'
+
+  The Eee behaves like this despite the fact that its battery is
+  rechargeable, so ends up triggering the 'Broken battery' warning in
+  gpm. This patch adds support for avoiding this case.
+
+ -- Debbie Beliveau <debbie.beliveau@canonical.com>  Tue, 09 Sep 2008 21:03:32 +0000
+
+gnome-power-manager (2.22.1-1ubuntu4netbook1) hardy; urgency=low
+
+  * Allow policy action to occur even if a low-accuracy profile is detected
+
+ -- Debbie Beliveau <debbie.beliveau@canonical.com>  Fri, 15 Aug 2008 17:52:26 +0000
+
+gnome-power-manager (2.22.1-1ubuntu4) hardy; urgency=low
+
+  * Adding in patch 10_keyboard_brightness_gconf.patch which fixes some
+    cut-and-paste errors in the keyboard brightness server which set the
+    wrong gconf keys.
+  * Updating 04_brightness_events.patch so that idle changes work when
+    we're not on AC and work in the right direction.  Also updating so
+    that we're not using the GCONF key for AC brightness just a fixed
+    value as some people have very different values for AC and it isn't
+    required for the logic. LP: #199522
+
+ -- Ted Gould <ted@ubuntu.com>  Thu, 10 Apr 2008 06:27:11 -0700
+
+gnome-power-manager (2.22.1-1ubuntu3) hardy; urgency=low
+
+  * Adding patch 09_lid_always_blanks.patch to make it so that a lid
+    button will at least blank even when inhibitted.  It also makes it so
+    that inhibit can't block critical battery actions. LP: #193617
+
+ -- Ted Gould <ted@ubuntu.com>  Tue, 08 Apr 2008 08:42:22 -0700
+
+gnome-power-manager (2.22.1-1ubuntu2) hardy; urgency=low
+
+  * Removing 01_no_backlight_on_idle.patch as the code is covered
+    in 04_brightness_events.patch and it is breaking things by being
+    in the general callback.  LP: #207553
+
+ -- Ted Gould <ted@ubuntu.com>  Tue, 01 Apr 2008 15:34:51 -0700
+
+gnome-power-manager (2.22.1-1ubuntu1) hardy; urgency=low
+
+  * Removing 01-use-panel-logout.patch we should be logging out using
+    session managment not calling a command line utility.  Consitency
+    would be better gained by fixing the other applications.
+  * Removing 05_readd_gnome_client.patch as it was merged upstream
+  * Removing 08_remove_lid_sounds.patch as it was merged upstream
+
+ -- Ted Gould <ted@ubuntu.com>  Tue, 01 Apr 2008 14:11:17 -0700
+
+gnome-power-manager (2.22.1-1) unstable; urgency=low
+
+  * New upstream release.
+  * debian/patches/73-getbrightness-returns-int.patch:
+    - Removed. Merged upstream
+  * Shutdown the gstreamer pipeline after playing a sound. Prevents a memory
+    exhausting bug. (Closes: #472637)
+  * debian/control.in: Set the Maintainer to the gnome team. Riccardo hasn't
+    worked on the package for months.
+
+ -- Sjoerd Simons <sjoerd@debian.org>  Sat, 29 Mar 2008 13:52:49 +0100
+
+gnome-power-manager (2.22.0-1) unstable; urgency=low
+
+  [ Michael Biebl ]
+  * debian/control, debian/control.in
+    - Add Vcs-* fields.
+
+  [ Sjoerd Simons ]
+  * New upstream release
+  * debian/patches/01-use-panel-logout.patch:
+    - Updated
+  * debian/patches/02.gnome-power-manager.desktop.in.patch:
+    - Dropped
+  * debian/patches/73-getbrightness-returns-int.patch:
+    - Updated
+
+ -- Sjoerd Simons <sjoerd@debian.org>  Tue, 18 Mar 2008 14:52:01 +0100
+
+gnome-power-manager (2.20.2-3) unstable; urgency=low
+
+  [ Michael Biebl ]
+  * debian/patches/03-system-policy.patch
+    - Make gnome-power-manager claim org.freedesktop.Policy.Power on the
+      D-Bus system bus on startup. This ensures that gnome-power-manager,
+      kpowersave and powersaved are not stepping on each other's toes and only
+      one program is acting on power management events.
+
+ -- Loic Minier <lool@dooz.org>  Tue, 29 Jan 2008 10:15:41 +0100
+
+gnome-power-manager (2.20.2-2) unstable; urgency=low
+
+  * 01-use-panel-logout.patch: use gnome-panel-logout if available
+    instead of the session's logout window, for the sake of consistency
+    across the desktop.
+  * Use the new Homepage field.
+
+ -- Josselin Mouette <joss@debian.org>  Sat, 12 Jan 2008 15:56:10 +0100
+
+gnome-power-manager (2.22.0-0ubuntu2) hardy; urgency=low
+
+  * Adjusting patch 04_brightness_events.patch based on comments
+    by Richard Hughes on the gnome-power-manager mailing list.
+  * Adding in 08_remove_lid_sounds.patch which removes all of the lid
+    sounds.  The are silly and can cause embarassing situtions for
+    Ubuntu users. (LP: 204067)
+
+ -- Ted Gould <ted@ubuntu.com>  Thu, 20 Mar 2008 13:35:46 -0700
+
+gnome-power-manager (2.22.0-0ubuntu1) hardy; urgency=low
+
+  * Changing 02.gnome-power-manager.desktop.in.patch to 
+    02_gnome-power-manager.desktop.in.in.patch to patch the source
+    file instead of the derived one.
+  * Adding in 07_inhibit_applet_icon_resize.patch which makes it so that
+    icons changing size make the applet update it's size.  Fixing the
+    inhibit applet with the Human theme.
+  * Adding patch 06_inhibit_applet_clear.patch which adds a
+    gdk_window_clear so that the icon refreshes cleanly. (LP: 139820)
+  * New upstream release
+  * Removed 75-fix-memleak-brightness-applet.patch as it's been integrated
+    into the upstream release.
+  * Adding patch 05_readd_gnome_client.patch which reverts changes to
+    gpm-main.c to remove gnome_program_init() which makes it so that
+    later calls to GNOMEClient break.
+  * Adding patch '04_brightness_events.patch' which changes the
+    brightness control from being state based to being event
+    based.
+  * Adding in a patch '03_always_get_hw_backlight.patch' which forces
+    the get brightness function to query instead of using a saved value.
+    Hopefully fixing many of the idle brightness bugs.
+  * Adding patch 01_no_backlight_on_idle.patch which was attached on to
+    Bug # 137598 by Tim Hull.  Not sure that it fixes the problem, but
+    seems like good code to include.
+
+ -- Ted Gould <ted@ubuntu.com>  Fri, 14 Mar 2008 14:10:01 -0700
+
+gnome-power-manager (2.21.92-0ubuntu2) hardy; urgency=low
+
+  * Add debian/patches/75-fix-memleak-brightness-applet.patch:
+    Don't leak references in the brightness applet (LP: #196688).
+    Fix picked from upstream SVN trunk (commit 2680).
+
+ -- Daniel T Chen <crimsun@ubuntu.com>  Mon, 03 Mar 2008 15:49:23 -0500
+
+gnome-power-manager (2.21.92-0ubuntu1) hardy; urgency=low
+
+  * Upstream version update.
+     * HAL work arounds
+     * Updated icons (much smaller)
+     * Bug fixes
+     * and more!
+
+ -- Ted Gould <ted@ubuntu.com>  Fri, 15 Feb 2008 14:23:05 -0800
+
+gnome-power-manager (2.21.1-0ubuntu1) hardy; urgency=low
+
+  * Upstream unstable release
+  * debian/control.in
+    - Added build deps for keyring, applet dev and xmlto
+    - Modify maintainer
+  * debian/postinst
+    - Check for ACPI suspend support
+  * debian/gconf-defaults
+    - Added defaults for Ubuntu specific configuration
+  * debian/rules
+    - Make power manager autostart
+    - Handle custom GConf properties
+
+ -- Ted Gould <ted@ubuntu.com>  Fri, 21 Dec 2007 09:54:05 -0800
+
+gnome-power-manager (2.20.2-1) unstable; urgency=low
+
+  * New upstream bugfix release:
+    + debian/patches/73-getbrightness-returns-int.patch:
+      - Updated to apply cleanly again, partially merged upstream.
+    + debian/patches/71-fix-keyboard-brightness-keys.patch,
+      debian/patches/72-fixbashizms.patch:
+      - Dropped, merged upstream.
+  * debian/control.in:
+    + Update Standards-Version to 3.7.3, no other changes needed.
+
+ -- Sebastian Dröge <slomo@debian.org>  Sat, 15 Dec 2007 04:42:54 +0100
+
+gnome-power-manager (2.20.1-1) unstable; urgency=low
+
+  [ Josselin Mouette ]
+  * Depend on hal 0.5.10-1, thanks Nathaniel Smith and Hideki Yamane.
+    Closes: #443796.
+  * Drop --enable-checkfg, thanks Alban Browaeys. Closes: #444491.
+
+  [ Sebastian Dröge ]
+  * New upstream bugfix release.
+
+ -- Sebastian Dröge <slomo@debian.org>  Sat, 01 Dec 2007 19:17:50 +0100
+
+gnome-power-manager (2.20.0-1) unstable; urgency=low
+
+  * New upstream release.
+  * Added patches:
+    71-fix-keyboard-brightness-keys.patch
+    72-fixbashizms.patch
+    73-getbrightness-returns-int.patch
+    taken from the Ubuntu package.
+  * Modified patch:
+    02.gnome-power-manager.desktop.in.patch
+  * Dropped patch:
+    01_fix_gpm_dbus_conf.patch
+
+ -- Riccardo Setti <giskard@debian.org>  Sat, 22 Sep 2007 14:53:46 +0200
+
+gnome-power-manager (2.18.3-1) unstable; urgency=low
+
+  * New upstream stable release.
+
+ -- Loic Minier <lool@dooz.org>  Tue, 22 May 2007 15:09:21 +0200
+
+gnome-power-manager (2.18.2-1) unstable; urgency=low
+
+  * New upstream release.
+  * Dropped 40_link-applets-to-dbus.patch, applied upstream
+  * Dropped 41_automake.patch, no more useful.
+  * Adjusted libnotify build-dep.
+
+ -- Riccardo Setti <giskard@debian.org>  Sun, 22 Apr 2007 12:07:10 +0200
+
+gnome-power-manager (2.18.1-1) experimental; urgency=low
+
+  * New upstream release. 
+
+ -- Riccardo Setti <giskard@debian.org>  Sat, 24 Mar 2007 20:15:01 +0100
+
+gnome-power-manager (2.18.0-1) experimental; urgency=low
+
+  [ Riccardo Setti ]
+  * New upstream release.
+  * Dropped 55_lid_state_tracking.patch
+
+  [ Loic Minier ]
+  * GNOME team uploads; include uploaders.mk and build-dep on gnome-pkg-tools.
+  * Misc cleanups: whitespaces and indentation; reword README.Debian.
+  * Drop DEB_AUTO_UPDATE_AUTOCONF.
+  * Include CDBS's utils.mk.
+  * Add a get-orig-source target to retrieve the upstream tarball.
+  * Include the new check-dist Makefile to prevent accidental uploads to
+    unstable; bump build-dep on gnome-pkg-tools to >= 0.10.
+  * Track all stable versions in watch file.
+  * Build-depend on "libnotify-dev (>= 0.4.3), libnotify-dev-gtk2.10" instead
+    of "libnotify-dev | libnotify-dev-gtk2.10 (>= 0.4.3)".
+  * Bump up libnotify-dev build-dep to >= 0.4.3-2 to make the package
+    autobuildable.
+  * New patch, 40_link-applets-to-dbus, links applets against dbus-glib to fix
+    build with non-dbus gnome-vfs; GNOME #422345.
+  * New patch, 41_automake, automake-1.10 run due to 40_link-applets-to-dbus.
+
+ -- Loic Minier <lool@dooz.org>  Sat, 24 Mar 2007 19:00:58 +0100
+
+gnome-power-manager (2.16.3-1) experimental; urgency=low
+
+  * New upstream release.
+  * Rebuilt with latest libdbus (closes: 405941)
+  * Fixed a bug in g-p-m that prevents gnome-screensaver 
+    from displaying any screensavers after g-p-m has put
+    the display into power saving mode. (closes: 398143)
+ 
+ -- Riccardo Setti <giskard@debian.org>  Sun, 19 Nov 2006 14:19:55 +0100
+
+gnome-power-manager (2.16.0-2) experimental; urgency=low
+
+  * added 55-lid-state-tracking.patch taken from the ubuntu package
+  . 
+
+ -- Riccardo Setti <giskard@debian.org>  Sun, 17 Sep 2006 16:50:05 +0200
+
+gnome-power-manager (2.16.0-1) experimental; urgency=low
+
+  * New upstream release.
+
+ -- Riccardo Setti <giskard@debian.org>  Tue,  5 Sep 2006 20:40:30 +0200
+
+gnome-power-manager (2.15.92-1) experimental; urgency=low
+
+  * New upstream release.
+
+ -- Riccardo Setti <giskard@debian.org>  Mon, 21 Aug 2006 20:46:32 +0200
+
+gnome-power-manager (2.15.91-1) experimental; urgency=low
+
+  * New upstream release.
+
+ -- Riccardo Setti <giskard@debian.org>  Fri, 18 Aug 2006 14:52:12 +0200
+
+gnome-power-manager (2.14.3-3) unstable; urgency=low
+
+  * Gpm now can handle power button. (Closes: #366628)
+  * Added support for StartupNotify in launcher (closes: #361522
+  * Updated pt_BR translation (thank you Goedson) (closes: #361287)
+  * Bumped to stadard version. No changes needed. 
+
+ -- Riccardo Setti <giskard@debian.org>  Sun, 13 Aug 2006 21:12:08 +0200
+
+gnome-power-manager (2.14.3-2) unstable; urgency=low
+
+  * Pass --with-dbus-services option to configure so the services file is
+    installed in the right location (Closes: #369372) 
+
+ -- Sjoerd Simons <sjoerd@debian.org>  Thu,  8 Jun 2006 21:19:54 +0200
+
+gnome-power-manager (2.14.3-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Sjoerd Simons <sjoerd@debian.org>  Fri, 26 May 2006 23:56:20 +0200
+
+gnome-power-manager (2.14.0-1) unstable; urgency=low
+
+  * New upstream version 
+
+ -- Sjoerd Simons <sjoerd@debian.org>  Sun,  2 Apr 2006 19:41:33 +0200
+
+gnome-power-manager (2.13.93-1) experimental; urgency=low
+
+  * New Upstream
+  - removed debian/patches/02_gpm_struct_type.patch. Fixed upstream.
+
+ -- Riccardo Setti <giskard@autistici.org>  Sun,  5 Mar 2006 19:45:37 +0100
+
+gnome-power-manager (2.13.92-2) experimental; urgency=low
+
+  * debian/patches/02_gpm_struct_type.patch
+    + Added. Fix compatibility with dbus 0.61
+  * Build-depend on libdbus-glib-1-dev (>= 0.61)
+  * Add myself to uploaders 
+
+ -- Sjoerd Simons <sjoerd@debian.org>  Fri,  3 Mar 2006 11:48:33 +0100
+
+gnome-power-manager (2.13.92-1) experimental; urgency=low
+
+  * New upstream
+
+ -- Riccardo Setti <giskard@autistici.org>  Sun, 26 Feb 2006 22:14:18 +0100
+
+gnome-power-manager (2.13.91-2) experimental; urgency=low
+
+  [Riccardo Setti]
+  
+  * fixed the installation of the gconf schemas.
+  - thanks to Marco zufus Presi for provide a patch.
+  * added 01_fix_gpm_dbus_conf.patch which grants permissions to the 
+  group powerdev
+  * gpm deps on the last hal in experimental
+ 
+  [Michael Biebl]
+
+  * added a watch file.
+  * automatic autotools updated via DEB_AUTO_UPDATE_AUTOCONF flag.
+  - added build-dep on autoconf
+  * removed debian/dirs since it was useless.
+  
+ -- Riccardo Setti <giskard@autistici.org>  Thu, 23 Feb 2006 21:05:20 +0100
+
+gnome-power-manager (2.13.91-1) experimental; urgency=low
+
+  * New Upstream Release.
+
+ -- Riccardo Setti <giskard@autistici.org>  Tue, 21 Feb 2006 00:03:15 +0100
+
+gnome-power-manager (2.13.90-1) experimental; urgency=low
+
+  * New upstream. 
+
+ -- Riccardo Setti <giskard@autistici.org>  Thu, 16 Feb 2006 14:41:29 +0100
+
+gnome-power-manager (2.13.5-1) unstable; urgency=low
+
+  * new upstream
+  - removed 01_port_to_the_new_libnotify because the last notify code works fine
+  - gpm depends on hal >= 0.5.6, libtool
+  - added --disable-scrollkeeper switch
+  * gpm depends on notification-daemon instead of notify-daemon
+
+ -- Riccardo Setti <giskard@autistici.org>  Sun, 12 Feb 2006 20:45:16 +0100
+
+gnome-power-manager (0.3.1-1) unstable; urgency=low
+ 	
+  * First Debian release.
+  * Initial upload to Debian (closes: #303600)
+  * based on the ubuntu package.
+  * src/gpm-libnotify.{c,h}:
+  - ported to new libnotify api (taken from cvs)
+
+ -- Riccardo Setti <giskard@autistici.org>  Fri, 13 Jan 2006 15:53:43 +0100
+
+gnome-power-manager (0.3.1-0ubuntu4) dapper; urgency=low
+
+  * src/gpm-libnotify.{c,h}:
+    - ported to new libnotify api (taken from cvs)
+  * debian/control:
+    - changed dependency from notification-daemon to notify-daemon
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Mon,  2 Jan 2006 21:10:43 +0100
+
+gnome-power-manager (0.3.1-0ubuntu3) dapper; urgency=low
+
+  * rebuild against latest dbus
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 21 Dec 2005 11:11:56 +0100
+
+gnome-power-manager (0.3.1-0ubuntu2) dapper; urgency=low
+
+  * suspend by calling gdm-signal directly, rather than by going through 
+    hal (allows suspend without requiring privilege escalation)
+
+ -- Matthew Garrett <mjg59@srcf.ucam.org>  Tue,  6 Dec 2005 05:43:33 +0000
+
+gnome-power-manager (0.3.1-0ubuntu1) dapper; urgency=low
+
+  * new upstream release 
+
+ -- Oliver Grawert <ogra@ubuntu.com>  Thu, 17 Nov 2005 02:42:49 +0100
+
+gnome-power-manager (0.2.8.1-1ubuntu1) dapper; urgency=low
+
+  * initial dapper upload
+
+ -- Oliver Grawert <ogra@ubuntu.com>  Tue, 25 Oct 2005 00:24:15 +0200
+
+gnome-power-manager (0.2.8.1-1utopia1) breezy; urgency=low
+
+  * Initial import, based from the universe ubuntu package.
+
+ -- Richard Hughes <richard@hughsie.com>  Mon, 24 Oct 2005 00:49:03 +0100
--- gnome-power-manager-2.22.1.orig/debian/control
+++ gnome-power-manager-2.22.1/debian/control
@@ -0,0 +1,25 @@
+Source: gnome-power-manager
+Section: gnome
+Priority: optional
+Maintainer: Ted Gould <ted@ubuntu.com>
+XSBC-Original-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
+Build-Depends: debhelper (>= 5), cdbs, autotools-dev, libtool, autoconf, libgnomeui-dev, libpanel-applet2-dev, libglade2-dev, libhal-dev (>= 0.5.8), libdbus-1-dev (>= 0.71), libdbus-glib-1-dev (>= 0.71), libxml-parser-perl, libxext-dev, libx11-dev, libgtk2.0-dev (>= 2.11), libwnck-dev (>= 2.10), docbook-to-man, intltool, libnotify-dev (>= 0.4.4-3), docbook-utils, libxres-dev, xmlto, gnome-doc-utils, libpanel-applet2-dev, libgnome-keyring-dev, scrollkeeper, gnome-pkg-tools (>= 0.10), libgstreamer0.10-dev
+Standards-Version: 3.7.3
+Vcs-Bzr: bzr+ssh://bazaar.launchpad.net/~ted-gould/gnome-power/ubuntu-packaging
+Vcs-Browser: http://bazaar.launchpad.net/~ted-gould/gnome-power/ubuntu-packaging
+Homepage: http://www.gnome.org/projects/gnome-power-manager/
+
+Package: gnome-power-manager
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, notification-daemon, hal (>= 0.5.10)
+Description: frontend for gnome-powermanager
+ GNOME Power Manager is a session daemon for the GNOME
+ desktop environment that makes it easy to
+ manage your laptop or desktop system.
+ .
+ gnome-power-manager manages battery status, events,
+ powermanagement settings and actions like:
+  * Suspend to RAM
+  * Suspend to Disk (Hibernate)
+  * Shutdown
+  * Blank screen
--- gnome-power-manager-2.22.1.orig/debian/docs
+++ gnome-power-manager-2.22.1/debian/docs
@@ -0,0 +1,3 @@
+NEWS
+README
+TODO
--- gnome-power-manager-2.22.1.orig/debian/watch
+++ gnome-power-manager-2.22.1/debian/watch
@@ -0,0 +1,2 @@
+version=3
+http://ftp.gnome.org/pub/GNOME/sources/gnome-power-manager/([\d\.]+)[02468]/gnome-power-manager-([\d\.]*).tar.gz
--- gnome-power-manager-2.22.1.orig/debian/compat
+++ gnome-power-manager-2.22.1/debian/compat
@@ -0,0 +1 @@
+5
--- gnome-power-manager-2.22.1.orig/debian/control.in
+++ gnome-power-manager-2.22.1/debian/control.in
@@ -0,0 +1,25 @@
+Source: gnome-power-manager
+Section: gnome
+Priority: optional
+Maintainer: Ted Gould <ted@ubuntu.com>
+XSBC-Original-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
+Build-Depends: debhelper (>= 5), cdbs, autotools-dev, libtool, autoconf, libgnomeui-dev, libpanel-applet2-dev, libglade2-dev, libhal-dev (>= 0.5.8), libdbus-1-dev (>= 0.71), libdbus-glib-1-dev (>= 0.71), libxml-parser-perl, libxext-dev, libx11-dev, libgtk2.0-dev (>= 2.11), libwnck-dev (>= 2.10), docbook-to-man, intltool, libnotify-dev (>= 0.4.4-3), docbook-utils, libxres-dev, xmlto, gnome-doc-utils, libpanel-applet2-dev, libgnome-keyring-dev, scrollkeeper, gnome-pkg-tools (>= 0.10), libgstreamer0.10-dev
+Standards-Version: 3.7.3
+Vcs-Bzr: bzr+ssh://bazaar.launchpad.net/~ted-gould/gnome-power/ubuntu-packaging
+Vcs-Browser: http://bazaar.launchpad.net/~ted-gould/gnome-power/ubuntu-packaging
+Homepage: http://www.gnome.org/projects/gnome-power-manager/
+
+Package: gnome-power-manager
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, notification-daemon, hal (>= 0.5.10)
+Description: frontend for gnome-powermanager
+ GNOME Power Manager is a session daemon for the GNOME
+ desktop environment that makes it easy to
+ manage your laptop or desktop system.
+ .
+ gnome-power-manager manages battery status, events,
+ powermanagement settings and actions like:
+  * Suspend to RAM
+  * Suspend to Disk (Hibernate)
+  * Shutdown
+  * Blank screen
--- gnome-power-manager-2.22.1.orig/debian/copyright
+++ gnome-power-manager-2.22.1/debian/copyright
@@ -0,0 +1,39 @@
+This package was debianized by Riccardo Setti <giskard@autistici.org>
+
+It was downloaded from http://ftp.gnome.org/pub/GNOME/sources/gnome-power-manager/
+
+Copyright Holder: Richard Hughes <richard@hughsie.com>
+                  William Jon McCann <mccann@jhu.edu>
+                  Jaap A. Haitsma <jaap@haitsma.org>
+License:
+
+   This package is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This package is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this package; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+
+On Debian systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL'.
+
+src/eggtryicon.c src/eggtryicon.h are copyright of Anders Carlsson <andersca@gnu.org>
+and are relased under the terms of the GPL 2
+
+On Debian systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL'.
+
+src/gtk-stock-icon.c, src/gtk-stock-icon.h are copyright of Colin Walters <walters@verbum.org and are
+released under the terms of the GPL 2
+
+On Debian systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL'.
+
+
--- gnome-power-manager-2.22.1.orig/debian/README.Debian
+++ gnome-power-manager-2.22.1/debian/README.Debian
@@ -0,0 +1,10 @@
+GNOME Users: Starting GNOME Power Manager with your GNOME Session
+=================================================================
+
+1) Add yourself to the powerdev group; this group is created by hal
+   >= 0.5.6+cvs20060219-1.
+2) Open System -> Preferences -> Sessions
+3) In the Startup Programs tab, click Add
+4) Type "gnome-power-manager", click OK.
+5) Log out of your gnome session, and log back in again.
+
--- gnome-power-manager-2.22.1.orig/debian/gconf-defaults
+++ gnome-power-manager-2.22.1/debian/gconf-defaults
@@ -0,0 +1,7 @@
+/apps/gnome-power-manager/ui/icon_policy charge
+/apps/gnome-power-manager/backlight/brightness_battery 70
+/apps/gnome-power-manager/timeout/sleep_computer_battery 0
+/apps/gnome-power-manager/buttons/lid_battery blank
+/apps/gnome-power-manager/actions/sleep_type_battery nothing
+/apps/gnome-power-manager/lock/use_screensaver_settings false
+/apps/gnome-power-manager/lock/blank_screen false
--- gnome-power-manager-2.22.1.orig/debian/rules
+++ gnome-power-manager-2.22.1/debian/rules
@@ -0,0 +1,38 @@
+#!/usr/bin/make -f
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/gnome.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/utils.mk
+include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
+-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
+
+DEB_AUTO_UPDATE_AUTOCONF = "yes"
+
+DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH)
+
+DEB_CONFIGURE_EXTRA_FLAGS += \
+			--without-gconf-source \
+			--enable-libnotify \
+			--with-dpms-ext \
+			--with-dbus-services=/usr/share/dbus-1/services/ \
+			--disable-scrollkeeper \
+			--with-doc-dir=/usr/share/doc/gnome-power-manager/ \
+			--disable-policykit \
+			--enable-applets
+			
+clean::
+	rm -f po/*.gmo
+
+binary-install/gnome-power-manager::
+	rm -f  debian/gnome-power-manager/usr/share/doc/gnome-power-manager/README.cvs
+	rm -rf debian/gnome-power-manager/etc/dbus/system.d
+	rm -f  debian/gnome-power-manager/usr/share/applications/gnome-power-statistics.desktop
+	mkdir -p debian/gnome-power-manager/etc/xdg/autostart
+	mv  debian/gnome-power-manager/usr/share/gnome/autostart/gnome-power-manager.desktop \
+		debian/gnome-power-manager/etc/xdg/autostart/gnome-power-manager.desktop
+
+install/gnome-power-manager::
+	mkdir -p debian/gnome-power-manager/usr/share/gconf/defaults
+	cp debian/gconf-defaults debian/gnome-power-manager/usr/share/gconf/defaults/10_gnome-power-manager
+
--- gnome-power-manager-2.22.1.orig/debian/postinst
+++ gnome-power-manager-2.22.1/debian/postinst
@@ -0,0 +1,43 @@
+#! /bin/sh
+# postinst script for gnome-power-manager
+
+set -e
+
+#DEBHELPER#
+
+case "$1" in
+    configure)
+        if [ -r /usr/share/acpi-support/device-funcs ]; then
+	   . /usr/share/acpi-support/device-funcs
+           DeviceConfig
+        fi
+        if [ "x$ACPI_SLEEP" = "xtrue" ]; then
+            gconftool-2 --direct \
+                        --config-source xml:readwrite:/var/lib/gconf/defaults \
+                        --set --type bool \
+                        /apps/gnome-power-manager/can_suspend true
+
+            gconftool-2 --direct \
+                        --config-source xml:readwrite:/var/lib/gconf/defaults \
+                        --set --type string \
+                        /apps/gnome-power-manager/action_button_suspend suspend
+
+            gconftool-2 --direct \
+                        --config-source xml:readwrite:/var/lib/gconf/defaults \
+                        --set --type bool \
+                        /apps/gnome-power-manager/suppress_suspend_warning true
+
+        fi
+    ;;
+
+    abort-upgrade|abort-remove|abort-deconfigure)
+
+    ;;
+
+    *)
+        echo "postinst called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+exit 0
--- gnome-power-manager-2.22.1.orig/debian/patches/97-battery-icon-fix.patch
+++ gnome-power-manager-2.22.1/debian/patches/97-battery-icon-fix.patch
@@ -0,0 +1,67 @@
+diff -Nur -x '*.orig' -x '*~' gnome-power-manager-2.22.1.netbook/src/gpm-cell-unit.c gnome-power-manager-2.22.1.netbook.new/src/gpm-cell-unit.c
+--- gnome-power-manager-2.22.1.netbook/src/gpm-cell-unit.c	2008-03-10 17:49:46.000000000 -0400
++++ gnome-power-manager-2.22.1.netbook.new/src/gpm-cell-unit.c	2008-09-17 16:17:40.000000000 -0400
+@@ -50,6 +50,7 @@
+ 	unit->is_present = FALSE;
+ 	unit->is_charging = FALSE;
+ 	unit->is_discharging = FALSE;
++	unit->on_ac = FALSE;
+ 
+ 	return TRUE;
+ }
+@@ -67,6 +68,7 @@
+ 	gpm_debug ("percent        %i", unit->percentage);
+ 	gpm_debug ("is charging    %i", unit->is_charging);
+ 	gpm_debug ("is discharging %i", unit->is_discharging);
++	gpm_debug ("on_ac %i", unit->on_ac);
+ 	if (unit->charge_current > 0) {
+ 		gpm_debug ("charge current %i", unit->charge_current);
+ 	}
+@@ -140,7 +142,7 @@
+ 	g_return_val_if_fail (unit != NULL, FALSE);
+ 
+ 	if (unit->is_charging == FALSE &&
+-	    unit->is_discharging == FALSE &&
++	    (unit->on_ac == TRUE || unit->is_discharging == FALSE) &&
+ 	    unit->percentage > GPM_CELL_UNIT_MIN_CHARGED_PERCENTAGE) {
+ 		return TRUE;
+ 	}
+@@ -178,7 +180,6 @@
+ 		} else if (unit->is_charging == TRUE) {
+ 			index_str = gpm_cell_unit_get_icon_index (unit);
+ 			filename = g_strdup_printf ("gpm-%s-%s-charging", prefix, index_str);
+-
+ 		} else {
+ 			index_str = gpm_cell_unit_get_icon_index (unit);
+ 			filename = g_strdup_printf ("gpm-%s-%s", prefix, index_str);
+diff -Nur -x '*.orig' -x '*~' gnome-power-manager-2.22.1.netbook/src/gpm-cell-unit.h gnome-power-manager-2.22.1.netbook.new/src/gpm-cell-unit.h
+--- gnome-power-manager-2.22.1.netbook/src/gpm-cell-unit.h	2008-03-10 17:49:46.000000000 -0400
++++ gnome-power-manager-2.22.1.netbook.new/src/gpm-cell-unit.h	2008-09-17 16:11:01.000000000 -0400
+@@ -57,6 +57,7 @@
+ 	gboolean	 is_present;
+ 	gboolean	 is_charging;
+ 	gboolean	 is_discharging;
++	gboolean	 on_ac;
+ } GpmCellUnit;
+ 
+ gboolean	 gpm_cell_unit_init		(GpmCellUnit	*unit);
+diff -Nur -x '*.orig' -x '*~' gnome-power-manager-2.22.1.netbook/src/gpm-engine.c gnome-power-manager-2.22.1.netbook.new/src/gpm-engine.c
+--- gnome-power-manager-2.22.1.netbook/src/gpm-engine.c	2008-03-10 17:49:46.000000000 -0400
++++ gnome-power-manager-2.22.1.netbook.new/src/gpm-engine.c	2008-09-17 16:35:07.000000000 -0400
+@@ -387,6 +387,16 @@
+ 	unit_pda = gpm_cell_array_get_unit (collection->pda);
+ 	unit_phone = gpm_cell_array_get_unit (collection->phone);
+ 
++	/* get the ac state */
++	gboolean on_ac = gpm_ac_adapter_is_present (engine->priv->ac_adapter);
++	unit_primary->on_ac = on_ac;
++	unit_ups->on_ac = on_ac;
++	unit_mouse->on_ac = on_ac;
++	unit_keyboard->on_ac = on_ac;
++	unit_pda->on_ac = on_ac;
++	unit_phone->on_ac = on_ac;
++
++
+ 	/* we try CRITICAL: PRIMARY, UPS, MOUSE, KEYBOARD */
+ 	gpm_debug ("Trying CRITICAL icon: primary, ups, mouse, keyboard");
+ 	if (unit_primary->is_present == TRUE) {
--- gnome-power-manager-2.22.1.orig/debian/patches/07_inhibit_applet_icon_resize.patch
+++ gnome-power-manager-2.22.1/debian/patches/07_inhibit_applet_icon_resize.patch
@@ -0,0 +1,32 @@
+diff -ur gnome-power-manager-orig/applets/inhibit/inhibit-applet.c gnome-power-manager-ted/applets/inhibit/inhibit-applet.c
+--- gnome-power-manager-orig/applets/inhibit/inhibit-applet.c	2007-12-14 13:23:42.000000000 -0800
++++ gnome-power-manager-ted/applets/inhibit/inhibit-applet.c	2008-03-12 12:08:59.000000000 -0700
+@@ -244,12 +244,20 @@
+ 			gpm_applet_get_icon (applet);
+ 			gtk_widget_set_size_request (GTK_WIDGET(applet), applet->size, applet->icon_height + 2);
+ 		}
++		/* Adjusting incase the icon size has changed */
++		if (GTK_WIDGET(applet)->allocation.height < applet->icon_height + 2) {
++			gtk_widget_set_size_request (GTK_WIDGET(applet), applet->size, applet->icon_height + 2);
++		}
+ 	} else {
+ 		if (applet->size != GTK_WIDGET(applet)->allocation.height) {
+ 			applet->size = GTK_WIDGET(applet)->allocation.height;
+ 			gpm_applet_get_icon (applet);
+ 			gtk_widget_set_size_request (GTK_WIDGET(applet), applet->icon_width + 2, applet->size);
+ 		}
++		/* Adjusting incase the icon size has changed */
++		if (GTK_WIDGET(applet)->allocation.width < applet->icon_width + 2) {
++			gtk_widget_set_size_request (GTK_WIDGET(applet), applet->icon_width + 2, applet->size);
++		}
+ 	}
+ }
+ 
+@@ -373,6 +381,7 @@
+ 	}
+ 	/* update icon */
+ 	gpm_applet_get_icon (applet);
++	gpm_applet_check_size (applet);
+ 	gpm_applet_update_tooltip (applet);
+ 	gpm_applet_draw_cb (applet);
+ 
--- gnome-power-manager-2.22.1.orig/debian/patches/75-ignore-long-failed-suspends.patch
+++ gnome-power-manager-2.22.1/debian/patches/75-ignore-long-failed-suspends.patch
@@ -0,0 +1,126 @@
+diff -Nur -x '*.orig' -x '*~' gnome-power-manager-2.22.1/libhal-glib/libhal-gpower.c gnome-power-manager-2.22.1.new/libhal-glib/libhal-gpower.c
+--- gnome-power-manager-2.22.1/libhal-glib/libhal-gpower.c	2008-09-02 17:45:15.000000000 -0500
++++ gnome-power-manager-2.22.1.new/libhal-glib/libhal-gpower.c	2008-09-02 17:47:54.000000000 -0500
+@@ -28,6 +28,7 @@
+ #include <glib/gi18n.h>
+ #include <dbus/dbus-glib.h>
+ #include <libdbus-proxy.h>
++#include <time.h>
+ 
+ #include "libhal-marshal.h"
+ #include "libhal-gpower.h"
+@@ -78,9 +79,8 @@
+ 			  HAL_DBUS_SERVICE,
+ 			  HAL_ROOT_COMPUTER,
+ 			  HAL_DBUS_INTERFACE_POWER);
+-	if (power->priv->gproxy == NULL) {
++	if (power->priv->gproxy == NULL)
+ 		g_warning ("HAL does not support power management!");
+-	}
+ 
+ 	power->priv->computer = hal_gdevice_new ();
+ 	hal_gdevice_set_udi (power->priv->computer, HAL_ROOT_COMPUTER);
+@@ -204,9 +204,8 @@
+ hal_gpower_filter_error (GError **error)
+ {
+ 	/* short cut for speed, no error */
+-	if (error == NULL || *error == NULL) {
++	if (error == NULL || *error == NULL)
+ 		return FALSE;
+-	}
+ 
+ 	/* DBUS might time out, which is okay. We can remove this code
+ 	   when the dbus glib bindings are fixed. See #332888 */
+@@ -232,6 +231,8 @@
+ gboolean
+ hal_gpower_suspend (HalGPower *power, guint wakeup, GError **error)
+ {
++	time_t start;
++	time_t end;
+ 	gint retval = 0;
+ 	gboolean ret;
+ 	DBusGProxy *proxy;
+@@ -244,17 +245,24 @@
+ 		return FALSE;
+ 	}
+ 
++	time (&start);
+ 	ret = dbus_g_proxy_call (proxy, "Suspend", error,
+ 				 G_TYPE_INT, wakeup,
+ 				 G_TYPE_INVALID,
+ 				 G_TYPE_INT, &retval,
+ 				 G_TYPE_INVALID);
+ 	/* we might have to ignore the error */
+-	if (error != NULL && hal_gpower_filter_error (error) == TRUE) {
++	if (error != NULL && hal_gpower_filter_error (error))
+ 		return TRUE;
+-	}
+-	if (retval != 0) {
+-		g_warning ("Suspend failed in a horrible way!");
++	if (retval != 0)
++		g_warning ("Suspend failed without error message");
++
++	/* compare the amount of time that has passed - if it's more than 6 hours
++	 * then the dbus call timed out (dbus-pending-call.c) */
++	if (ret != 0) {
++		time (&end);
++		if (difftime (start, end) >= 6*60*60*1000)
++			return TRUE;
+ 	}
+ 	return ret;
+ }
+@@ -272,6 +280,8 @@
+ static gboolean
+ hal_gpower_pm_method_void (HalGPower *power, const gchar *method, GError **error)
+ {
++	time_t start;
++	time_t end;
+ 	guint retval = 0;
+ 	gboolean ret;
+ 	DBusGProxy *proxy;
+@@ -279,6 +289,7 @@
+ 	g_return_val_if_fail (LIBHAL_IS_GPOWER (power), FALSE);
+ 	g_return_val_if_fail (method != NULL, FALSE);
+ 
++
+ 	proxy = dbus_proxy_get_proxy (power->priv->gproxy);
+ 	if (DBUS_IS_G_PROXY (proxy) == FALSE) {
+ 		g_warning ("proxy NULL!!");
+@@ -289,16 +300,23 @@
+ 		return FALSE;
+ 	}
+ 
++	time (&start);
+ 	ret = dbus_g_proxy_call (proxy, method, error,
+ 				 G_TYPE_INVALID,
+ 				 G_TYPE_INT, &retval,
+ 				 G_TYPE_INVALID);
+ 	/* we might have to ignore the error */
+-	if (error != NULL && hal_gpower_filter_error (error) == TRUE) {
++	if (error != NULL && hal_gpower_filter_error (error))
+ 		return TRUE;
+-	}
+-	if (retval != 0) {
++	if (retval != 0)
+ 		g_warning ("%s failed in a horrible way!", method);
++
++	/* compare the amount of time that has passed - if it's more than 6 hours
++	 * then the dbus call timed out (dbus-pending-call.c) */
++	if (ret != 0) {
++		time (&end);
++		if (difftime (start,end) >= 6*60*60*1000)
++			return TRUE;
+ 	}
+ 	return ret;
+ }
+@@ -384,9 +402,8 @@
+ 				 G_TYPE_INVALID,
+ 				 G_TYPE_INT, &retval,
+ 				 G_TYPE_INVALID);
+-	if (retval != 0) {
++	if (retval != 0)
+ 		g_warning ("SetPowerSave failed in a horrible way!");
+-	}
+ 	return ret;
+ }
+ 
--- gnome-power-manager-2.22.1.orig/debian/patches/03_always_get_hw_backlight.patch
+++ gnome-power-manager-2.22.1/debian/patches/03_always_get_hw_backlight.patch
@@ -0,0 +1,30 @@
+diff -ur gnome-power-manager-2.21.92/src/gpm-brightness-lcd.c gnome-power-manager-ted/src/gpm-brightness-lcd.c
+--- gnome-power-manager-2.21.92/src/gpm-brightness-lcd.c	2007-10-05 08:35:43.000000000 -0700
++++ gnome-power-manager-ted/src/gpm-brightness-lcd.c	2008-03-04 16:13:31.000000000 -0800
+@@ -299,16 +299,26 @@
+  *
+  * Gets the current (or at least what this class thinks is current) percentage
+  * brightness. This is quick as no HAL inquiry is done.
++ *
++ * NOTE: This has been modified to do the HAL inquiry to try and fix some
++ *       bugs so it is no longer fast :)
+  **/
+ gboolean
+ gpm_brightness_lcd_get (GpmBrightnessLcd *brightness,
+ 			guint		 *brightness_level)
+ {
+ 	gint percentage;
++	guint current_hw;
+ 
+ 	g_return_val_if_fail (brightness != NULL, FALSE);
+ 	g_return_val_if_fail (GPM_IS_BRIGHTNESS_LCD (brightness), FALSE);
+ 
++	gpm_brightness_lcd_get_hw (brightness, &current_hw);
++	if (current_hw != brightness->priv->last_set_hw) {
++		gpm_debug("brightness changed underneith us.  It is (%i), we thought it was (%i).", current_hw, brightness->priv->last_set_hw);
++		brightness->priv->last_set_hw = current_hw;
++	}
++
+ 	percentage = gpm_discrete_to_percent (brightness->priv->last_set_hw,
+ 					      brightness->priv->levels);
+ 	*brightness_level = percentage;
--- gnome-power-manager-2.22.1.orig/debian/patches/11_round_percentage.patch
+++ gnome-power-manager-2.22.1/debian/patches/11_round_percentage.patch
@@ -0,0 +1,30 @@
+Index: gnome-power-manager-2.24.2/src/gpm-common.c
+===================================================================
+--- gnome-power-manager-2.24.2.orig/src/gpm-common.c
++++ gnome-power-manager-2.24.2/src/gpm-common.c
+@@ -22,6 +22,7 @@
+ #include "config.h"
+ 
+ #include <glib.h>
++#include <math.h>
+ #include <string.h>
+ #include <glib/gi18n.h>
+ #include <gdk/gdk.h>
+@@ -30,6 +31,8 @@
+ #include "egg-debug.h"
+ #include "gpm-common.h"
+ 
++double round (double x);
++
+ /**
+  * gpm_precision_round_up:
+  * @value: The input value
+@@ -137,7 +140,7 @@
+ 		egg_warning ("levels is 0!");
+ 		return 0;
+ 	}
+-	return ((gfloat) percentage * (gfloat) (levels - 1)) / 100.0f;
++	return (guint)((double)round(((double) percentage * (double) (levels - 1)) / 100.0f));
+ }
+ 
+ /**
--- gnome-power-manager-2.22.1.orig/debian/patches/04_brightness_events.patch
+++ gnome-power-manager-2.22.1/debian/patches/04_brightness_events.patch
@@ -0,0 +1,156 @@
+diff -ur gnome-power-manager-2.22.1/src/gpm-backlight.c gnome-power-manager-ted/src/gpm-backlight.c
+--- gnome-power-manager-2.22.1/src/gpm-backlight.c	2008-03-10 14:49:46.000000000 -0700
++++ gnome-power-manager-ted/src/gpm-backlight.c	2008-04-09 11:42:38.000000000 -0700
+@@ -81,6 +81,8 @@
+ 	GTimer			*idle_timer;
+ 	gfloat			 ambient_sensor_value;
+ 	guint			 idle_dim_timeout;
++	gboolean		 old_system_is_idle;
++	gboolean		 old_on_ac;
+ };
+ 
+ enum {
+@@ -315,9 +317,8 @@
+ 		return FALSE;
+ 	}
+ 
+-	/* just set the AC brightness for now, don't try to be clever */
+-	gpm_conf_set_uint (backlight->priv->conf, GPM_CONF_BACKLIGHT_BRIGHTNESS_AC, brightness);
+-#if 0
++	/* gpm_conf_set_uint (backlight->priv->conf, GPM_CONF_BACKLIGHT_BRIGHTNESS_AC, brightness); */
++#if 1
+ 	gboolean ret;
+ 	/* sets the current policy brightness */
+ 	ret = gpm_brightness_lcd_set_std (backlight->priv->brightness, brightness);
+@@ -357,6 +358,7 @@
+ 	gboolean enable_action;
+ 	gboolean battery_reduce;
+ 	guint value;
++	guint value_ac;
+ 	guint old_value;
+ 
+ 	if (backlight->priv->can_dim == FALSE) {
+@@ -370,24 +372,46 @@
+ 		return FALSE;
+ 	}
+ 
+-	/* get the 'main' brightness */
+-	gpm_conf_get_uint (backlight->priv->conf, GPM_CONF_BACKLIGHT_BRIGHTNESS_AC, &value);
++	/* get the current brightness */
++	gpm_brightness_lcd_get (backlight->priv->brightness, &value);
+ 	brightness = value / 100.0f;
+-	gpm_debug ("1. main brightness %f", brightness);
++	gpm_debug ("1. currently set brightness %f", brightness);
+ 
+ 	/* get AC status */
+ 	on_ac = gpm_ac_adapter_is_present (backlight->priv->ac_adapter);
+ 
+ 	/* reduce if on battery power if we should */
+ 	gpm_conf_get_bool (backlight->priv->conf, GPM_CONF_BACKLIGHT_BATTERY_REDUCE, &battery_reduce);
+-	if (on_ac == FALSE && battery_reduce == TRUE) {
++	if (battery_reduce == TRUE && on_ac != backlight->priv->old_on_ac) {
+ 		gpm_conf_get_uint (backlight->priv->conf, GPM_CONF_BACKLIGHT_BRIGHTNESS_BATT, &value);
+-		scale = (100 - value) / 100.0f;
+-		brightness *= scale;
+-	} else {
+-		scale = 1.0f;
++
++		value = 100 - value;
++		scale = value / 100.0f;
++
++		if (scale > 0.0f && scale < 1.0f) {
++			if (!on_ac) {
++				scale = -scale;
++			}
++		} else {
++			scale = 0.0f;
++		}
++
++		/* Never let going on battery turn off the display */
++		if (brightness + scale < 0.0f) {
++			scale = 0.0f - brightness;
++			if (scale > 0.0f) {
++				scale = 0.0f;
++			}
++		}
++		/* Never go over 100% -- it goes to 11! */
++		if (brightness + scale > 1.0f) {
++			scale = 1.0f - brightness;
++		}
++
++		brightness += scale;
+ 	}
+-	gpm_debug ("2. battery scale %f, brightness %f", scale, brightness);
++	backlight->priv->old_on_ac = on_ac;
++	gpm_debug ("2. battery change by %f, brightness %f", scale, brightness);
+ 
+ 	/* reduce if system is momentarily idle */
+ 	if (on_ac == TRUE) {
+@@ -395,14 +419,36 @@
+ 	} else {
+ 		gpm_conf_get_bool (backlight->priv->conf, GPM_CONF_BACKLIGHT_IDLE_DIM_BATT, &enable_action);
+ 	}
+-	if (enable_action == TRUE && backlight->priv->system_is_idle == TRUE) {
++	if (enable_action == TRUE && backlight->priv->system_is_idle != backlight->priv->old_system_is_idle) {
+ 		gpm_conf_get_uint (backlight->priv->conf, GPM_CONF_BACKLIGHT_IDLE_BRIGHTNESS, &value);
++
++		value = 100 - value;
+ 		scale = value / 100.0f;
+-		brightness *= scale;
+-	} else {
+-		scale = 1.0f;
++
++		if (scale > 0.0f && scale < 1.0f) {
++			if (backlight->priv->system_is_idle) {
++				scale = -scale;
++			}
++		} else {
++			scale = 0.0f;
++		}
++
++		/* Never let idle turn off the display */
++		if (brightness + scale < 0.0f) {
++			scale = 0.0f - brightness;
++			if (scale > 0.0f) {
++				scale = 0.0f;
++			}
++		}
++		/* Never go over 100% -- it goes to 11! */
++		if (brightness + scale > 1.0f) {
++			scale = 1.0f - brightness;
++		}
++
++		brightness += scale;
+ 	}
+-	gpm_debug ("3. idle scale %f, brightness %f", scale, brightness);
++	backlight->priv->old_system_is_idle = backlight->priv->system_is_idle;
++	gpm_debug ("3. idle change by %f, brightness %f", scale, brightness);
+ 
+ 	/* reduce if ambient is low */
+ 	gpm_conf_get_bool (backlight->priv->conf, GPM_CONF_AMBIENT_ENABLE, &enable_action);
+@@ -872,9 +918,11 @@
+ 	backlight->priv->ac_adapter = gpm_ac_adapter_new ();
+ 	g_signal_connect (backlight->priv->ac_adapter, "ac-adapter-changed",
+ 			  G_CALLBACK (ac_adapter_changed_cb), backlight);
++	backlight->priv->old_on_ac = gpm_ac_adapter_is_present (backlight->priv->ac_adapter);
+ 
+ 	/* assumption */
+ 	backlight->priv->system_is_idle = FALSE;
++	backlight->priv->old_system_is_idle = FALSE;
+ 	gpm_conf_get_uint (backlight->priv->conf,
+ 			   GPM_CONF_BACKLIGHT_IDLE_DIM_TIME,
+ 			   &backlight->priv->idle_dim_timeout);
+diff -ur gnome-power-manager-2.22.1/src/gpm-prefs-core.c gnome-power-manager-ted/src/gpm-prefs-core.c
+--- gnome-power-manager-2.22.1/src/gpm-prefs-core.c	2008-03-26 01:54:53.000000000 -0700
++++ gnome-power-manager-ted/src/gpm-prefs-core.c	2008-04-09 09:48:21.000000000 -0700
+@@ -954,9 +954,9 @@
+ 		widget = glade_xml_get_widget (prefs->priv->glade_xml, "hbox_ac_cpu");
+ 		gtk_widget_hide_all (widget);
+ 	}
+-	if (prefs->priv->has_lcd == FALSE) {
+ 		widget = glade_xml_get_widget (prefs->priv->glade_xml, "hbox_ac_brightness");
+ 		gtk_widget_hide_all (widget);
++	if (prefs->priv->has_lcd == FALSE) {
+ 		widget = glade_xml_get_widget (prefs->priv->glade_xml, "checkbutton_ac_display_dim");
+ 		gtk_widget_hide_all (widget);
+ 	}
--- gnome-power-manager-2.22.1.orig/debian/patches/70-suppress-pm-actions-on-ltsp.patch
+++ gnome-power-manager-2.22.1/debian/patches/70-suppress-pm-actions-on-ltsp.patch
@@ -0,0 +1,25 @@
+diff -Nur gnome-power-manager-2.19.3/libhal-glib/libhal-gpower.c gnome-power-manager-2.19.3.new/libhal-glib/libhal-gpower.c
+--- gnome-power-manager-2.19.3/libhal-glib/libhal-gpower.c	2007-03-29 16:05:00.000000000 +0200
++++ gnome-power-manager-2.19.3.new/libhal-glib/libhal-gpower.c	2007-06-16 10:31:46.000000000 +0200
+@@ -162,8 +162,8 @@
+ 	exists = hal_gdevice_get_bool (power->priv->computer,
+ 					  "power_management.can_suspend",
+ 					  &can_suspend, NULL);
+-	if (exists == FALSE) {
+-		g_warning ("Key can_suspend missing");
++	if (exists == FALSE || g_getenv("LTSP_CLIENT")) {
++		g_warning ("Key can_suspend missing or running on Thin Client");
+ 		return FALSE;
+ 	}
+ 	return can_suspend;
+@@ -189,8 +189,8 @@
+ 	exists = hal_gdevice_get_bool (power->priv->computer,
+ 					  "power_management.can_hibernate",
+ 					  &can_hibernate, NULL);
+-	if (exists == FALSE) {
+-		g_warning ("Key can_hibernate missing");
++	if (exists == FALSE || g_getenv("LTSP_CLIENT")) {
++		g_warning ("Key can_hibernate missing or running on Thin Client");
+ 		return FALSE;
+ 	}
+ 	return can_hibernate;
--- gnome-power-manager-2.22.1.orig/debian/patches/12_pref_width.patch
+++ gnome-power-manager-2.22.1/debian/patches/12_pref_width.patch
@@ -0,0 +1,503 @@
+diff -Nur -x '*.orig' -x '*~' gnome-power-manager-2.22.1/data/gpm-prefs.glade gnome-power-manager-2.22.1.new/data/gpm-prefs.glade
+--- gnome-power-manager-2.22.1/data/gpm-prefs.glade	2008-03-10 17:50:01.000000000 -0400
++++ gnome-power-manager-2.22.1.new/data/gpm-prefs.glade	2009-06-24 14:20:27.000000000 -0400
+@@ -94,7 +94,6 @@
+ 			  <child>
+ 			    <widget class="GtkHBox" id="hbox_ac_computer">
+ 			      <property name="visible">True</property>
+-			      <property name="homogeneous">True</property>
+ 			      <property name="spacing">12</property>
+ 
+ 			      <child>
+@@ -118,8 +117,6 @@
+ 				</widget>
+ 				<packing>
+ 				  <property name="padding">0</property>
+-				  <property name="expand">False</property>
+-				  <property name="fill">True</property>
+ 				</packing>
+ 			      </child>
+ 
+@@ -137,8 +134,8 @@
+ 				</widget>
+ 				<packing>
+ 				  <property name="padding">0</property>
+-				  <property name="expand">True</property>
+-				  <property name="fill">True</property>
++				  <property name="expand">False</property>
++				  <property name="fill">False</property>
+ 				</packing>
+ 			      </child>
+ 			    </widget>
+@@ -152,7 +149,6 @@
+ 			  <child>
+ 			    <widget class="GtkHBox" id="hbox_ac_lid">
+ 			      <property name="visible">True</property>
+-			      <property name="homogeneous">True</property>
+ 			      <property name="spacing">12</property>
+ 
+ 			      <child>
+@@ -175,8 +171,6 @@
+ 				</widget>
+ 				<packing>
+ 				  <property name="padding">0</property>
+-				  <property name="expand">False</property>
+-				  <property name="fill">True</property>
+ 				</packing>
+ 			      </child>
+ 
+@@ -189,8 +183,8 @@
+ 				</widget>
+ 				<packing>
+ 				  <property name="padding">0</property>
+-				  <property name="expand">True</property>
+-				  <property name="fill">True</property>
++				  <property name="expand">False</property>
++				  <property name="fill">False</property>
+ 				</packing>
+ 			      </child>
+ 			    </widget>
+@@ -204,7 +198,6 @@
+ 			  <child>
+ 			    <widget class="GtkHBox" id="hbox_ac_cpu">
+ 			      <property name="visible">True</property>
+-			      <property name="homogeneous">True</property>
+ 			      <property name="spacing">12</property>
+ 
+ 			      <child>
+@@ -227,8 +220,6 @@
+ 				</widget>
+ 				<packing>
+ 				  <property name="padding">0</property>
+-				  <property name="expand">False</property>
+-				  <property name="fill">True</property>
+ 				</packing>
+ 			      </child>
+ 
+@@ -241,8 +232,8 @@
+ 				</widget>
+ 				<packing>
+ 				  <property name="padding">0</property>
+-				  <property name="expand">True</property>
+-				  <property name="fill">True</property>
++				  <property name="expand">False</property>
++				  <property name="fill">False</property>
+ 				</packing>
+ 			      </child>
+ 			    </widget>
+@@ -321,7 +312,6 @@
+ 			  <child>
+ 			    <widget class="GtkHBox" id="hbox_ac_display">
+ 			      <property name="visible">True</property>
+-			      <property name="homogeneous">True</property>
+ 			      <property name="spacing">12</property>
+ 
+ 			      <child>
+@@ -345,8 +335,6 @@
+ 				</widget>
+ 				<packing>
+ 				  <property name="padding">0</property>
+-				  <property name="expand">False</property>
+-				  <property name="fill">True</property>
+ 				</packing>
+ 			      </child>
+ 
+@@ -363,8 +351,8 @@
+ 				</widget>
+ 				<packing>
+ 				  <property name="padding">0</property>
+-				  <property name="expand">True</property>
+-				  <property name="fill">True</property>
++				  <property name="expand">False</property>
++				  <property name="fill">False</property>
+ 				</packing>
+ 			      </child>
+ 			    </widget>
+@@ -378,7 +366,6 @@
+ 			  <child>
+ 			    <widget class="GtkHBox" id="hbox_ac_brightness">
+ 			      <property name="visible">True</property>
+-			      <property name="homogeneous">True</property>
+ 			      <property name="spacing">12</property>
+ 
+ 			      <child>
+@@ -402,8 +389,6 @@
+ 				</widget>
+ 				<packing>
+ 				  <property name="padding">0</property>
+-				  <property name="expand">False</property>
+-				  <property name="fill">True</property>
+ 				</packing>
+ 			      </child>
+ 
+@@ -420,8 +405,8 @@
+ 				</widget>
+ 				<packing>
+ 				  <property name="padding">0</property>
+-				  <property name="expand">True</property>
+-				  <property name="fill">True</property>
++				  <property name="expand">False</property>
++				  <property name="fill">False</property>
+ 				</packing>
+ 			      </child>
+ 			    </widget>
+@@ -555,7 +540,6 @@
+ 			  <child>
+ 			    <widget class="GtkHBox" id="hbox_battery_computer">
+ 			      <property name="visible">True</property>
+-			      <property name="homogeneous">True</property>
+ 			      <property name="spacing">12</property>
+ 
+ 			      <child>
+@@ -579,8 +563,6 @@
+ 				</widget>
+ 				<packing>
+ 				  <property name="padding">0</property>
+-				  <property name="expand">False</property>
+-				  <property name="fill">True</property>
+ 				</packing>
+ 			      </child>
+ 
+@@ -598,8 +580,8 @@
+ 				</widget>
+ 				<packing>
+ 				  <property name="padding">0</property>
+-				  <property name="expand">True</property>
+-				  <property name="fill">True</property>
++				  <property name="expand">False</property>
++				  <property name="fill">False</property>
+ 				</packing>
+ 			      </child>
+ 			    </widget>
+@@ -613,7 +595,6 @@
+ 			  <child>
+ 			    <widget class="GtkHBox" id="hbox_battery_lid">
+ 			      <property name="visible">True</property>
+-			      <property name="homogeneous">True</property>
+ 			      <property name="spacing">12</property>
+ 
+ 			      <child>
+@@ -636,8 +617,6 @@
+ 				</widget>
+ 				<packing>
+ 				  <property name="padding">0</property>
+-				  <property name="expand">False</property>
+-				  <property name="fill">True</property>
+ 				</packing>
+ 			      </child>
+ 
+@@ -650,8 +629,8 @@
+ 				</widget>
+ 				<packing>
+ 				  <property name="padding">0</property>
+-				  <property name="expand">True</property>
+-				  <property name="fill">True</property>
++				  <property name="expand">False</property>
++				  <property name="fill">False</property>
+ 				</packing>
+ 			      </child>
+ 			    </widget>
+@@ -665,7 +644,6 @@
+ 			  <child>
+ 			    <widget class="GtkHBox" id="hbox20">
+ 			      <property name="visible">True</property>
+-			      <property name="homogeneous">True</property>
+ 			      <property name="spacing">12</property>
+ 
+ 			      <child>
+@@ -688,8 +666,6 @@
+ 				</widget>
+ 				<packing>
+ 				  <property name="padding">0</property>
+-				  <property name="expand">False</property>
+-				  <property name="fill">True</property>
+ 				</packing>
+ 			      </child>
+ 
+@@ -702,8 +678,8 @@
+ 				</widget>
+ 				<packing>
+ 				  <property name="padding">0</property>
+-				  <property name="expand">True</property>
+-				  <property name="fill">True</property>
++				  <property name="expand">False</property>
++				  <property name="fill">False</property>
+ 				</packing>
+ 			      </child>
+ 			    </widget>
+@@ -717,7 +693,6 @@
+ 			  <child>
+ 			    <widget class="GtkHBox" id="hbox_battery_cpu">
+ 			      <property name="visible">True</property>
+-			      <property name="homogeneous">True</property>
+ 			      <property name="spacing">12</property>
+ 
+ 			      <child>
+@@ -740,8 +715,6 @@
+ 				</widget>
+ 				<packing>
+ 				  <property name="padding">0</property>
+-				  <property name="expand">False</property>
+-				  <property name="fill">True</property>
+ 				</packing>
+ 			      </child>
+ 
+@@ -754,8 +727,8 @@
+ 				</widget>
+ 				<packing>
+ 				  <property name="padding">0</property>
+-				  <property name="expand">True</property>
+-				  <property name="fill">True</property>
++				  <property name="expand">False</property>
++				  <property name="fill">False</property>
+ 				</packing>
+ 			      </child>
+ 			    </widget>
+@@ -834,7 +807,6 @@
+ 			  <child>
+ 			    <widget class="GtkHBox" id="hbox_battery_display">
+ 			      <property name="visible">True</property>
+-			      <property name="homogeneous">True</property>
+ 			      <property name="spacing">12</property>
+ 
+ 			      <child>
+@@ -858,8 +830,6 @@
+ 				</widget>
+ 				<packing>
+ 				  <property name="padding">0</property>
+-				  <property name="expand">False</property>
+-				  <property name="fill">True</property>
+ 				</packing>
+ 			      </child>
+ 
+@@ -876,8 +846,8 @@
+ 				</widget>
+ 				<packing>
+ 				  <property name="padding">0</property>
+-				  <property name="expand">True</property>
+-				  <property name="fill">True</property>
++				  <property name="expand">False</property>
++				  <property name="fill">False</property>
+ 				</packing>
+ 			      </child>
+ 			    </widget>
+@@ -1030,7 +1000,6 @@
+ 			  <child>
+ 			    <widget class="GtkHBox" id="hbox_ups_computer">
+ 			      <property name="visible">True</property>
+-			      <property name="homogeneous">True</property>
+ 			      <property name="spacing">12</property>
+ 
+ 			      <child>
+@@ -1054,8 +1023,6 @@
+ 				</widget>
+ 				<packing>
+ 				  <property name="padding">0</property>
+-				  <property name="expand">False</property>
+-				  <property name="fill">True</property>
+ 				</packing>
+ 			      </child>
+ 
+@@ -1073,8 +1040,8 @@
+ 				</widget>
+ 				<packing>
+ 				  <property name="padding">0</property>
+-				  <property name="expand">True</property>
+-				  <property name="fill">True</property>
++				  <property name="expand">False</property>
++				  <property name="fill">False</property>
+ 				</packing>
+ 			      </child>
+ 			    </widget>
+@@ -1088,7 +1055,6 @@
+ 			  <child>
+ 			    <widget class="GtkHBox" id="hbox18">
+ 			      <property name="visible">True</property>
+-			      <property name="homogeneous">True</property>
+ 			      <property name="spacing">12</property>
+ 
+ 			      <child>
+@@ -1111,8 +1077,6 @@
+ 				</widget>
+ 				<packing>
+ 				  <property name="padding">0</property>
+-				  <property name="expand">False</property>
+-				  <property name="fill">True</property>
+ 				</packing>
+ 			      </child>
+ 
+@@ -1125,8 +1089,8 @@
+ 				</widget>
+ 				<packing>
+ 				  <property name="padding">0</property>
+-				  <property name="expand">True</property>
+-				  <property name="fill">True</property>
++				  <property name="expand">False</property>
++				  <property name="fill">False</property>
+ 				</packing>
+ 			      </child>
+ 			    </widget>
+@@ -1140,7 +1104,6 @@
+ 			  <child>
+ 			    <widget class="GtkHBox" id="hbox19">
+ 			      <property name="visible">True</property>
+-			      <property name="homogeneous">True</property>
+ 			      <property name="spacing">12</property>
+ 
+ 			      <child>
+@@ -1163,8 +1126,6 @@
+ 				</widget>
+ 				<packing>
+ 				  <property name="padding">0</property>
+-				  <property name="expand">False</property>
+-				  <property name="fill">True</property>
+ 				</packing>
+ 			      </child>
+ 
+@@ -1177,8 +1138,8 @@
+ 				</widget>
+ 				<packing>
+ 				  <property name="padding">0</property>
+-				  <property name="expand">True</property>
+-				  <property name="fill">True</property>
++				  <property name="expand">False</property>
++				  <property name="fill">False</property>
+ 				</packing>
+ 			      </child>
+ 			    </widget>
+@@ -1276,7 +1237,6 @@
+ 			  <child>
+ 			    <widget class="GtkHBox" id="hbox_ups_display">
+ 			      <property name="visible">True</property>
+-			      <property name="homogeneous">True</property>
+ 			      <property name="spacing">12</property>
+ 
+ 			      <child>
+@@ -1300,8 +1260,6 @@
+ 				</widget>
+ 				<packing>
+ 				  <property name="padding">0</property>
+-				  <property name="expand">False</property>
+-				  <property name="fill">True</property>
+ 				</packing>
+ 			      </child>
+ 
+@@ -1318,8 +1276,8 @@
+ 				</widget>
+ 				<packing>
+ 				  <property name="padding">0</property>
+-				  <property name="expand">True</property>
+-				  <property name="fill">True</property>
++				  <property name="expand">False</property>
++				  <property name="fill">False</property>
+ 				</packing>
+ 			      </child>
+ 			    </widget>
+@@ -1434,7 +1392,6 @@
+ 			  <child>
+ 			    <widget class="GtkHBox" id="hbox_general_power">
+ 			      <property name="visible">True</property>
+-			      <property name="homogeneous">True</property>
+ 			      <property name="spacing">12</property>
+ 
+ 			      <child>
+@@ -1457,8 +1414,6 @@
+ 				</widget>
+ 				<packing>
+ 				  <property name="padding">0</property>
+-				  <property name="expand">False</property>
+-				  <property name="fill">True</property>
+ 				</packing>
+ 			      </child>
+ 
+@@ -1471,8 +1426,8 @@
+ 				</widget>
+ 				<packing>
+ 				  <property name="padding">0</property>
+-				  <property name="expand">True</property>
+-				  <property name="fill">True</property>
++				  <property name="expand">False</property>
++				  <property name="fill">False</property>
+ 				</packing>
+ 			      </child>
+ 			    </widget>
+@@ -1486,7 +1441,6 @@
+ 			  <child>
+ 			    <widget class="GtkHBox" id="hbox_general_suspend">
+ 			      <property name="visible">True</property>
+-			      <property name="homogeneous">True</property>
+ 			      <property name="spacing">12</property>
+ 
+ 			      <child>
+@@ -1509,8 +1463,6 @@
+ 				</widget>
+ 				<packing>
+ 				  <property name="padding">0</property>
+-				  <property name="expand">False</property>
+-				  <property name="fill">True</property>
+ 				</packing>
+ 			      </child>
+ 
+@@ -1523,8 +1475,8 @@
+ 				</widget>
+ 				<packing>
+ 				  <property name="padding">0</property>
+-				  <property name="expand">True</property>
+-				  <property name="fill">True</property>
++				  <property name="expand">False</property>
++				  <property name="fill">False</property>
+ 				</packing>
+ 			      </child>
+ 			    </widget>
+diff -Nur -x '*.orig' -x '*~' gnome-power-manager-2.22.1/src/gpm-prefs-core.c gnome-power-manager-2.22.1.new/src/gpm-prefs-core.c
+--- gnome-power-manager-2.22.1/src/gpm-prefs-core.c	2009-06-24 14:20:25.000000000 -0400
++++ gnome-power-manager-2.22.1.new/src/gpm-prefs-core.c	2009-06-24 14:20:50.000000000 -0400
+@@ -1117,6 +1117,40 @@
+ 	}
+ }
+ 
++static void
++prefs_add_size_group (GpmPrefs *prefs)
++{
++	GladeXML     *xml;
++	GtkSizeGroup *group;
++	
++	xml = prefs->priv->glade_xml;
++	group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
++	
++	gtk_size_group_add_widget (group, glade_xml_get_widget (xml, "hscale_ac_computer"));
++	gtk_size_group_add_widget (group, glade_xml_get_widget (xml, "combobox_ac_lid"));
++	gtk_size_group_add_widget (group, glade_xml_get_widget (xml, "combobox_ac_cpu"));
++	gtk_size_group_add_widget (group, glade_xml_get_widget (xml, "hscale_ac_display"));
++	gtk_size_group_add_widget (group, glade_xml_get_widget (xml, "hscale_ac_brightness"));
++	
++	gtk_size_group_add_widget (group, glade_xml_get_widget (xml, "hscale_battery_computer"));
++	gtk_size_group_add_widget (group, glade_xml_get_widget (xml, "combobox_battery_lid"));
++	gtk_size_group_add_widget (group, glade_xml_get_widget (xml, "combobox_battery_critical"));
++	gtk_size_group_add_widget (group, glade_xml_get_widget (xml, "combobox_battery_cpu"));
++	gtk_size_group_add_widget (group, glade_xml_get_widget (xml, "hscale_battery_display"));
++	
++	if (prefs->priv->has_ups) {
++		gtk_size_group_add_widget (group, glade_xml_get_widget (xml, "hscale_ups_computer"));
++		gtk_size_group_add_widget (group, glade_xml_get_widget (xml, "combobox_ups_low"));
++		gtk_size_group_add_widget (group, glade_xml_get_widget (xml, "combobox_ups_critical"));
++		gtk_size_group_add_widget (group, glade_xml_get_widget (xml, "hscale_ups_display"));
++	}
++	
++	gtk_size_group_add_widget (group, glade_xml_get_widget (xml, "combobox_general_power"));
++	gtk_size_group_add_widget (group, glade_xml_get_widget (xml, "combobox_general_suspend"));
++	
++	g_object_unref (group);
++}
++
+ /**
+  * gpm_prefs_init:
+  * @prefs: This prefs class instance
+@@ -1188,6 +1222,7 @@
+ 	prefs_setup_ups (prefs);
+ 	prefs_setup_general (prefs);
+ 	prefs_setup_notification (prefs);
++	prefs_add_size_group (prefs);
+ 
+ 	gtk_widget_show (main_window);
+ }
--- gnome-power-manager-2.22.1.orig/debian/patches/24-bump-max-timeout.patch
+++ gnome-power-manager-2.22.1/debian/patches/24-bump-max-timeout.patch
@@ -0,0 +1,79 @@
+diff -Nur -x '*.orig' -x '*~' gnome-power-manager-2.22.1/src/gpm-prefs-core.c gnome-power-manager-2.22.1.new/src/gpm-prefs-core.c
+--- gnome-power-manager-2.22.1/src/gpm-prefs-core.c	2009-03-18 12:45:52.000000000 -0400
++++ gnome-power-manager-2.22.1.new/src/gpm-prefs-core.c	2009-03-18 12:47:05.000000000 -0400
+@@ -93,8 +93,11 @@
+ #define CPUFREQ_POWERSAVE_TEXT		_("Maximum power saving")
+ #define CPUFREQ_PERFORMANCE_TEXT	_("Always maximum speed")
+ 
+-/* If sleep time in a slider is set to 61 it is considered as never */
+-const int NEVER_TIME_ON_SLIDER = 61;
++/* If sleep time in a slider is set to 122 it is considered as never.
++   We use 122 because gnome-screensaver's idle delay can be pushed to 120.
++   We leave ourselves an extra minute past that (because our slider is always
++   at least idle_delay+1).  Then 122 is the special value 'never'. */
++const int NEVER_TIME_ON_SLIDER = 122;
+ 
+ /**
+  * gpm_prefs_class_init:
+@@ -927,6 +930,10 @@
+ 				 ACTION_SHUTDOWN,
+ 				 NULL};
+ 
++	delay = gpm_screensaver_get_delay (prefs->priv->screensaver);
++	set_idle_hscale_stops (prefs, "hscale_ac_computer", delay);
++	set_idle_hscale_stops (prefs, "hscale_ac_display", delay);
++
+ 	gpm_prefs_setup_action_combo (prefs, "combobox_ac_lid",
+ 				      GPM_CONF_BUTTON_LID_AC,
+ 				      button_lid_actions);
+@@ -942,10 +949,6 @@
+ 	gpm_prefs_setup_checkbox (prefs, "checkbutton_ac_display_dim",
+ 				  GPM_CONF_BACKLIGHT_IDLE_DIM_AC);
+ 
+-	delay = gpm_screensaver_get_delay (prefs->priv->screensaver);
+-	set_idle_hscale_stops (prefs, "hscale_ac_computer", delay);
+-	set_idle_hscale_stops (prefs, "hscale_ac_display", delay);
+-
+ 	if (prefs->priv->has_button_lid == FALSE) {
+ 		widget = glade_xml_get_widget (prefs->priv->glade_xml, "hbox_ac_lid");
+ 		gtk_widget_hide_all (widget);
+@@ -999,6 +1002,10 @@
+ 		return;
+ 	}
+ 
++	delay = gpm_screensaver_get_delay (prefs->priv->screensaver);
++	set_idle_hscale_stops (prefs, "hscale_battery_computer", delay);
++	set_idle_hscale_stops (prefs, "hscale_battery_display", delay);
++
+ 	gpm_prefs_setup_action_combo (prefs, "combobox_battery_lid",
+ 				      GPM_CONF_BUTTON_LID_BATT,
+ 				      button_lid_actions);
+@@ -1024,10 +1031,6 @@
+ 		gtk_widget_hide_all (widget);
+ 	}
+ 
+-	delay = gpm_screensaver_get_delay (prefs->priv->screensaver);
+-	set_idle_hscale_stops (prefs, "hscale_battery_computer", delay);
+-	set_idle_hscale_stops (prefs, "hscale_battery_display", delay);
+-
+ 	if (prefs->priv->has_button_lid == FALSE) {
+ 		widget = glade_xml_get_widget (prefs->priv->glade_xml, "hbox_battery_lid");
+ 		gtk_widget_hide_all (widget);
+@@ -1069,6 +1072,8 @@
+ 		return;
+ 	}
+ 
++	delay = gpm_screensaver_get_delay (prefs->priv->screensaver);
++	set_idle_hscale_stops (prefs, "hscale_ups_computer", delay);
+ 	gpm_prefs_setup_action_combo (prefs, "combobox_ups_low",
+ 				      GPM_CONF_ACTIONS_LOW_UPS,
+ 				      ups_low_actions);
+@@ -1077,8 +1082,6 @@
+ 				      ups_low_actions);
+ 	gpm_prefs_setup_sleep_slider (prefs, "hscale_ups_computer",
+ 				      GPM_CONF_TIMEOUT_SLEEP_COMPUTER_BATT);
+-	delay = gpm_screensaver_get_delay (prefs->priv->screensaver);
+-	set_idle_hscale_stops (prefs, "hscale_ups_computer", delay);
+ }
+ 
+ static void
--- gnome-power-manager-2.22.1.orig/debian/patches/20-reset-state-if-it-reverses.patch
+++ gnome-power-manager-2.22.1/debian/patches/20-reset-state-if-it-reverses.patch
@@ -0,0 +1,23 @@
+diff -Nur -x '*.orig' -x '*~' gnome-power-manager-2.22.1/src/gpm-cell-array.c gnome-power-manager-2.22.1.new/src/gpm-cell-array.c
+--- gnome-power-manager-2.22.1/src/gpm-cell-array.c	2008-03-12 16:35:52.000000000 -0400
++++ gnome-power-manager-2.22.1.new/src/gpm-cell-array.c	2009-01-06 14:48:45.000000000 -0500
+@@ -557,10 +557,6 @@
+ 		if (warnings_state <= cell_array->priv->warnings_state) {
+ 			gpm_debug ("Already notified %i", warnings_state);
+ 		} else {
+-
+-			/* As the level is more critical than the last warning, save it */
+-			cell_array->priv->warnings_state = warnings_state;
+-
+ 			gpm_debug ("warning state = %i", warnings_state);
+ 			if (warnings_state == GPM_WARNINGS_DISCHARGING) {
+ 				/* we emit this, even if the profile is crap */
+@@ -570,6 +566,8 @@
+ 				gpm_cell_array_emit_system_action (cell_array, warnings_state);
+ 			}
+ 		}
++		
++		cell_array->priv->warnings_state = warnings_state;
+ 	}
+ }
+ 
--- gnome-power-manager-2.22.1.orig/debian/patches/02_gnome-power-manager.desktop.in.in.patch
+++ gnome-power-manager-2.22.1/debian/patches/02_gnome-power-manager.desktop.in.in.patch
@@ -0,0 +1,11 @@
+diff -ur gnome-power-manager-orig/data/gnome-power-manager.desktop.in.in gnome-power-manager-ted/data/gnome-power-manager.desktop.in.in
+--- gnome-power-manager-orig/data/gnome-power-manager.desktop.in.in	2008-01-27 06:15:08.000000000 -0800
++++ gnome-power-manager-ted/data/gnome-power-manager.desktop.in.in	2008-03-14 14:04:18.000000000 -0700
+@@ -2,6 +2,7 @@
+ Encoding=UTF-8
+ _Name=Power Manager
+ _Comment=Power management daemon
++StartupNotify=true
+ Icon=gnome-power-manager
+ Exec=gnome-power-manager
+ Terminal=false
--- gnome-power-manager-2.22.1.orig/debian/patches/06_inhibit_applet_clear.patch
+++ gnome-power-manager-2.22.1/debian/patches/06_inhibit_applet_clear.patch
@@ -0,0 +1,13 @@
+diff -ur gnome-power-manager-orig/applets/inhibit/inhibit-applet.c gnome-power-manager-ted/applets/inhibit/inhibit-applet.c
+--- gnome-power-manager-orig/applets/inhibit/inhibit-applet.c	2007-12-14 13:23:42.000000000 -0800
++++ gnome-power-manager-ted/applets/inhibit/inhibit-applet.c	2008-03-12 10:01:47.000000000 -0700
+@@ -271,6 +271,9 @@
+ 		return FALSE;
+ 	}
+ 
++	/* Clear the window so we can draw on it later */
++	gdk_window_clear(GTK_WIDGET(applet)->window);
++
+ 	/* retrieve applet size */
+ 	gpm_applet_get_icon (applet);
+ 	gpm_applet_check_size (applet);
--- gnome-power-manager-2.22.1.orig/debian/patches/03-system-policy.patch
+++ gnome-power-manager-2.22.1/debian/patches/03-system-policy.patch
@@ -0,0 +1,49 @@
+--- src/gpm-main.c.orig	2007-11-02 18:31:05.000000000 +0100
++++ src/gpm-main.c	2008-01-29 09:44:53.000000000 +0100
+@@ -147,6 +147,7 @@
+  	GnomeProgram *program;
+ 	char **debugoptions = NULL;
+ 	int i;
++	gint ret;
+ 
+ 	const GOptionEntry options[] = {
+ 		{ "no-daemon", '\0', 0, G_OPTION_ARG_NONE, &no_daemon,
+@@ -217,7 +218,7 @@
+ 
+ 	gpm_debug ("GNOME %s %s", GPM_NAME, VERSION);
+ 
+-if (0) {
++/* if (0) { */
+ 	/* check dbus connections, exit if not valid */
+ 	system_connection = dbus_g_bus_get (DBUS_BUS_SYSTEM, &error);
+ 	if (error) {
+@@ -228,7 +229,7 @@
+ 			   "It is <b>strongly recommended</b> you reboot "
+ 			   "your computer after starting this service.");
+ 	}
+-}
++/* } */
+ 
+ 	session_connection = dbus_g_bus_get (DBUS_BUS_SESSION, &error);
+ 	if (error) {
+@@ -257,6 +258,20 @@
+ 
+ 	loop = g_main_loop_new (NULL, FALSE);
+ 
++	ret = dbus_bus_request_name(dbus_g_connection_get_connection(system_connection),
++				    "org.freedesktop.Policy.Power",
++				    DBUS_NAME_FLAG_REPLACE_EXISTING, NULL);
++	switch (ret) {
++	case DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER:
++		gpm_debug("Successfully acquired interface org.freedesktop.Policy.Power.");
++		break;
++	case DBUS_REQUEST_NAME_REPLY_IN_QUEUE:
++		printf("Queued for interface org.freedesktop.Policy.Power.");
++		break;
++	default:
++		break;
++	};
++
+ 	/* Only timeout and close the mainloop if we have specified it
+ 	 * on the command line */
+ 	if (timed_exit == TRUE) {
--- gnome-power-manager-2.22.1.orig/debian/patches/95-allow-inaccurate-policy.patch
+++ gnome-power-manager-2.22.1/debian/patches/95-allow-inaccurate-policy.patch
@@ -0,0 +1,18 @@
+Index: gnome-power-manager-2.22.1/src/gpm-cell-array.c
+===================================================================
+--- gnome-power-manager-2.22.1.orig/src/gpm-cell-array.c	2008-07-16 15:18:26.000000000 -0400
++++ gnome-power-manager-2.22.1/src/gpm-cell-array.c	2008-07-16 15:22:34.000000000 -0400
+@@ -487,9 +487,11 @@
+ 	if (unit->kind == GPM_CELL_UNIT_KIND_PRIMARY) {
+ 		accuracy = gpm_profile_get_accuracy_average (cell_array->priv->profile,
+ 							     unit->is_discharging);
++		/* For now, we allow policy action even if it's not accurate */
+ 		if (accuracy < GPM_PROFILE_GOOD_TRUST) {
+-			gpm_debug ("profile is not accurate. Not doing policy action");
+-			return FALSE;
++			//gpm_debug ("profile is not accurate. Not doing policy action");
++			gpm_debug ("profile is not accurate: %f", accuracy);
++			//return FALSE;
+ 		}
+ 	}
+ 
--- gnome-power-manager-2.22.1.orig/debian/patches/74-disable-quirks-reference.patch
+++ gnome-power-manager-2.22.1/debian/patches/74-disable-quirks-reference.patch
@@ -0,0 +1,28 @@
+diff -Nur gnome-power-manager-2.20.0/src/gpm-notify.c gnome-power-manager-2.20.0.new/src/gpm-notify.c
+--- gnome-power-manager-2.20.0/src/gpm-notify.c	2007-08-03 18:13:36.000000000 +0100
++++ gnome-power-manager-2.20.0.new/src/gpm-notify.c	2007-09-30 20:51:55.000000000 +0100
+@@ -581,7 +581,7 @@
+ 	                                 _("Do not show me this again"),
+ 	                                 (NotifyActionCallback) notify_general_clicked_cb,
+ 	                                 notify, NULL);
+-
++#if 0
+ 	notify->priv->internet_url = g_strdup (QUIRK_WEBSITE);
+ 	/* Translator: Quirks refer to strange/weird/undocumented behaviour of
+ 	 * hardware.  Because the manufacturers do not provide the necessary
+@@ -589,12 +589,14 @@
+ 	 * supply the info by following the procedures outlined in the "Quirks
+ 	 * website" at http://people.freedesktop.org/~hughsient/quirk/.
+ 	 */
++
+ 	notify_notification_add_action  (notify->priv->libnotify,
+ 	                                 "visit-website",
+ 	                                 _("Visit quirk website"),
+ 	                                 (NotifyActionCallback) notify_general_clicked_cb,
+ 	                                 notify, NULL);
+-#endif
++#endif /* #if 0 */
++#endif /* #ifdef HAVE_LIBNOTIFY */
+ 
+ 	gpm_notify_show (notify);
+ 	return TRUE;
--- gnome-power-manager-2.22.1.orig/debian/patches/09_lid_always_blanks.patch
+++ gnome-power-manager-2.22.1/debian/patches/09_lid_always_blanks.patch
@@ -0,0 +1,131 @@
+diff -ur gnome-power-manager-2.22.1/src/gpm-manager.c gnome-power-manager-ted/src/gpm-manager.c
+--- gnome-power-manager-2.22.1/src/gpm-manager.c	2008-03-12 13:43:14.000000000 -0700
++++ gnome-power-manager-ted/src/gpm-manager.c	2008-04-07 09:55:21.000000000 -0700
+@@ -428,6 +428,7 @@
+ 		   const gchar *reason)
+ {
+ 	gchar *action = NULL;
++	gboolean has_inhibit = FALSE;
+ 
+ 	/* error msg timeout not valid */
+ 	if (gpm_control_is_policy_timout_valid (manager->priv->control) == FALSE) {
+@@ -440,18 +441,59 @@
+ 		return FALSE;
+ 	}
+ 
+-	/* are we inhibited? */
+-	if (gpm_manager_is_inhibit_valid (manager, FALSE, "policy action") == FALSE) {
++	if (policy == NULL) {
++		gpm_debug ("No policy provided, aborting action.");
+ 		return FALSE;
+ 	}
+ 
+-	gpm_debug ("policy: %s", policy);
+ 	gpm_conf_get_string (manager->priv->conf, policy, &action);
+-
+ 	if (action == NULL) {
++		gpm_debug ("Policy %s returned NULL action, aborting policy action.", policy);
++		return FALSE;
++	}
++
++	/* If we're inhibited, figure out what we're being asked to do.  If
++	   it's blank on a lid close, that's cool.  If it's suspend or hibernate
++	   on a lid close we should blank instead. */
++	gpm_inhibit_has_inhibit (manager->priv->inhibit, &has_inhibit, NULL);
++	if (has_inhibit == TRUE) {
++		// Everything in here is checking to see if has_inhibit should be FALSE
++		if (strcmp(policy, GPM_CONF_BUTTON_LID_BATT) == 0 ||
++				strcmp(policy, GPM_CONF_BUTTON_LID_AC) == 0) {
++			if (strcmp (action, ACTION_BLANK) == 0) {
++				// Just blank it no matter what
++				has_inhibit = FALSE;
++				gpm_debug ("Inhibited ignored for screen blanking on lid event.");
++			} else if ((strcmp (action, ACTION_SUSPEND) == 0) ||
++					(strcmp (action, ACTION_HIBERNATE) == 0)) {
++				g_free (action);
++				action = g_strdup(ACTION_BLANK);
++				has_inhibit = FALSE;
++				gpm_debug ("Adjusting lid action to blank as we're inhibited.");
++			}
++		}
++		/* If we're on critical battery user apps can't stop us, sorry guys
++		   it's time to save possible data loss vs. playing music with the
++		   lid closed. */
++		if (strcmp(policy, GPM_CONF_ACTIONS_CRITICAL_BATT) == 0) {
++			has_inhibit = FALSE;
++		}
++		/* We really shouldn't inhibit nothing. (and if you send that sentence
++		   to my high school English teacher I'll hunt you down) */
++		if (strcmp (action, ACTION_NOTHING) == 0) {
++			has_inhibit = FALSE;
++		}
++	}
++
++	/* Okay, we're really going to inhibit this thing.  Pop a warning */
++	if (has_inhibit == TRUE) {
++		gpm_manager_is_inhibit_valid (manager, FALSE, "policy action");
++		g_free(action);
+ 		return FALSE;
+ 	}
+ 
++	gpm_debug ("policy: %s", policy);
++
+ 	if (strcmp (action, ACTION_NOTHING) == 0) {
+ 		gpm_info_explain_reason (manager->priv->info, GPM_EVENT_NOTIFICATION,
+ 					_("Doing nothing."), reason);
+@@ -918,48 +960,25 @@
+ 	gboolean do_policy;
+ 	gchar *action;
+ 
+-	on_ac = gpm_ac_adapter_is_present (manager->priv->ac_adapter);
+-
+ 	if (pressed == FALSE) {
+ 		/* we turn the lid dpms back on unconditionally */
+ 		gpm_manager_unblank_screen (manager, NULL);
+ 		return;
+ 	}
+ 
++	on_ac = gpm_ac_adapter_is_present (manager->priv->ac_adapter);
++
+ 	if (on_ac == TRUE) {
+ 		gpm_debug ("Performing AC policy");
+ 		manager_policy_do (manager, GPM_CONF_BUTTON_LID_AC,
+ 				   _("The lid has been closed on ac power."));
+-		return;
+-	}
+-
+-	/* default */
+-	do_policy = TRUE;
+-
+-	/* are we inhibited? */
+-	gpm_inhibit_has_inhibit (manager->priv->inhibit, &has_inhibit, NULL);
+-
+-	/* do not do lid close action if suspend (or hibernate) */
+-	if (has_inhibit == TRUE) {
+-		/* get the policy action for battery */
+-		gpm_conf_get_string (manager->priv->conf, GPM_CONF_BUTTON_LID_BATT, &action);
+-
+-		/* if we are trying to suspend or hibernate then don't do action */
+-		if ((strcmp (action, ACTION_SUSPEND) == 0) ||
+-		    (strcmp (action, ACTION_HIBERNATE) == 0)) {
+-			do_policy = FALSE;
+-		}
+-		g_free (action);
+-	}
+-
+-	if (do_policy == FALSE) {
+-		gpm_debug ("Not doing lid policy action as inhibited as set to sleep");
+-		return;
++	} else {
++		gpm_debug ("Performing battery policy");
++		manager_policy_do (manager, GPM_CONF_BUTTON_LID_BATT,
++				   _("The lid has been closed on battery power."));
+ 	}
+ 
+-	gpm_debug ("Performing battery policy");
+-	manager_policy_do (manager, GPM_CONF_BUTTON_LID_BATT,
+-			   _("The lid has been closed on battery power."));
++	return;
+ }
+ 
+ /**
--- gnome-power-manager-2.22.1.orig/debian/patches/10_keyboard_brightness_gconf.patch
+++ gnome-power-manager-2.22.1/debian/patches/10_keyboard_brightness_gconf.patch
@@ -0,0 +1,20 @@
+diff -ur gnome-power-manager-2.22.1/src/gpm-srv-brightness-kbd.c gnome-power-manager-ted/src/gpm-srv-brightness-kbd.c
+--- gnome-power-manager-2.22.1/src/gpm-srv-brightness-kbd.c	2008-03-10 14:49:46.000000000 -0700
++++ gnome-power-manager-ted/src/gpm-srv-brightness-kbd.c	2008-04-09 11:49:24.000000000 -0700
+@@ -85,14 +85,14 @@
+ 
+ 	if (strcmp (key, GPM_CONF_KEYBOARD_BRIGHTNESS_AC) == 0) {
+ 
+-		gpm_conf_get_int (srv_brightness->priv->conf, GPM_CONF_BACKLIGHT_BRIGHTNESS_AC, &value);
++		gpm_conf_get_int (srv_brightness->priv->conf, GPM_CONF_KEYBOARD_BRIGHTNESS_AC, &value);
+ 		if (on_ac == TRUE) {
+ 			gpm_brightness_kbd_set_std (srv_brightness->priv->brightness, value);
+ 		}
+ 
+ 	} else if (strcmp (key, GPM_CONF_KEYBOARD_BRIGHTNESS_BATT) == 0) {
+ 
+-		gpm_conf_get_int (srv_brightness->priv->conf, GPM_CONF_BACKLIGHT_BRIGHTNESS_AC, &value);
++		gpm_conf_get_int (srv_brightness->priv->conf, GPM_CONF_KEYBOARD_BRIGHTNESS_BATT, &value);
+ 		if (on_ac == FALSE) {
+ 			gpm_brightness_kbd_set_std (srv_brightness->priv->brightness, value);
+ 		}
