--- pm-utils-1.3.0~rc3.orig/debian/gbp.conf
+++ pm-utils-1.3.0~rc3/debian/gbp.conf
@@ -0,0 +1,2 @@
+[DEFAULT]
+pristine-tar = True
--- pm-utils-1.3.0~rc3.orig/debian/rules
+++ pm-utils-1.3.0~rc3/debian/rules
@@ -0,0 +1,43 @@
+#!/usr/bin/make -f
+  
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/autotools.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
+
+configure/pm-utils::
+	# Hack to not build some stuff
+	touch src/pm-pmu.o src/pm-reset-swap.o
+	touch src/pm-pmu src/pm-reset-swap
+
+pre-build::
+	# Enforce that man pages are regenerated
+	rm -f man/pm-powersave.8
+	rm -f man/pm-action.8
+	rm -f man/pm-is-supported.1
+
+binary-install/pm-utils::
+	# We depend on powermgmt-base to provide on_ac_power. 
+	# This way we don't have to conflict with this package.
+	rm -f debian/pm-utils/usr/bin/on_ac_power
+	rm -f debian/pm-utils/usr/bin/import-fdi-quirkdb
+	rm -f debian/pm-utils/usr/share/man/man1/on_ac_power.1
+	# Remove tools/hooks that are not suitable for Debian.
+	rm -f debian/pm-utils/usr/lib/pm-utils/sleep.d/01grub
+	rm -f debian/pm-utils/usr/lib/pm-utils/bin/pm-reset-swap
+	rm -f debian/pm-utils/usr/lib/pm-utils/bin/pm-pmu
+	rm -f debian/pm-utils/usr/share/man/man8/pm-pmu.8
+
+	chmod -x debian/pm-utils/usr/lib/pm-utils/defaults
+
+	install -D -m 755 debian/kernel-postinst-hibernate-stamp debian/pm-utils/etc/kernel/postinst.d/pm-utils
+	install -D -m 755 debian/no-hibernate-on-kernel-update debian/pm-utils/usr/lib/pm-utils/sleep.d/000kernel-change
+
+	# install quirks db
+	cp -r video-quirks debian/pm-utils/usr/lib/pm-utils/
+
+	# revert 10-debian-defaults.patch when building for Ubuntu; swsusp is
+	# not supported by Ubuntu
+	if [ "`lsb_release -is 2>/dev/null`" = "Ubuntu" ]; then \
+	    sed -i '/SLEEP_MODULE/ s/^.*$$/#SLEEP_MODULE="kernel"/' debian/pm-utils/usr/lib/pm-utils/defaults; \
+	fi
+
--- pm-utils-1.3.0~rc3.orig/debian/no-hibernate-on-kernel-update
+++ pm-utils-1.3.0~rc3/debian/no-hibernate-on-kernel-update
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+# Check for and abort a hibernate if the kernel indicates it has been
+# updated, as we will be completly unable to resume.
+if [ "$1" = "hibernate" ] && [ -f "/var/run/do-not-hibernate" ]; then
+	echo "kernel update inhibits hibernate (/var/run/do-not-hibernate present)"
+	exit 1
+fi
--- pm-utils-1.3.0~rc3.orig/debian/pm-utils.dirs
+++ pm-utils-1.3.0~rc3/debian/pm-utils.dirs
@@ -0,0 +1 @@
+var/cache/pm-utils/
--- pm-utils-1.3.0~rc3.orig/debian/README.source
+++ pm-utils-1.3.0~rc3/debian/README.source
@@ -0,0 +1,3 @@
+This package uses the quilt patch management system.
+
+Please refer to /usr/share/doc/quilt/README.source for further information.
--- pm-utils-1.3.0~rc3.orig/debian/pm-utils.logrotate
+++ pm-utils-1.3.0~rc3/debian/pm-utils.logrotate
@@ -0,0 +1,8 @@
+/var/log/pm-suspend.log /var/log/pm-powersave.log {
+       monthly
+       rotate 4
+       delaycompress
+       compress
+       notifempty
+       missingok
+}
--- pm-utils-1.3.0~rc3.orig/debian/copyright
+++ pm-utils-1.3.0~rc3/debian/copyright
@@ -0,0 +1,38 @@
+This package was debianized by Michael Biebl <biebl@debian.org> on
+Sat,  3 Mar 2007 04:12:26 +0100.
+
+It was downloaded from http://pm-utils.freedesktop.org/
+
+Upstream Author:
+   Bill Nottingham <notting@redhat.com>
+   Peter Jones <pjones@redhat.com>
+   David Zeuthen <davidz@redhat.com>
+   Richard Hughes <richard@hughsie.com>
+   Victor Lowther <victor.lowther@gmail.com>
+
+Copyright:
+   Copyright 2006 Red Hat, Inc.
+   Copyright 2007 Peter Jones <pjones@redhat.com>
+   Copyright 2006-2007 Richard Hughes <richard@hughsie.com>
+
+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.
+
+   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-2'.
+
+The Debian packaging is (C) 2007, Michael Biebl <biebl@debian.org> and
+is licensed under the GPL, see above.
+
--- pm-utils-1.3.0~rc3.orig/debian/pm-utils.preinst
+++ pm-utils-1.3.0~rc3/debian/pm-utils.preinst
@@ -0,0 +1,10 @@
+#!/bin/sh -e
+
+if [ "$1" = "install" -o "$1" = "upgrade" ] && \
+    dpkg --compare-versions "$2" lt-nl "1.3.0~rc3-2"; then
+	# 1.3~ versions prior to this had a broken quirks DB evaluation or
+	# stored the cache file at the wrong location, so force an update
+	rm -f /etc/pm/last_known_working.quirkdb
+fi
+
+#DEBHELPER#
--- pm-utils-1.3.0~rc3.orig/debian/changelog
+++ pm-utils-1.3.0~rc3/debian/changelog
@@ -0,0 +1,403 @@
+pm-utils (1.3.0~rc3-2) unstable; urgency=low
+
+  * Bump Standards-Version to 3.8.4. No further changes.
+  * debian/patches/06-quirk-lkw-cache.patch
+    - Store the last_known_working.quirkdb cache file in /var/cache/pm-utils.
+  * debian/pm-utils.dirs
+    - Add /var/cache/pm-utils/ directory.
+  * debian/pm-utils.preinst
+    - Remove last_known_working.quirkdb cache file from /etc/pm on upgrades.
+  * debian/control
+    - Add Recommends on procps. The sysctl binary is required for setting the
+      acpi flags in 99video.
+  * debian/patches/07-fix-typo-pm-action.patch
+    - Fix typo ('lits') in pm-action man page. (Closes: #567084)
+      Thanks to Filipus Klutiero for spotting this.
+  * debian/patches/08-fix-lock-file-handling.patch
+    - Use flock to make the lock file handling more robust. (Closes: #568565)
+  * debian/patches/09-document-add-drop-parameters.patch
+    - Document the {ADD,DROP}_PARAMETERS configuration variables in the
+      pm-action man page. (Closes: #485443)
+
+ -- Michael Biebl <biebl@debian.org>  Tue, 16 Feb 2010 15:22:15 +0100
+
+pm-utils (1.3.0~rc3-1) experimental; urgency=low
+
+  * New upstream release candidate:
+    - Add native suspend-hybrid method. It initially suspends the box, and
+      sets an alarm to wake up in 15 minutes.  If the system is not resumed
+      before the alarm goes off, it will wake up and hibernate.
+    - pm-utils can now optionally profile the hooks as they run to see which
+      ones are taking an unusual amount of time.  See README.debugging for
+      more information.
+    - pm-utils has its own quirk database that does not rely on HAL.
+    - Add --quirk-test parameter that bypasses the sanity checking imposed by
+      the quirk database handler for debugging: you can see what happens when
+      you post your video card in userspace while running a KMS driver.
+  * Drop 01-have-kms-nouveau.patch, applied upstream.
+  * debian/watch: Update to use /releases/ and catch release candidates, too.
+  * debian/rules: Do not install import-fdi-quirkdb, it's not a general user
+    tool but intended for packagers/distros.
+  * Add video-quirks/*: Current native video quirk database (from
+    pm-quirks-20091205.tar.gz). This might get merged into pm-utils proper,
+    and is easier to maintain here for now, in case the format changes again.
+  * debian/control: Drop hal recommends.
+  * Add 01-fix-DMI-attribute-matching.patch: canonicalize_dmivar() refused the
+    valid property "system.firmware.release_date" because of a missing '_' in
+    the character filter.
+  * Add 03-fix-usage-of-find_native.patch: 98-video-quirk-db-handler expects
+    find_native() to write the quirks to stdout, so actually do write them
+    there. This makes the native quirks work.
+  * Add 04-fix-alternatives-matching-in-native-quirks-DB.patch: The native
+    quirks DB separates alternatives with ';'. For regexp matching, turn
+    those into '|', so that they will actually match.
+  * Add 05-inspiron-8600-ati-quirk.patch: Fix suspend quirks for Dell Inspiron
+    8600 with an ATI card. Thanks Kees Cook!
+  * Add debian/pm-utils.preinst: Clean up last_known_working.quirkdb on
+    upgrades to this version, since previous 1.3 pre-releases did not
+    interpret the DB correctly.
+
+ -- Martin Pitt <mpitt@debian.org>  Wed, 03 Feb 2010 13:12:30 -0800
+
+pm-utils (1.2.6.1-3) unstable; urgency=low
+
+  [ Martin Pitt ]
+  * Drop 01-modprobe-blacklist.patch again, that was a misunderstanding.
+
+  [ Michael Biebl ]
+  * Drop 03-on_ac_power-devkit-power.patch, we are using on_ac_power from
+    powermgmt-base so this patch has no effect and only seems to cause
+    confusion.
+  * debian/patches/01-have-kms-nouveau.patch
+    - Fix a typo in have_kms(), the free nvidia driver is called "nouveau",
+      not "noveau". Thanks to Julien Cristau for spotting this.
+
+ -- Michael Biebl <biebl@debian.org>  Mon, 30 Nov 2009 09:49:30 +0100
+
+pm-utils (1.2.6.1-2) unstable; urgency=low
+
+  * Add 01-modprobe-blacklist.patch: Respect module blacklists when calling
+    modprobe on resume. (fd.o #25254)
+  * Add 02-logging-append.patch: Do not clear the log file on each operation,
+    but instead append to it. This makes debugging of several suspends much
+    easier. Thanks to James Westby for the patch! (fd.o #25255, LP #410352)
+  * Add debian/pm-utils.logrotate: Rotate above log file.
+  * Prevent hibernation after a kernel update:
+    - Add debian/kernel-postinst-hibernate-stamp: /etc/kernel/postinst.d/ hook
+      to create /var/run/do-not-hibernate stamp.
+    - Add debian/no-hibernate-on-kernel-update: sleep.d hook to make
+      hibernation fail early if above stamp exists.
+    - debian/rules: Install above scripts.
+    - Closes: #457515, LP: #350491
+  * debian/rules: When building on Ubuntu, revert the effect of
+    10-debian-defaults.patch; uswsusp is not supported in Ubuntu. Add
+    lsb-release build dependency for this.
+  * debian/control: Add myself to Uploaders: with Michael's consent.
+  * Add 03-on_ac_power-devkit-power.patch: Try to contact DeviceKit-Power in
+    on_ac_power, and if it succeeds, use that. Otherwise fall back to hal.
+
+ -- Martin Pitt <mpitt@debian.org>  Wed, 25 Nov 2009 15:36:42 +0100
+
+pm-utils (1.2.6.1-1) unstable; urgency=low
+
+  * New upstream release.
+    - Revert the removal of have_smart_intel in 1.2.6.
+
+ -- Michael Biebl <biebl@debian.org>  Fri, 13 Nov 2009 17:38:28 +0100
+
+pm-utils (1.2.6-1) unstable; urgency=low
+
+  * New upstream release.
+    - Improved KMS detection.
+    - Don't return an error in maybe_deallocvt if no state file is found.
+      (Closes: #554959)
+    - Fix typos in pm-action.8. (Closes: #540122)
+  * debian/control
+    - Demote uswsusp to Suggests. It's currently in a not good enough state to
+      be installed by default. (Closes: #548970)
+    - Bump Standards-Version to 3.8.3. No further changes.
+  * Drop patches that have been merged upstream
+    - debian/patches/30-kms-add-parameters.patch
+    - debian/patches/35-typo-fixes.patch
+    - debian/patches/40-pm-action-syntax-fix.patch
+
+ -- Michael Biebl <biebl@debian.org>  Thu, 12 Nov 2009 08:43:42 +0100
+
+pm-utils (1.2.5-4) unstable; urgency=low
+
+  * debian/patches/45-bashism-fixes.patch
+    - Drop this patch again as it was a false positive of checkbashims. '=='
+      was used inside an arithmetic expression, so the fix was bogus.
+      Thanks to Tormod Volden for spotting this. (Closes: #530164)
+
+ -- Michael Biebl <biebl@debian.org>  Mon, 06 Jul 2009 20:35:31 +0200
+
+pm-utils (1.2.5-3) unstable; urgency=low
+
+  * debian/patches/35-typo-fixes.patch
+    - Fix a few typos in the man pages and the HOWTO.hooks documentation.
+      (Closes: #525253)
+  * debian/patches/40-pm-action-syntax-fix.patch
+    - Fix wrong syntax for configuration variables in the pm-action man page.
+      (Closes: #528726)
+  * debian/patches/45-bashism-fixes.patch
+    - Fix bashism ('==') in pm/functions.in. (Closes: #530164)
+  * debian/patches/90-nm-proper-wakeup.patch
+    - Patch pulled from Ubuntu. Use --print-reply when calling dbus-send to
+      ensure NetworkManager gets signalled on wakeup
+  * Bump Standards-Version to 3.8.2. No further changes.
+
+ -- Michael Biebl <biebl@debian.org>  Wed, 01 Jul 2009 17:29:02 +0200
+
+pm-utils (1.2.5-2) unstable; urgency=low
+
+  * debian/patches/30-kms-add-parameters.patch
+    - Fix typo in have_kms(). (Closes: #524243)
+      Thanks to Yves-Alexis Perez for spotting that.
+
+ -- Michael Biebl <biebl@debian.org>  Fri, 17 Apr 2009 00:16:37 +0200
+
+pm-utils (1.2.5-1) unstable; urgency=low
+
+  * New upstream release.
+    - Fixes sched_smt_power_savings tunable in sched-powersave.
+      (Closes: #518680)
+  * debian/control
+    - Bump Standards-Version to 3.8.1. No further changes.
+
+ -- Michael Biebl <biebl@debian.org>  Sat, 11 Apr 2009 21:17:14 +0200
+
+pm-utils (1.2.4-2) unstable; urgency=low
+
+  * debian/compat
+    - Bump to debhelper v7 compat mode.
+  * debian/control
+    - Update debhelper Build-Depends accordingly.
+
+ -- Michael Biebl <biebl@debian.org>  Sun, 15 Feb 2009 19:37:14 +0100
+
+pm-utils (1.2.4-1) experimental; urgency=low
+
+  * New upstream release.
+    - Do not report an error on systems which have no system.chassis.type hal
+      property. (Closes: #511466)
+    - Do no longer run hwclock on suspend/resume unless NEED_CLOCK_SYNC is set
+      explicitly.(Closes: #501073)
+  * debian/patches/15-no-laptop-mode.patch
+    - Removed, merged upstream.
+  * debian/patches/80-service.patch
+    - Updated.
+  * debian/copyright
+    - Make it clear that pm-utils is released under GPL version 2 and refer to
+      the versioned GPL-2 document in /usr/share/common-licenses/.
+
+ -- Michael Biebl <biebl@debian.org>  Tue, 10 Feb 2009 01:08:40 +0100
+
+pm-utils (1.2.3-2) experimental; urgency=low
+
+  * debian/watch
+    - Only match stable releases.
+  * debian/patches/15-no-laptop-mode.patch
+    - As pm-powersave does not enable laptop-mode, remove this remark from the
+      pm-powersave(8) man page. (Closes: #504045)
+  * debian/rules
+    - Enforce regeneration of all man pages. Apparently lintian is not happy
+      with the ones shipped by upstream.
+
+ -- Michael Biebl <biebl@debian.org>  Wed, 28 Jan 2009 23:36:13 +0100
+
+pm-utils (1.2.3-1) experimental; urgency=low
+
+  * New upstream release.
+  * debian/patches/10-sleep-module-auto-detection.patch
+    - Removed, upstream now ships a more finegrained suspend method
+      autodetection.
+  * debian/patches/10-debian-defaults.patch
+    - Added, set SLEEP_MODULE="auto", as we want to use uswsusp if installed.
+  * debian/patches/25-pmu.patch
+    - Rewrite for new upstream code structure. Thanks to Martin Pitt.
+  * Refresh and document all patches.
+  * debian/control
+    - Update Vcs-* headers. Package is now managed with Git on git.debian.org.
+
+ -- Michael Biebl <biebl@debian.org>  Fri, 05 Dec 2008 17:44:22 +0100
+
+pm-utils (1.1.2.4-1) unstable; urgency=low
+
+  * New upstream release
+    - Fix suspend/resume on 2.6.26 and greater Linux kernels using kernel mode
+      setting for Intel video drivers. (Closes: #488144)
+  * debian/control
+    - Update Recommends on uswsusp and vbetool to only list them on
+      architectures where they are actually available. (Closes: #452368)
+
+ -- Michael Biebl <biebl@debian.org>  Sun, 03 Aug 2008 11:47:19 +0200
+
+pm-utils (1.1.2.3-1) unstable; urgency=low
+
+  * New upstream release.
+  * debian/patches/01-escape-comparison.patch
+    - Removed, merged upstream.
+
+ -- Michael Biebl <biebl@debian.org>  Mon, 23 Jun 2008 17:00:50 +0200
+
+pm-utils (1.1.2.2-3) unstable; urgency=low
+
+  * Brown paper bag release.
+  * debian/patches/series
+    - Actually apply 01-escape-comparison.patch. (Closes: #485125)
+  * Bump Standards-Version to 3.8.0.
+    - Add debian/README.source as recommended by the new policy.
+
+ -- Michael Biebl <biebl@debian.org>  Sat, 14 Jun 2008 16:01:50 +0200
+
+pm-utils (1.1.2.2-2) unstable; urgency=low
+
+  * debian/patches/01-escape-comparison.patch
+    - Escape comparison of the kernel version. (Closes: #485125)
+
+ -- Michael Biebl <biebl@debian.org>  Sun, 08 Jun 2008 14:40:15 +0200
+
+pm-utils (1.1.2.2-1) unstable; urgency=low
+
+  * New upstream release.
+  * debian/control
+    - Remove docbook-utils from Build-Depends. All man pages are now generated
+      from DocBook XML.
+  * debian/rules
+    - The man pages are now included upstream, so remove all man page related
+      build rules.
+  * debian/pm-utils.manpages
+    - Removed, no longer required.
+  * debian/pm-powersave.xml, debian/pm-action.xml, debian/pm-is-supported.xml
+    - Removed, all merged upstream.
+
+ -- Michael Biebl <biebl@debian.org>  Thu, 29 May 2008 15:42:54 +0200
+
+pm-utils (1.1.1-1) unstable; urgency=low
+
+  * New upstream release.
+  * Removed patches
+    - debian/patches/15-hibernate_mode_check.patch (merged upstream)
+    - debian/patches/20-uswsusp-fixes.patch (merged upstream)
+  * Refreshed patches
+    - debian/patches/10-sleep-module-auto-detection.patch
+    - debian/patches/25-pmu.patch
+    - debian/patches/80-service.patch
+  * debian/copyright
+    - Update download location.
+  * debian/control
+    - Add Suggests on cpufrequtils. cpufrequtils allows to automatically load
+      the correct kernel module to enable cpufreq scaling and set the default
+      cpufreq governor.
+
+ -- Michael Biebl <biebl@debian.org>  Tue, 20 May 2008 22:12:23 +0200
+
+pm-utils (1.1.0-1) unstable; urgency=low
+
+  * New upstream release.
+    - Fixes the uswsusp module to pass the correct parameters to s2ram when
+      using the --quirk-s3-* parameters. (Closes: #448137)
+    - Correctly includes multiple config files from /etc/pm/config.d.
+      (Closes: #451493, #475565)
+    - Correctly restores the cpufreq governors on multi-core machines.
+      (Closes: #452620)
+    - Fixes filename expansion in current directory. (Closes: #454092)
+    - Updated and improved README. (Closes: #425282, #453866)
+    - The uswsusp module uses s2ram --force in do_suspend. (Closes: #457019)
+      This also means, that the internal whitelist of s2ram is no longer used.
+      The preferred way is to get the quirks from hal.
+  * debian/control
+    - Update the upstream URL and use the new Homepage field. (Closes: #473799)
+    - The Vcs-* fields are now officially supported, so remove the XS- prefix.
+    - Bump Standards-Version to 3.7.3. No further changes required.
+    - Fix a small typo in the long package description. (Closes: #466631)
+    - Add Build-Depends on quilt.
+    - Add Depends on kbd | console-tools. The kernel and tuxonice module
+      require the chvt utility. (Closes: #474637)
+  * debian/watch
+    - Updated. Parse the homepage at http://pm-utils.freedesktop.org/wiki/ for
+      the latest release.
+  * Removed patches
+    - debian/patches/10-uswsusp-support.patch (obsolete)
+    - debian/patches/15-laptop-tools.patch (obsolete)
+    - debian/patches/20-do-not-unload-button.patch (merged upstream)
+    - debian/patches/30-comment-defaults-file.patch (obsolete)
+    - debian/patches/40-performance-gov-on-hibernate.patch (fixed upstream)
+    - debian/patches/50-no-usleep.patch (merged upstream)
+    - debian/patches/60-suspend-hybrid.patch (obsolete)
+    - debian/patches/70-remove-pm-pmu.patch (obsolete)
+    - debian/patches/75-suspend-support.patch (obsolete)
+    - debian/patches/85-remove-empty-NEW.patch (obsolete)
+    - debian/patches/90-support-modules-with-dash.patch (obsolete)
+    - debian/patches/95-fix-config-file-parsing.patch (merged upstream)
+  * Updated patches
+    - debian/patches/80-service.patch
+  * debian/patches/10-sleep-module-auto-detection.patch
+    - Try to autodetect which sleep module to use. Check tuxonice first, then
+      uswsusp and fall back to kernel.
+  * debian/patches/15-hibernate_mode_check.patch
+    - Add a safety check before writing the hibernate method to
+      /sys/power/disk. (Closes: #450515)
+  * debian/patches/20-uswsusp-fixes.patch
+    - Disable the 99video hook for the uswsusp module. s2ram has it's own vt
+      switching functionality.
+    - Check if s2ram is available.
+  * debian/patches/25-pmu.patch
+    - As we don't ship the pm-pmu binary, implement the pmu suspend
+      functionality with a bit of perl magic. Thanks to Martin Pitt for the
+      idea and the code. (Closes: #450601, #452367, #452909)
+    - Prefer the /sys/power/state interface over poking /dev/pmu. This
+      requires a Linux kernel >= 2.6.25.
+  * debian/pm-action.xml
+    - Fix some typos in the pm-action manpage. (Closes: #450414)
+    - Document new configuration variables.
+    - Improve explanation of the quirk options. (Closes: #475755)
+  * debian/copyright
+    - Update list of authors.
+  * debian/rules
+    - The 60sysfont hook is no longer shipped upstream, so we don't have to
+      remove it anymore.
+    - Switch patch system to quilt.
+
+ -- Michael Biebl <biebl@debian.org>  Thu, 24 Apr 2008 06:31:51 +0200
+
+pm-utils (0.99.2-3) unstable; urgency=low
+
+  * Support modules/services with dashes (closes: #433179)
+  * Fix config file parser (closes: #427254) 
+
+ -- Tim Dijkstra <tim@famdijkstra.org>  Mon, 16 Jul 2007 22:31:53 +0200
+
+pm-utils (0.99.2-2) unstable; urgency=low
+
+  * Make --hibernate test in pm-is-supported less strict so we
+    can support suspend2 too (closes: #422745)
+  * pm-action: Fix pm-suspend-hybrid support (closes: 427253)
+  * Add some more words to the pm-action manpage (closes: #425282)
+  * Don't install useless NEWS file (closes: #431551)
+  * Add support for NO_QUIRKS from HAL. Now we can distinguish
+    between `no quirks' and 'unknown' (closes: #427052)
+
+ -- Tim Dijkstra <tim@famdijkstra.org>  Sat, 14 Jul 2007 22:41:06 +0200
+
+pm-utils (0.99.2-1) unstable; urgency=low
+
+  [ Michael Biebl ]
+  * Initial release (Closes: #389817).
+  * Do not install on_ac_power binary. Instead depend on powermgmt-base
+    package.
+
+  [ Tim Dijkstra ]
+  * Support for `s2ram' for hal >= 0.5.9
+  * First stab at suspend-hybrid support
+  * Do not install pm-pmu, it is hack for old kernels (older than the one
+    in etch) which is also present in the s2ram binary if needed.
+  * Do not install pm-reset-swap, it has bugs and is superflous since
+    swapon in debian has similar functionality.
+  * Recommend vbetool and radeontool (not depend on it) else pm-utils
+    won't be installable on anything but x86_*
+  * Add manpages.
+
+ -- Tim Dijkstra <tim@famdijkstra.org>  Wed, 25 Apr 2007 22:48:19 +0200
+
--- pm-utils-1.3.0~rc3.orig/debian/kernel-postinst-hibernate-stamp
+++ pm-utils-1.3.0~rc3/debian/kernel-postinst-hibernate-stamp
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+# Let programs know not to hibernate if the kernel that would be used for
+# resume-from-hibernate is likely to differ from the currently running kernel.
+touch /var/run/do-not-hibernate
--- pm-utils-1.3.0~rc3.orig/debian/TODO
+++ pm-utils-1.3.0~rc3/debian/TODO
@@ -0,0 +1,3 @@
+- Move video-quirks to /usr/share/pm-utils
+- Update video-quirks, sync with current hal-info git master
+- Cleanup /var/{cache,run}/pm-utils on purge
--- pm-utils-1.3.0~rc3.orig/debian/compat
+++ pm-utils-1.3.0~rc3/debian/compat
@@ -0,0 +1 @@
+7
--- pm-utils-1.3.0~rc3.orig/debian/watch
+++ pm-utils-1.3.0~rc3/debian/watch
@@ -0,0 +1,2 @@
+version=3
+http://pm-utils.freedesktop.org/releases/pm-utils-([\d\.a-z-]+)\.tar\.gz
--- pm-utils-1.3.0~rc3.orig/debian/control
+++ pm-utils-1.3.0~rc3/debian/control
@@ -0,0 +1,19 @@
+Source: pm-utils
+Section: admin
+Priority: optional
+Maintainer: Tim Dijkstra <tim@famdijkstra.org>
+Uploaders: Michael Biebl <biebl@debian.org>, Martin Pitt <mpitt@debian.org>
+Build-Depends: cdbs, debhelper (>= 7), xmlto, quilt, lsb-release
+Standards-Version: 3.8.4
+Vcs-Git: git://git.debian.org/git/collab-maint/pm-utils.git
+Vcs-Browser: http://git.debian.org/?p=collab-maint/pm-utils.git;a=summary
+Homepage: http://pm-utils.freedesktop.org/
+
+Package: pm-utils
+Architecture: all
+Depends: ${misc:Depends}, powermgmt-base, kbd | console-tools
+Recommends: vbetool [amd64 i386], radeontool, procps
+Suggests: cpufrequtils, uswsusp [amd64 i386 powerpc]
+Description: utilities and scripts for power management
+ This package provides simple shell command line tools to suspend and 
+ hibernate your computer.
--- pm-utils-1.3.0~rc3.orig/debian/patches/90-nm-proper-wakeup.patch
+++ pm-utils-1.3.0~rc3/debian/patches/90-nm-proper-wakeup.patch
@@ -0,0 +1,42 @@
+---
+ pm/sleep.d/55NetworkManager |    8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+Index: pm-utils-1.2.2.4/pm/sleep.d/55NetworkManager
+===================================================================
+--- pm-utils-1.2.2.4.orig/pm/sleep.d/55NetworkManager
++++ pm-utils-1.2.2.4/pm/sleep.d/55NetworkManager
+@@ -6,29 +6,29 @@
+ #       not break established connections.  Apple can do this, and it is
+ #       rather nifty.
+ 
+ . "${PM_FUNCTIONS}"
+ 
+ suspend_nm()
+ {
+ 	# Tell NetworkManager to shut down networking
+-	dbus_send --system                         \
++	dbus_send --print-reply --system                         \
+ 		--dest=org.freedesktop.NetworkManager  \
+ 		/org/freedesktop/NetworkManager        \
+-		org.freedesktop.NetworkManager.sleep
++		org.freedesktop.NetworkManager.sleep 2>&1 > /dev/null
+ }
+ 
+ resume_nm()
+ {
+ 	# Wake up NetworkManager and make it do a new connection
+-	dbus_send --system                        \
++	dbus_send --print-reply --system                        \
+ 		--dest=org.freedesktop.NetworkManager \
+ 		/org/freedesktop/NetworkManager       \
+-		org.freedesktop.NetworkManager.wake
++		org.freedesktop.NetworkManager.wake 2>&1 > /dev/null
+ }
+ 
+ case "$1" in
+ 	hibernate|suspend)
+ 		suspend_nm
+ 		;;
+ 	thaw|resume)
+ 		resume_nm
--- pm-utils-1.3.0~rc3.orig/debian/patches/07-fix-typo-pm-action.patch
+++ pm-utils-1.3.0~rc3/debian/patches/07-fix-typo-pm-action.patch
@@ -0,0 +1,16 @@
+Description: Typo fix ('lits')
+Debian-Bug: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=567084
+Author: Michael Biebl <biebl@debian.org>
+Index: pm-utils/man/pm-action.xml
+===================================================================
+--- pm-utils.orig/man/pm-action.xml	2010-02-15 16:52:21.401990838 +0100
++++ pm-utils/man/pm-action.xml	2010-02-15 16:52:54.277995428 +0100
+@@ -191,7 +191,7 @@
+           <para>
+             This option forces the video hardware to turn off the screen when suspending. 
+ 	    Most video adapters seem to do this correctly, but some do not, which
+-            wastes lits of power. If your screen is still on after successfully suspending
++            wastes lots of power. If your screen is still on after successfully suspending
+ 	    you may need to use this option.
+           </para>
+         </listitem>
--- pm-utils-1.3.0~rc3.orig/debian/patches/09-document-add-drop-parameters.patch
+++ pm-utils-1.3.0~rc3/debian/patches/09-document-add-drop-parameters.patch
@@ -0,0 +1,33 @@
+Description: Document {ADD,DROP}_PARAMETERS config variables
+Debian-Bug: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=485443
+Author: Michael Biebl <biebl@debian.org>
+diff --git a/man/pm-action.xml b/man/pm-action.xml
+index 405cb5f..2bfabd7 100644
+--- a/man/pm-action.xml
++++ b/man/pm-action.xml
+@@ -461,6 +461,25 @@
+         </listitem>
+       </varlistentry>
+       <varlistentry>
++        <term><envar>ADD_PARAMETERS</envar></term>
++        <listitem>
++          <para>
++            Space separated list of command line parameters that should be added.
++            If special quirks are needed for your system, add them here.
++          </para>
++        </listitem>
++      </varlistentry>
++      <varlistentry>
++        <term><envar>DROP_PARAMETERS</envar></term>
++        <listitem>
++          <para>
++            Space separated list of command line parameters that should be ignored.
++            If particular quirks are causing problems for you system, add them
++            here. If you want to remove all parameters use <parameter>all</parameter>.
++          </para>
++        </listitem>
++      </varlistentry>
++      <varlistentry>
+         <term><envar>HIBERNATE_MODE</envar></term>
+         <listitem>
+           <para>
--- pm-utils-1.3.0~rc3.orig/debian/patches/80-service.patch
+++ pm-utils-1.3.0~rc3/debian/patches/80-service.patch
@@ -0,0 +1,28 @@
+# Debian does not support the "status" action for all init scripts (yet),
+# so we simply assume that the service is running.
+# Make use of invoke-rc.d.
+
+Index: pm-utils/pm/functions.in
+===================================================================
+--- pm-utils.orig/pm/functions.in	2010-02-16 14:55:29.776883961 +0100
++++ pm-utils/pm/functions.in	2010-02-16 14:55:33.704885917 +0100
+@@ -155,16 +155,16 @@
+ 
+ stopservice()
+ {
+-	if service "$1" status 2>/dev/null | grep -q -e running -e started
++	if [ -x "/etc/init.d/$1" ]
+ 	then
+ 		touch "${STORAGEDIR}/service:$1"
+-		service "$1" stop
++		invoke-rc.d "$1" stop
+ 	fi
+ }
+ 
+ restartservice()
+ {
+-	[ -O "${STORAGEDIR}/service:$1" ] && service "$1" start
++	[ -O "${STORAGEDIR}/service:$1" ] && invoke-rc.d "$1" start
+ }
+ 
+ # Disable a hook.
--- pm-utils-1.3.0~rc3.orig/debian/patches/01-fix-DMI-attribute-matching.patch
+++ pm-utils-1.3.0~rc3/debian/patches/01-fix-DMI-attribute-matching.patch
@@ -0,0 +1,27 @@
+From 64008cccec281a654b3c104ab8041b4085f5c8a3 Mon Sep 17 00:00:00 2001
+From: Martin Pitt <martin.pitt@ubuntu.com>
+Date: Tue, 2 Feb 2010 17:40:14 -0800
+Subject: [PATCH 2/2] fix DMI attribute matching
+
+canonicalize_dmivar() refused the valid property "system.firmware.release_date"
+because of a missing '_' in the character filter.
+---
+ pm/sleep.d/98-video-quirk-db-handler |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/pm/sleep.d/98-video-quirk-db-handler b/pm/sleep.d/98-video-quirk-db-handler
+index ec8c892..17a1cbc 100755
+--- a/pm/sleep.d/98-video-quirk-db-handler
++++ b/pm/sleep.d/98-video-quirk-db-handler
+@@ -160,7 +160,7 @@ halget() {
+ }
+ 
+ canonicalize_dmivar() {
+-    [[ $1 =~ ^[a-z.-]+$ && $possible_system_properties = *$1* ]] || return 1
++    [[ $1 =~ ^[a-z._-]+$ && $possible_system_properties = *$1* ]] || return 1
+     echo "${1//[-.]/_}"
+ }
+ 
+-- 
+1.6.5
+
--- pm-utils-1.3.0~rc3.orig/debian/patches/series
+++ pm-utils-1.3.0~rc3/debian/patches/series
@@ -0,0 +1,13 @@
+01-fix-DMI-attribute-matching.patch
+02-logging-append.patch
+03-fix-usage-of-find_native.patch
+04-fix-alternatives-matching-in-native-quirks-DB.patch
+05-inspiron-8600-ati-quirk.patch
+06-quirk-lkw-cache.patch
+07-fix-typo-pm-action.patch
+08-fix-lock-file-handling.patch
+09-document-add-drop-parameters.patch
+10-debian-defaults.patch
+25-pmu.patch
+80-service.patch
+90-nm-proper-wakeup.patch
--- pm-utils-1.3.0~rc3.orig/debian/patches/08-fix-lock-file-handling.patch
+++ pm-utils-1.3.0~rc3/debian/patches/08-fix-lock-file-handling.patch
@@ -0,0 +1,62 @@
+Description: Use flock for a more robust lock file handling
+Debian-Bug: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=568565
+Author: Michael Biebl <biebl@debian.org>
+diff --git a/pm/HOWTO.hooks b/pm/HOWTO.hooks
+index ad7d4a7..ce9e8c4 100644
+--- a/pm/HOWTO.hooks
++++ b/pm/HOWTO.hooks
+@@ -99,7 +99,7 @@ the hook. This will make the following convenience functions available:
+ 2:  spin_lock
+ 	Wrapper around try_lock.  Second parameter is the number of seconds 
+ 	to wait for the lock before giving up.  If no second parameter
+-	is passed, this function will wait forever.
++	is passed, this function will wait for 60 seconds.
+ 3:  release_lock
+ 	Release a previously acquired lock.  First parameter is the name of the
+ 	lock.
+diff --git a/pm/functions.in b/pm/functions.in
+index 8388c65..b07bf44 100644
+--- a/pm/functions.in
++++ b/pm/functions.in
+@@ -22,13 +22,13 @@ is_set "${PM_DEBUG}" && set -x
+ try_lock()
+ {
+ 	# $1 = file to use as lockfile
+-	# $2 (optional) content to write to the lockfile,
+-	# extra newline will be appended
++	local lock="${LOCKDIR}/${1##*/}"
++
+ 	# make sure the directory where the lockfile should be exists
+ 	mkdir -p "${LOCKDIR}"
+-	local lock="${LOCKDIR}/${1##*/}"
+-	# we use noclobber to make sure there are no race conditions
+-	(set -o noclobber; echo "${2}" > "${lock}") 2> /dev/null || return 1
++	touch "${lock}"
++	exec 3<"${lock}"
++	flock -x -n 3 || return 1
+ 	return 0
+ }
+ 
+@@ -37,13 +37,15 @@ try_lock()
+ spin_lock()
+ {
+ 	# $1 = lockfile
+-	# $2 = optional timeout
+-	local elapsed=0
+-	while ! try_lock $1; do
+-		[ "x$2" != "x" ] && [ $(( $elapsed == $2 )) -ne 0 ] && return 1
+-		elapsed=$(($elapsed + 1))
+-		sleep 1;
+-	done
++	# $2 = optional timeout (default is 60 secs)
++	local lock="${LOCKDIR}/${1##*/}"
++	local timeout="${2:-60}"
++
++	mkdir -p "${LOCKDIR}"
++	touch "${lock}"
++	exec 3<"${lock}"
++	flock -x -w "${timeout}" 3 || return 1
++	return 0
+ }
+ 
+ # release the lock
--- pm-utils-1.3.0~rc3.orig/debian/patches/10-debian-defaults.patch
+++ pm-utils-1.3.0~rc3/debian/patches/10-debian-defaults.patch
@@ -0,0 +1,15 @@
+# Set Debian specific system defaults
+
+Index: pm-utils-1.2.1/pm/defaults
+===================================================================
+--- pm-utils-1.2.1.orig/pm/defaults	2008-10-06 02:16:40.000000000 +0200
++++ pm-utils-1.2.1/pm/defaults	2008-10-06 02:17:53.000000000 +0200
+@@ -27,7 +27,7 @@
+ #   tuxonice  If your system has support for tuxonice, use this.
+ #
+ # The system defaults to "kernel" if this is commented out.
+-# SLEEP_MODULE="kernel"
++SLEEP_MODULE="auto"
+ 
+ # These variables will be handled specially when we load files in 
+ # /etc/pm/config.d.
--- pm-utils-1.3.0~rc3.orig/debian/patches/03-fix-usage-of-find_native.patch
+++ pm-utils-1.3.0~rc3/debian/patches/03-fix-usage-of-find_native.patch
@@ -0,0 +1,28 @@
+From 60857b3f64887c0ddeac0c401f3f129b769bc49d Mon Sep 17 00:00:00 2001
+From: Martin Pitt <martin.pitt@ubuntu.com>
+Date: Wed, 3 Feb 2010 11:06:17 -0800
+Subject: [PATCH 2/2] fix usage of find_native()
+
+98-video-quirk-db-handler expects find_native() to write the quirks to stdout,
+so actually do write them there. This makes the native quirks work.
+---
+ pm/sleep.d/98-video-quirk-db-handler |    3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+diff --git a/pm/sleep.d/98-video-quirk-db-handler b/pm/sleep.d/98-video-quirk-db-handler
+index 17a1cbc..337ae8c 100755
+--- a/pm/sleep.d/98-video-quirk-db-handler
++++ b/pm/sleep.d/98-video-quirk-db-handler
+@@ -300,6 +300,9 @@ find_native() (
+     [[ -f $1 ]] || return 1
+     exec <"$1"
+     _find_native work
++     res=$?
++     get_parameters
++     return $res
+ )
+ 
+ # If we resumed, write out the quirks we used as our last known
+-- 
+1.6.5
+
--- pm-utils-1.3.0~rc3.orig/debian/patches/05-inspiron-8600-ati-quirk.patch
+++ pm-utils-1.3.0~rc3/debian/patches/05-inspiron-8600-ati-quirk.patch
@@ -0,0 +1,16 @@
+Description: Fix suspend quirks for Dell Inspiron 8600 with an ATI card
+Author: Kees Cook <kees@ubuntu.com>
+Index: pm-utils/video-quirks/20-video-quirk-pm-dell.quirkdb
+===================================================================
+--- pm-utils.orig/video-quirks/20-video-quirk-pm-dell.quirkdb	2010-02-03 11:48:36.000000000 -0800
++++ pm-utils/video-quirks/20-video-quirk-pm-dell.quirkdb	2010-02-03 11:48:43.000000000 -0800
+@@ -53,6 +53,9 @@
+    match system.hardware.product regex 1501;8600
+     addquirk --quirk-s3-bios
+     addquirk --quirk-s3-mode
++    match system.hardware.primary_video.vendor numeric_compare_eq 0x1002
++     addquirk --quirk-radeon-off
++    endmatch
+    endmatch
+    match system.hardware.product regex  510m 
+     addquirk --quirk-vbe-post
--- pm-utils-1.3.0~rc3.orig/debian/patches/02-logging-append.patch
+++ pm-utils-1.3.0~rc3/debian/patches/02-logging-append.patch
@@ -0,0 +1,19 @@
+Author: James Westby <james.westby@ubuntu.com>
+Description: Do not clear the log file on each operation, but instead append to it.
+ This makes debugging of several suspends much easier.
+Bug: https://bugs.freedesktop.org/show_bug.cgi?id=25255
+Bug-Ubuntu: https://launchpad.net/bugs/410352
+
+Index: pm-utils/pm/pm-functions.in
+===================================================================
+--- pm-utils.orig/pm/pm-functions.in	2010-02-03 00:34:30.340474179 +0100
++++ pm-utils/pm/pm-functions.in	2010-02-03 17:14:54.032006940 +0100
+@@ -269,7 +269,7 @@
+ 		return 1
+ 	fi
+ 	export LOGGING=true
+-	exec > "$1" 2>&1
++	exec >> "$1" 2>&1
+ }
+ 
+ check_suspend() { [ -n "$SUSPEND_MODULE" ]; }
--- pm-utils-1.3.0~rc3.orig/debian/patches/06-quirk-lkw-cache.patch
+++ pm-utils-1.3.0~rc3/debian/patches/06-quirk-lkw-cache.patch
@@ -0,0 +1,18 @@
+Description: Store last_known_working.quirkdb in /var/cache
+ last_known_working.quirkdb is more of a cache file then a configuration file
+ and e.g. changes on kernel upgrades, so we don't want it in /etc/pm.
+ Move it to /var/cache/pm-utils instead
+Author: Michael Biebl <biebl@debian.org>
+Index: pm-utils/pm/pm-functions.in
+===================================================================
+--- pm-utils.orig/pm/pm-functions.in	2010-02-11 00:28:32.544007933 +0100
++++ pm-utils/pm/pm-functions.in	2010-02-11 00:29:02.160014007 +0100
+@@ -28,7 +28,7 @@
+ DX=252
+ PM_FUNCTIONS="$PM_UTILS_LIBDIR/functions"
+ PM_QUIRKDB="$PM_UTILS_LIBDIR/video-quirks"
+-PM_LKW_QUIRKS="$PM_UTILS_ETCDIR/last_known_working.quirkdb"
++PM_LKW_QUIRKS="/var/cache/pm-utils/last_known_working.quirkdb"
+ # Use c sort order
+ LC_COLLATE=C
+ 
--- pm-utils-1.3.0~rc3.orig/debian/patches/04-fix-alternatives-matching-in-native-quirks-DB.patch
+++ pm-utils-1.3.0~rc3/debian/patches/04-fix-alternatives-matching-in-native-quirks-DB.patch
@@ -0,0 +1,27 @@
+From f7aea1c20e61529af13191d438c53ffdaa025b1f Mon Sep 17 00:00:00 2001
+From: Martin Pitt <martin.pitt@ubuntu.com>
+Date: Wed, 3 Feb 2010 11:34:58 -0800
+Subject: [PATCH 2/2] fix alternatives matching in native quirks DB
+
+The native quirks DB separates alternatives with ';'. For regexp matching, turn
+those into '|', so that they will actually match.
+---
+ pm/sleep.d/98-video-quirk-db-handler |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/pm/sleep.d/98-video-quirk-db-handler b/pm/sleep.d/98-video-quirk-db-handler
+index 337ae8c..71ba480 100755
+--- a/pm/sleep.d/98-video-quirk-db-handler
++++ b/pm/sleep.d/98-video-quirk-db-handler
+@@ -204,7 +204,7 @@ isnum() {
+ # $2 = the given constant (or regular expression),
+ # $1 = the raw data grabbed from HAL or dmidecode or wherever
+ 
+-regex() { [[ $1 =~ $2 ]]; }
++regex() { [[ $1 =~ ${2//;/|} ]]; }
+ 
+ regex_ncase() {
+     local r
+-- 
+1.6.5
+
--- pm-utils-1.3.0~rc3.orig/debian/patches/25-pmu.patch
+++ pm-utils-1.3.0~rc3/debian/patches/25-pmu.patch
@@ -0,0 +1,61 @@
+# Description: Replace the usage of the compiled pm-pmu program with a call
+# to perl, so that pm-utils can stay Architecture: all
+
+Index: pm-utils/pm/pm-functions.in
+===================================================================
+--- pm-utils.orig/pm/pm-functions.in	2010-02-03 17:14:54.032006940 +0100
++++ pm-utils/pm/pm-functions.in	2010-02-03 17:15:27.532013645 +0100
+@@ -276,6 +276,28 @@
+ check_hibernate() { [ -n "$HIBERNATE_MODULE" ]; }
+ check_suspend_hybrid() { [ -n "$SUSPEND_HYBRID_MODULE" ]; }
+ 
++
++check_suspend_pmu()
++{
++	perl << EOF
++sub PMU_IOC_CAN_SLEEP { 0x40044205; }
++open PMU, '/dev/pmu' or die "open /dev/pmu: \$!";
++\$p = pack 'l', 0;
++ioctl PMU, &PMU_IOC_CAN_SLEEP, \$p or die "ioctl: \$!";
++(\$v) = unpack 'l', \$p;
++exit (\$v ? 0 : 1);
++EOF
++}
++
++do_suspend_pmu()
++{
++	perl << EOF
++sub PMU_IOC_SLEEP { 0x20004200; }
++open PMU, "/dev/pmu" or die "open /dev/pmu: \$!";
++ioctl PMU, &PMU_IOC_SLEEP, 0;
++EOF
++}
++
+ # allow autodetection of sleep methods
+ if [ "$SLEEP_MODULE" = "auto" ]; then
+     SLEEP_MODULE="tuxonice uswsusp"
+@@ -293,9 +315,9 @@
+ 	if grep -q mem /sys/power/state; then
+ 		SUSPEND_MODULE="kernel"
+ 		do_suspend() { echo -n "mem" >/sys/power/state; }
+-	elif [ -c /dev/pmu ] && pm-pmu --check; then
++	elif [ -c /dev/pmu ] && check_suspend_pmu; then
+ 		SUSPEND_MODULE="kernel"
+-		do_suspend() { pm-pmu --suspend; }
++		do_suspend() { do_suspend_pmu; }
+ 	fi
+ fi
+ 
+Index: pm-utils/pm/module.d/uswsusp
+===================================================================
+--- pm-utils.orig/pm/module.d/uswsusp	2010-02-03 00:34:30.340474179 +0100
++++ pm-utils/pm/module.d/uswsusp	2010-02-03 17:15:27.544008896 +0100
+@@ -66,7 +66,7 @@
+ # ended up claiming ownership of a given sleep method.
+ if [ -z "$SUSPEND_MODULE" ] && command_exists s2ram && \
+ 	( grep -q mem /sys/power/state || \
+-		( [ -c /dev/pmu ] && pm-pmu --check; ); ); then
++		( [ -c /dev/pmu ] && check_suspend_pmu; ); ); then
+ 	SUSPEND_MODULE="uswsusp"
+ 	do_suspend()
+ 	{
--- pm-utils-1.3.0~rc3.orig/video-quirks/20-video-quirk-pm-samsung.quirkdb
+++ pm-utils-1.3.0~rc3/video-quirks/20-video-quirk-pm-samsung.quirkdb
@@ -0,0 +1,26 @@
+# <?xml version="1.0" encoding="ISO-8859-1"?> <!-- -*- SGML -*- -->
+ match system.hardware.vendor regex_ncase ^Samsung
+  match system.hardware.product regex ^(Q35/Q36;SM40S;SQ45S70S)$
+   addquirk --quirk-s3-bios
+   addquirk --quirk-s3-mode
+  endmatch
+  match system.hardware.product regex ^(SQ30;SQ35S;SX50S)$
+   addquirk --quirk-vbe-post
+  endmatch
+ # <!-- Samsung UMPC, P35 (NOTE: there is a s2ram report for CoronaR to need no quirks)-->
+  match system.hardware.product regex ^(R40/R41;CoronaR;SX22S)$
+   addquirk --quirk-vbestate-restore
+  endmatch
+  match system.hardware.product regex ^(SX20S;SENS V25;NX05S)$
+   addquirk --quirk-vbe-post
+   addquirk --quirk-vbemode-restore
+  endmatch
+  match system.hardware.product regex ^SQ10$
+   addquirk --quirk-vbe-post
+   addquirk --quirk-vbestate-restore
+  endmatch
+ # <!-- these need no quirks to suspend/resume -->
+  match system.hardware.product regex R50/R51;R55S;SR700
+   addquirk --quirk-none
+  endmatch
+ endmatch
--- pm-utils-1.3.0~rc3.orig/video-quirks/20-video-quirk-pm-misc.quirkdb
+++ pm-utils-1.3.0~rc3/video-quirks/20-video-quirk-pm-misc.quirkdb
@@ -0,0 +1,375 @@
+# <?xml version="1.0" encoding="ISO-8859-1"?> <!-- -*- SGML -*- -->
+ match system.hardware.vendor regex ^AIRIS$
+  match system.hardware.version regex ^VT6413A$
+   addquirk --quirk-s3-bios
+  endmatch
+ endmatch
+ match system.hardware.vendor regex ^AnabelleB$
+ # <!-- ASI Claro TW7M Notebook -->
+  match system.hardware.version regex ^Claro TW7M$
+   addquirk --quirk-s3-bios
+   addquirk --quirk-s3-mode
+  endmatch
+ endmatch
+ match system.hardware.vendor regex ^COMPAL
+  match system.hardware.product regex HEL80C;HEL80I;HEL81I
+   addquirk --quirk-none
+  endmatch
+ endmatch
+ match system.hardware.vendor regex DIXONSXP
+  match system.hardware.product regex To be filled by O\.E\.M\.
+   match system.firmware.version regex ^Ver\.001$
+    addquirk --quirk-none
+   endmatch
+  endmatch
+ endmatch
+ match system.hardware.vendor regex ERGOUK
+  match system.hardware.product regex M2N
+   addquirk --quirk-s3-bios
+   addquirk --quirk-s3-mode
+  endmatch
+ endmatch
+ match system.hardware.vendor regex ^JVC$
+  match system.hardware.product regex ^J2N       $
+   addquirk --quirk-vbestate-restore
+  endmatch
+ endmatch
+ match system.hardware.vendor regex ^LG
+  match system.hardware.product regex ^(M1-3DGBG;W1-JDGBG;LM50-DGHE;LW75-SGGV1)$
+   addquirk --quirk-s3-bios
+   addquirk --quirk-s3-mode
+  endmatch
+  match system.hardware.product regex ^R500-U\.CPCBG$
+   addquirk --quirk-none
+  endmatch
+ endmatch
+ match system.hardware.vendor regex MAXDATA
+  match system.hardware.product regex ^PRO600IW$
+   addquirk --quirk-s3-bios
+   addquirk --quirk-s3-mode
+  endmatch
+  match system.hardware.product regex Pro 6100X
+   addquirk --quirk-vbe-post
+  endmatch
+  match system.hardware.product regex IMPERIO4045A
+   addquirk --quirk-none
+  endmatch
+ endmatch
+ match system.hardware.vendor regex ^Matsushita
+  match system.hardware.product regex ^CF-Y
+   addquirk --quirk-vbe-post
+  endmatch
+  match system.hardware.product regex CF-51E;CF-R3E;CF-R2C;CF-R6A;CF-R6M
+   addquirk --quirk-vbe-post
+   addquirk --quirk-vbemode-restore
+  endmatch
+  match system.hardware.product regex ^CF-W4G
+   addquirk --quirk-none
+  endmatch
+ endmatch
+# <!-- VIA EPIA M Mini-ITX Motherboard with onboard gfx -->
+ match system.hardware.vendor regex ^VIA
+  match system.hardware.product regex ^VT8623-8235$
+   addquirk --quirk-s3-mode
+  endmatch
+  match system.hardware.product regex ^K8N800$
+   match system.firmware.version regex ^VT8204B $
+    addquirk --quirk-vbe-post
+    addquirk --quirk-vbestate-restore
+   endmatch
+  endmatch
+  match system.hardware.product regex ^K8T400$
+   match system.hardware.version regex ^VT8204B $
+    addquirk --quirk-s3-bios
+    addquirk --quirk-s3-mode
+   endmatch
+  endmatch
+  match system.hardware.product regex ^(KT400-8235;KT400A-8235)$
+   addquirk --quirk-s3-bios
+   addquirk --quirk-s3-mode
+  endmatch
+ endmatch
+ match system.hardware.vendor regex ^AVERATEC$
+  match system.hardware.product regex ^(3700 Series;1000 Series)$
+   addquirk --quirk-s3-bios
+   addquirk --quirk-s3-mode
+  endmatch
+  match system.hardware.product regex ^5500 Series$
+   addquirk --quirk-s3-mode
+  endmatch
+ endmatch
+ match system.hardware.vendor regex ^BenQ
+  match system.hardware.product regex ^Joybook R42$
+   addquirk --quirk-vbe-post
+  endmatch
+  match system.hardware.product regex ^(Joybook R22;Joybook R23;JoyBook 7000)$
+   addquirk --quirk-s3-bios
+   addquirk --quirk-s3-mode
+  endmatch
+  match system.hardware.product regex ^(Joybook S52;Joybook S32)$
+   addquirk --quirk-vbe-post
+   addquirk --quirk-vbemode-restore
+  endmatch
+ endmatch
+ match system.hardware.vendor regex ^Elonex PLC
+  match system.hardware.product regex M5A
+   addquirk --quirk-s3-bios
+   addquirk --quirk-s3-mode
+  endmatch
+ endmatch
+ match system.hardware.vendor regex ^GERICOM
+  match system.hardware.product regex HUMMER
+   match system.firmware.version regex ^1\.03   $
+    addquirk --quirk-vbe-post
+    addquirk --quirk-vbemode-restore
+   endmatch
+  endmatch
+  match system.hardware.product regex 259IA1
+   addquirk --quirk-none
+  endmatch
+ # <!-- work only from X, models from vendor: Gericom and MTC -->
+  match system.hardware.product regex ^Montara-GML $
+   match system.hardware.version regex ^FAB-2$
+    addquirk --quirk-none
+   endmatch
+  endmatch
+ endmatch
+ match system.hardware.vendor regex ^MTC
+  match system.hardware.product regex ^Montara-GML$
+   addquirk --quirk-s3-bios
+  endmatch
+ endmatch
+ match system.hardware.vendor regex_ncase ^micro-star
+  match system.hardware.product regex ^(MS-1012;MS-1013)$
+   addquirk --quirk-s3-bios
+  endmatch
+  match system.hardware.product regex ^(MS-1057;U-100)$
+   addquirk --quirk-s3-bios
+   addquirk --quirk-s3-mode
+  endmatch
+  match system.hardware.product regex ^PR210$
+   match system.hardware.version regex ^MS-1222X$
+    addquirk --quirk-vbe-post
+   endmatch
+  endmatch
+  match system.hardware.product regex ^EX610$
+   addquirk --quirk-vbe-post
+   addquirk --quirk-vbemode-restore
+  endmatch
+  match system.hardware.product regex ^MS-1412$
+   addquirk --quirk-vbe-post
+   addquirk --quirk-vbestate-restore
+   addquirk --quirk-no-fb
+  endmatch
+  match system.hardware.product regex ^MS-1003$
+   addquirk --quirk-none
+  endmatch
+ endmatch
+ match system.hardware.vendor regex ^MSI
+  match system.hardware.product regex ^(MS-7350;MS-7207PV;MS-6417;MS-6702)$
+   addquirk --quirk-none
+  endmatch
+ endmatch
+ match system.hardware.vendor regex ^MiTAC$
+ # <!-- Mitac 8350
+ # system.hardware.product = ''  (string)
+ # system.hardware.serial = ''  (string)
+ # system.hardware.uuid = '64DBBBB4-5631-DA11-8000-4E45435F4349'  (string)
+ # system.hardware.vendor = 'MiTAC'  (string)
+ # system.hardware.version = '5a'  (string)
+ # -->
+  addquirk --quirk-s3-bios
+  addquirk --quirk-s3-mode
+ endmatch
+ match system.hardware.vendor regex ^MEDION
+  match system.hardware.product regex WID2010
+   addquirk --quirk-vbe-post
+   addquirk --quirk-vbemode-restore
+  endmatch
+  match system.hardware.product regex MS-6714
+   addquirk --quirk-s3-bios
+   addquirk --quirk-s3-mode
+  endmatch
+  match system.hardware.product regex ^(MS-7012;M295M;WIM 2000 ;WIM 2140)$
+   addquirk --quirk-none
+  endmatch
+ endmatch
+ match system.hardware.vendor regex ^NEC
+  match system.hardware.product regex B7 
+   addquirk --quirk-vbestate-restore
+  endmatch
+  match system.hardware.product regex ^VC2$
+   addquirk --quirk-s3-bios
+   addquirk --quirk-s3-mode
+  endmatch
+  match system.hardware.product regex ^NEC Versa Premium$
+   addquirk --quirk-none
+  endmatch
+ endmatch
+ match system.hardware.vendor regex_ncase ^packard bell
+ # <!-- this machines are strange, check also for rest of the vendor string -->
+  match system.hardware.vendor regex  NEC
+   match system.hardware.product regex ^00000000000000000000000$
+    match system.hardware.version regex ^P820008416$
+     addquirk --quirk-none
+    endmatch
+    match system.firmware.version regex ^A03 $
+     addquirk --quirk-none
+    endmatch
+   endmatch
+  endmatch
+  match system.hardware.product regex ^EasyNote_SJ51$
+   addquirk --quirk-s3-bios
+   addquirk --quirk-s3-mode
+  endmatch
+ endmatch
+ match system.hardware.vendor regex ^4MBOL
+  match system.hardware.product regex ^7521 
+   match system.hardware.version regex ^REV\. A0$
+    addquirk --quirk-none
+   endmatch
+  endmatch
+ endmatch
+ match system.hardware.vendor regex ^CLEVO$
+  match system.hardware.product regex ^D500P$
+   addquirk --quirk-vbe-post
+   addquirk --quirk-no-fb
+  endmatch
+  match system.hardware.product regex ^M5X0JE$
+   addquirk --quirk-s3-bios
+  endmatch
+  match system.hardware.product regex ^M720SR$
+   addquirk --quirk-vbe-post
+   addquirk --quirk-vbemode-restore
+   addquirk --quirk-vbestate-restore
+  endmatch
+  match system.hardware.product regex ^TN120R$
+   addquirk --quirk-none
+  endmatch
+ endmatch
+ match system.hardware.vendor regex ^ECS$
+  match system.hardware.product regex ^536$
+   addquirk --quirk-vbe-post
+   addquirk --quirk-no-fb
+  endmatch
+ endmatch
+ match system.hardware.vendor regex ^Elitegroup$
+  match system.hardware.product regex ^ECS G320$
+   addquirk --quirk-vbe-post
+   addquirk --quirk-vbemode-restore
+  endmatch
+ endmatch
+ match system.hardware.vendor regex ^Gigabyte Technology
+  match system.hardware.product regex ^(945GCMX-S2;P35-DS4)$
+   addquirk --quirk-vbe-post
+   addquirk --quirk-vbemode-restore
+  endmatch
+  match system.hardware.product regex ^(945GZM-S2;945GCM-S2L)$
+   addquirk --quirk-none
+  endmatch
+ endmatch
+ match system.hardware.vendor regex ^Infomash$
+  match system.hardware.product regex ^RoverBook$
+   addquirk --quirk-vbe-post
+   addquirk --quirk-vbemode-restore
+  endmatch
+ endmatch
+ match system.hardware.vendor regex ^Gateway
+  match system.hardware.product regex MT6707
+   addquirk --quirk-s3-bios
+   addquirk --quirk-s3-mode
+  endmatch
+  match system.hardware.product regex ^MT6920
+   addquirk --quirk-vbe-post
+  endmatch
+  match system.hardware.product regex MX6922B 
+   addquirk --quirk-none
+  endmatch
+ endmatch
+ match system.hardware.vendor regex ^MaxSelect$
+  match system.hardware.product regex ^Mission_A330$
+   addquirk --quirk-vbe-post
+   addquirk --quirk-vbestate-restore
+  endmatch
+ endmatch
+# <!-- medion md 96400 -->
+ match system.hardware.vendor regex ^NOTEBOOK$
+  match system.hardware.product regex ^SAM2000$
+   match system.hardware.version regex ^0131$
+    addquirk --quirk-none
+   endmatch
+  endmatch
+ # <!-- medion MIM2080 -->
+  match system.hardware.product regex ^MIM2080$
+   addquirk --quirk-s3-bios
+   addquirk --quirk-s3-mode
+  endmatch
+ endmatch
+ match system.hardware.vendor regex ^NCA_GROUP_LTD$
+  match system.hardware.product regex ^iRU_Notebook$
+   match system.hardware.version regex ^0106$
+    addquirk --quirk-vbe-post
+    addquirk --quirk-vbemode-restore
+   endmatch
+  endmatch
+ endmatch
+ match system.hardware.vendor regex ^transtec AG
+  match system.hardware.product regex ^(MS-1057;MS-1034)$
+   addquirk --quirk-s3-bios
+   addquirk --quirk-s3-mode
+  endmatch
+ endmatch
+ match system.hardware.vendor regex ^To Be Filled By O\.E\.M\.$
+  match system.hardware.product regex ^259IA1$
+   match system.hardware.version regex ^To Be Filled By O\.E\.M\.$
+    match system.firmware.version regex ^080010 $
+     addquirk --quirk-s3-mode
+    endmatch
+   endmatch
+  endmatch
+  match system.hardware.product regex ^MS-7210$
+   match system.hardware.version regex ^100$
+    addquirk --quirk-none
+   endmatch
+  endmatch
+ endmatch
+ match system.hardware.vendor regex ^OEM$
+ # <!-- rebranded Uniwill P53IN -->
+  match system.hardware.product regex ^P53IN4$
+   addquirk --quirk-none
+  endmatch
+ endmatch
+ match system.hardware.vendor regex ^OQO$
+  match system.hardware.product regex ^ZEPTO$
+   addquirk --quirk-vbe-post
+   addquirk --quirk-vbestate-restore
+  endmatch
+ endmatch
+ match system.hardware.vendor regex ^SHARP$
+  match system.hardware.product regex ^PC-AR10 
+   addquirk --quirk-none
+  endmatch
+ endmatch
+ match system.hardware.vendor regex ^Shuttle Inc$
+  match system.hardware.product regex ^SD11V10$
+   addquirk --quirk-s3-bios
+  endmatch
+  match system.hardware.product regex ^SD30V10$
+   addquirk --quirk-s3-bios
+   addquirk --quirk-s3-mode
+  endmatch
+  match system.hardware.product regex ^SN41UV10$
+   addquirk --quirk-vbe-post
+   addquirk --quirk-vbemode-restore
+  endmatch
+  match system.hardware.product regex ^SN85V10$
+   addquirk --quirk-none
+  endmatch
+ endmatch
+ match system.hardware.vendor regex ^ZEPTO$
+  match system.hardware.product regex ^ZNOTE
+   match system.hardware.version regex ^3215W
+    addquirk --quirk-none
+   endmatch
+  endmatch
+ endmatch
--- pm-utils-1.3.0~rc3.orig/video-quirks/20-video-quirk-pm-lenovo.quirkdb
+++ pm-utils-1.3.0~rc3/video-quirks/20-video-quirk-pm-lenovo.quirkdb
@@ -0,0 +1,93 @@
+# <?xml version="1.0" encoding="ISO-8859-1"?> <!-- -*- SGML -*- -->
+ match system.hardware.vendor regex ^LENOVO$
+ # <!-- ThinkPads -->
+ # <!-- X60 / X60s / T61 / T61p / R61 / R61s / X61(s/Tablet) / X300 -->
+ # <!-- NOTE: there is a report that 6458 needs vbe_post/vbemode_restore -->
+  match system.hardware.product regex ^(1702;1704;1706;1709;2007;2478;2479;4108;4141;4143;6088;6363;6364;6365;6378;6379;6480;6458;6463;6464;6465;6466;6467;6468;6471;6476;6477;6478;7642;7643;7644;7645;7646;7647;7648;7649;7650;7657;7658;7659;7660;7661;7666;7667;7668;7732;7733;7734;7735;7736;7737;7738;7762;7763;7764;7767;7768;7669;7670;7671;7673;7674;7675;7676;7678;7679;8808;8895;8896;8897;8898;8899;8900;8919;8930;8932;8933;8934;8935;8936;8937;8938;8939;8942;8943;8944;8945;8946;8947;8948;9452)
+   addquirk --quirk-s3-bios
+   addquirk --quirk-s3-mode
+  endmatch
+  match system.hardware.product regex ^(63664DU;1705CTO)
+   addquirk --quirk-vbe-post
+  endmatch
+  match system.hardware.product regex ^6457
+   addquirk --quirk-vbe-post
+   addquirk --quirk-vbemode-restore
+  endmatch
+ # <!-- R60 -->
+  match system.hardware.version regex_ncase ^ThinkPad R60
+   addquirk --quirk-s3-bios
+  # <!-- R60e 32bit works with S3_MODE, 64bit needs VBE_MODE -->
+   match system.hardware.product regex ^0657
+    addquirk --quirk-vbemode-restore
+   endmatch
+   match system.hardware.product regex_inverse 0657
+    addquirk --quirk-s3-mode
+   endmatch
+  endmatch
+  match system.hardware.version regex ^ThinkPad 
+  # <!-- T60* -->
+   match system.hardware.version regex T60$
+    addquirk --quirk-s3-bios
+    addquirk --quirk-s3-mode
+   endmatch
+  # <!-- Z61*, R61e ... -->
+   match system.hardware.version regex T60p;Z61m;Z61t;Z60m;Z61p;R61e
+    addquirk --quirk-s3-bios
+    addquirk --quirk-s3-mode
+   endmatch
+  # <!-- W500 -->
+   match system.hardware.version regex W500$
+    addquirk --quirk-vbe-post
+   endmatch
+  endmatch
+ # <!-- T61 -->
+  match system.hardware.product regex ^7663
+   addquirk --quirk-s3-mode
+  endmatch
+ # <!-- T61 (8895), intel card 32bit works with S3_MODE, but 64bit needs VBE_MODE
+ # T61p (6460), does not work with the NVidia driver-->
+  match system.hardware.product regex ^(6460;6465)
+   addquirk --quirk-s3-bios
+   addquirk --quirk-vbemode-restore
+  endmatch
+ # <!-- These Thinkpads don't need a quirk: 6459 (T61p), 7664 (T60) see s2ram -->
+  match system.hardware.product regex ^(6459;7664;8918)
+   addquirk --quirk-none
+  endmatch
+ # <!-- Lenovos non-ThinkPads -->
+  match system.hardware.version regex_ncase ^3000 C100
+   match system.hardware.product regex ^0761
+    addquirk --quirk-none
+   endmatch
+  endmatch
+  match system.hardware.version regex_ncase ^3000 N100
+   match system.hardware.product regex ^(068928U;07686VG;076831G;076835U;0768BYG)
+    addquirk --quirk-none
+   endmatch
+   match system.hardware.product regex ^07687MM
+    addquirk --quirk-s3-mode
+   endmatch
+   match system.hardware.product regex ^076804U$
+    addquirk --quirk-s3-bios
+    addquirk --quirk-vbemode-restore
+   endmatch
+  endmatch
+  match system.hardware.version regex_ncase ^3000 N200
+   match system.hardware.product regex ^(0769BBG;0769AC6)$
+    addquirk --quirk-s3-bios
+    addquirk --quirk-s3-mode
+   endmatch
+   match system.hardware.product regex ^(0769B9G;0769BEG;0769AH9)$
+    addquirk --quirk-none
+   endmatch
+  endmatch
+  match system.hardware.version regex ^LENOVO3000 V100$
+   match system.hardware.product regex ^0763
+    addquirk --quirk-none
+   endmatch
+  endmatch
+  match system.hardware.product regex ^Soleil E660P
+   addquirk --quirk-none
+  endmatch
+ endmatch
--- pm-utils-1.3.0~rc3.orig/video-quirks/20-video-quirk-pm-sony.quirkdb
+++ pm-utils-1.3.0~rc3/video-quirks/20-video-quirk-pm-sony.quirkdb
@@ -0,0 +1,49 @@
+# <?xml version="1.0" encoding="ISO-8859-1"?> <!-- -*- SGML -*- -->
+ match system.hardware.vendor regex ^Sony Corporation$
+  match system.hardware.product regex ^VGN-FS115Z$
+   addquirk --quirk-s3-mode
+  endmatch
+  match system.hardware.product regex VGN-FS730;PCG-FX405;VGN-C2S_G;VGN-B1XP;VGN-FE21B
+   addquirk --quirk-s3-bios
+  endmatch
+  match system.hardware.product regex ^(VGN-FS115B;VGN-C140G;VGN-TX3XP_L;VGN-T250P;VGN-AR31S;PCV-RX612;VGN-FS485B;VGN-SZ61XN_C;VGN-TZ37;VGN-TZ170N;VGN-FS920;VGN-C240E;PCG-FX601;VGN-SR11M)$
+   addquirk --quirk-s3-bios
+   addquirk --quirk-s3-mode
+  endmatch
+  match system.hardware.product regex ^VGN-NR120E$
+   addquirk --quirk-vbe-post
+  endmatch
+  match system.hardware.product regex ^(VGN-TX5MN_W;PCG-TR2A\\(UC\\);VGN-UX50)$
+   addquirk --quirk-vbemode-restore
+  endmatch
+  match system.hardware.product regex PCG-FX340
+   addquirk --quirk-vbestate-restore
+  endmatch
+  match system.hardware.product regex PCG-FX802
+   addquirk --quirk-vbestate-restore
+   addquirk --quirk-vbemode-restore
+  endmatch
+  match system.hardware.product regex PCG-Z1MP
+   addquirk --quirk-vbe-post
+   addquirk --quirk-vbemode-restore
+   addquirk --quirk-vbestate-restore
+  endmatch
+  match system.hardware.product regex PCG-Z1RMP;VGN-TX770P;VGN-FW11;VGN-TX670P;PCG-V505ECP
+   addquirk --quirk-vbe-post
+   addquirk --quirk-vbemode-restore
+  endmatch
+  match system.hardware.product regex PCG-FX805
+   addquirk --quirk-vbe-post
+   addquirk --quirk-vbestate-restore
+  endmatch
+ # <!-- machines which need no quirks -->
+ # <!-- Note:
+ # - VGN-FE31M: only from X, S3_MODE hangs the machine, all other leave the screen blank
+ # - VGN-SZ5XN_C: machine has two gfx cards, works only well with the intel, not with the nvidia -->
+  match system.hardware.product regex ^(VGN-TX3HP;VGN-B55G\\(I\\);VGN-FE31M;VGN-FS215B;VGN-FS660_W;VGN-SZ5XN_C;VGN-TZ21XN_B;PCG-FR215E;VGN-SZ340P;VGN-FE11M;VGN-TZ91HS;PCG-Z505HSK\\(UC\\);VGN-FZ39VN;VGN-A115B;VGN-FE890E;VGN-N320E;VGN-C2S_H;VGN-FS215M;VGN-Z90S)$
+   addquirk --quirk-none
+  endmatch
+  match system.hardware.product regex VGN-TZ11;PCG-F430\\(UC\\);PCG-GRT916Z;PCG-GRT995MP;PCG-GR7_K\\(J\\) 
+   addquirk --quirk-none
+  endmatch
+ endmatch
--- pm-utils-1.3.0~rc3.orig/video-quirks/20-video-quirk-pm-toshiba.quirkdb
+++ pm-utils-1.3.0~rc3/video-quirks/20-video-quirk-pm-toshiba.quirkdb
@@ -0,0 +1,127 @@
+# <?xml version="1.0" encoding="ISO-8859-1"?> <!-- -*- SGML -*- -->
+ match system.hardware.vendor regex ^TOSHIBA$
+ # <!-- Satellite Laptops -->
+  match system.hardware.product regex ^Satellite
+   match system.hardware.product regex  M30X
+    addquirk --quirk-s3-bios
+   endmatch
+   match system.hardware.product regex Pro A120;M35X;P100;P200; P205D; A100; A105; A135; A200; A205; A210; L30; M105;M70
+    addquirk --quirk-s3-bios
+    addquirk --quirk-s3-mode
+   endmatch
+   match system.hardware.product regex  A215
+    addquirk --quirk-pci-save
+    addquirk --quirk-s3-bios
+    addquirk --quirk-s3-mode
+   endmatch
+  # <!-- need exact match for this machine to prevent mixup with M30x -->
+   match system.hardware.product regex ^Satellite Pro M30$
+    addquirk --quirk-dpms-on
+   endmatch
+  # <!-- need exact match for this machine to prevent mixup with P105 or A100-->
+   match system.hardware.product regex ^(Satellite P10;Satellite A10)$
+    addquirk --quirk-s3-bios
+    addquirk --quirk-s3-mode
+   endmatch
+   match system.hardware.product regex P105
+    addquirk --quirk-vbe-post
+   endmatch
+   match system.hardware.product regex L10;U305;M55
+    addquirk --quirk-vbe-post
+    addquirk --quirk-vbemode-restore
+   endmatch
+   match system.hardware.product regex A300D
+    addquirk --quirk-vbe-post
+    addquirk --quirk-vbestate-restore
+   endmatch
+   match system.hardware.product regex A30; 1130
+    addquirk --quirk-vbestate-restore
+   endmatch
+   match system.hardware.product regex Pro 6100
+    addquirk --quirk-dpms-on
+   endmatch
+  # <!-- these need no quirks-->
+   match system.hardware.product regex A80;Pro4600; U200;Pro U300; U300
+    addquirk --quirk-none
+   endmatch
+  endmatch
+ # <!-- Tecra Laptops -->
+  match system.hardware.product regex ^TECRA
+   match system.hardware.product regex 8100;8200; M9
+    addquirk --quirk-s3-mode
+   endmatch
+   match system.hardware.product regex ^T9000$
+    addquirk --quirk-vbemode-restore
+   endmatch
+   match system.hardware.product regex  M4
+    addquirk --quirk-vbe-post
+    addquirk --quirk-vbemode-restore
+   endmatch
+   match system.hardware.product regex  S2
+    addquirk --quirk-vbe-post
+    addquirk --quirk-vbestate-restore
+   endmatch
+  # <!-- these need no quirks-->
+   match system.hardware.product regex  A8; A9; S3; S1
+    addquirk --quirk-none
+   endmatch
+  endmatch
+ # <!-- Portege Laptops -->
+  match system.hardware.product regex ^PORTEGE
+   match system.hardware.product regex R200;R205;R500
+    addquirk --quirk-s3-bios
+    addquirk --quirk-s3-mode
+   endmatch
+   match system.hardware.product regex M300
+    addquirk --quirk-s3-mode
+   endmatch
+   match system.hardware.product regex A100
+    addquirk --quirk-vbe-post
+    addquirk --quirk-vbestate-restore
+   endmatch
+  # <!-- these need no quirks-->
+   match system.hardware.product regex R100;4000
+    addquirk --quirk-none
+   endmatch
+  endmatch
+ # <!-- EQUIUM -->
+  match system.hardware.product regex ^EQUIUM
+   match system.hardware.product regex  A100$
+    addquirk --quirk-s3-bios
+    addquirk --quirk-s3-mode
+   endmatch
+  endmatch
+ # <!-- Toshiba Portege 3490CT -->
+  match system.hardware.product regex ^P3490$
+   addquirk --quirk-vbestate-restore
+  endmatch
+ # <!-- Toshiba Satellite S1110 -->
+  match system.hardware.product regex ^S1110$
+   addquirk --quirk-s3-bios
+  endmatch
+  match system.hardware.product regex ^Portable PC$
+   match system.hardware.version regex ^Version 1\.0$
+   # <!-- PORTEGE 100, Toshiba Satellite 4080XCDT -->
+    match system.firmware.version regex ^(Version 1\.60;Version 7\.80)$
+     addquirk --quirk-s3-mode
+    endmatch
+   # <!-- Tecra A2 PTA20E-4M301VGR -->
+    match system.firmware.version regex ^Version 1\.20$
+     addquirk --quirk-none
+    endmatch
+   endmatch
+  endmatch
+  match system.hardware.product regex ^(P2000;P4000)
+   addquirk --quirk-vbe-post
+   addquirk --quirk-vbestate-restore
+  endmatch
+ # <!-- these need no quirks-->
+  match system.hardware.product regex Libretto L5/TNK
+   addquirk --quirk-none
+  endmatch
+  match system.hardware.product regex ^SP4600$
+   match system.hardware.version regex ^Version 1\.0$
+    addquirk --quirk-none
+   endmatch
+  endmatch
+ endmatch
--- pm-utils-1.3.0~rc3.orig/video-quirks/20-video-quirk-pm-apple.quirkdb
+++ pm-utils-1.3.0~rc3/video-quirks/20-video-quirk-pm-apple.quirkdb
@@ -0,0 +1,25 @@
+# <?xml version="1.0" encoding="ISO-8859-1"?> <!-- -*- SGML -*- -->
+ match system.hardware.vendor regex ^Apple
+  match system.hardware.product regex ^MacBook2,1$
+   match system.hardware.vendor regex ^Apple Inc\.
+    match system.hardware.version regex ^1\.0$
+    # <!-- needs VBE_SAVE from console, but that slows resuming -->
+     addquirk --quirk-none
+    endmatch
+   endmatch
+   match system.hardware.vendor regex Computer, Inc\.
+    addquirk --quirk-vbe-post
+   endmatch
+  endmatch
+  match system.hardware.product regex ^(MacBook1,1;MacBook3,1)$
+  # <!-- s2ram uses vbe_post + vbemode_restore for MacBook1,1 -->
+   addquirk --quirk-vbestate-restore
+  endmatch
+  match system.hardware.product regex ^MacBookPro1,1$
+   addquirk --quirk-vbe-post
+  endmatch
+  match system.hardware.product regex ^MacBookPro2,2$
+   addquirk --quirk-vbe-post
+   addquirk --quirk-vbemode-restore
+  endmatch
+ endmatch
--- pm-utils-1.3.0~rc3.orig/video-quirks/20-video-quirk-pm-hp.quirkdb
+++ pm-utils-1.3.0~rc3/video-quirks/20-video-quirk-pm-hp.quirkdb
@@ -0,0 +1,306 @@
+# <?xml version="1.0" encoding="ISO-8859-1"?> <!-- -*- SGML -*- -->
+# <!-- Old Compaq machines. Add them to the HP file -->
+ match system.hardware.vendor regex ^Compaq
+ # <!-- Compaq Amada -->
+  match system.hardware.product regex ^Armada
+   match system.hardware.product regex     E500  ;     M70  ;    M700 
+    addquirk --quirk-none
+   endmatch
+  # <!-- This Armada m300 seems not to have a useful model description, so to make sure also check the bios_version-->
+   match system.hardware.product regex                                      
+    match system.firmware.version regex ^1\.35$
+     addquirk --quirk-none
+    endmatch
+   endmatch
+  endmatch
+  match system.hardware.product regex ^Evo
+   match system.hardware.product regex N600c
+    addquirk --quirk-vbe-post
+   endmatch
+   match system.hardware.product regex N800w 
+    addquirk --quirk-vbe-post
+   # <!-- VBE_MODE does not work, text size changes -->
+    match system.hardware.version regex ^F\.05$
+     addquirk --quirk-vbestate-restore
+    endmatch
+   # <!-- has a later BIOS and needs different Options -->
+    match system.hardware.version regex_inverse F\.05
+     addquirk --quirk-s3-bios
+     addquirk --quirk-s3-mode
+     addquirk --quirk-vbemode-restore
+    endmatch
+   endmatch
+   match system.hardware.product regex D510 USDT; N400c
+    addquirk --quirk-none
+   endmatch
+  endmatch
+  match system.hardware.product regex ^Presario
+   match system.hardware.product regex 2701EA
+    addquirk --quirk-vbe-post
+    addquirk --quirk-vbestate-restore
+    addquirk --quirk-no-fb
+   endmatch
+   match system.hardware.product regex V3000 \\(EZ674UA#;V3700 Notebook PC
+    addquirk --quirk-s3-bios
+    addquirk --quirk-s3-mode
+   endmatch
+   match system.hardware.product regex  X1000 
+    addquirk --quirk-vbe-post
+    addquirk --quirk-vbestate-restore
+   endmatch
+   match system.hardware.product regex V3000 \\(EZ755UA#;V5000 \\(ET826UA#;2100 \\(DP835E\\);F500 \\(GF596UA#;2200 \\(PR309UA#;C700 \\(GV681LA#
+    addquirk --quirk-none
+   endmatch
+  endmatch
+  match system.hardware.product regex ^N620c 
+   addquirk --quirk-s3-bios
+   addquirk --quirk-s3-mode
+  endmatch
+ endmatch
+ match system.hardware.vendor regex ^Hewlett Packard$
+  match system.hardware.version regex ^HP OmniBook XE3 GF
+   addquirk --quirk-vbe-post
+   addquirk --quirk-vbestate-restore
+  endmatch
+ endmatch
+ match system.hardware.vendor regex ^Hewlett-Packard
+  match system.hardware.product regex V2000 \\(EP381UA#;X1000 \\(DK454AV\\); 6715s;6820s
+   addquirk --quirk-s3-bios
+  endmatch
+  match system.hardware.product regex  8510w
+   match system.hardware.primary_video.vendor numeric_compare_eq 0x1002
+    addquirk --quirk-s3-bios
+   endmatch
+  endmatch
+  match system.hardware.product regex HP OmniBook XT1000
+   addquirk --quirk-s3-mode
+  endmatch
+  match system.hardware.product regex V3000 \\(RL377PA#;EW434AVABA;R3000;R4100;nc6000
+   addquirk --quirk-s3-bios
+   addquirk --quirk-s3-mode
+  endmatch
+  match system.hardware.product regex nx6125;nc6230;nx8220
+   addquirk --quirk-vbestate-restore
+   addquirk --quirk-no-fb
+  endmatch
+  match system.hardware.product regex OmniBook XE3 G;R3200;nx5000;nx7000;nc6120;nx6325;2510p
+   addquirk --quirk-vbe-post
+   addquirk --quirk-vbestate-restore
+  endmatch
+ # <!-- yes, system.hardware.version is correct for this machine -->
+  match system.hardware.version regex ^HP OmniBook 6100 EB$
+   addquirk --quirk-vbe-post
+   addquirk --quirk-vbestate-restore
+  endmatch
+ # <!-- Note: PY507ET# is a nc6120 -->
+  match system.hardware.product regex nc2400;nx6110;nc6120;nc6320;nx7300;6720s;2710p;8510p;PY507ET#;6715b
+   addquirk --quirk-vbe-post
+   addquirk --quirk-vbemode-restore
+  endmatch
+  match system.hardware.product regex 4410s
+  # <!-- ATI 0x1002:0x9552-->
+   match system.hardware.primary_video.vendor numeric_compare_eq 0x1002
+    addquirk --quirk-vbe-post
+    addquirk --quirk-vbemode-restore
+   endmatch
+  endmatch
+  match system.hardware.product regex M2000 \\(EQ547PA
+   addquirk --quirk-s3-bios
+   addquirk --quirk-vbemode-restore
+  endmatch
+  match system.hardware.product regex nx6120;nc4200;HP 530 Notebook PC
+   addquirk --quirk-vbe-post
+  endmatch
+  match system.hardware.product regex HP Compaq nc6400 
+   match system.hardware.version regex ^68YCU
+    match system.hardware.product regex \\(EH522AV\\);\\(EY582ES;\\(RH560EA
+     addquirk --quirk-vbemode-restore
+     addquirk --quirk-vbe-post
+    endmatch
+   endmatch
+  endmatch
+  match system.hardware.product regex nx 7010
+   addquirk --quirk-s3-bios
+   match system.hardware.product regex DU394T#
+    addquirk --quirk-s3-mode
+   endmatch
+  endmatch
+  match system.hardware.product regex nx7400
+   addquirk --quirk-vbe-post
+   match system.firmware.version regex_inverse 68YGU
+    addquirk --quirk-vbemode-restore
+   endmatch
+  endmatch
+  match system.hardware.product regex HP Compaq dc5800 Small Form Factor;HP d330 uT; nw9440;nw8440
+   addquirk --quirk-none
+  endmatch
+  match system.hardware.product regex HP Compaq 2133;HP 2133
+   match system.firmware.version regex 68VGU
+    addquirk --quirk-s3-bios
+    addquirk --quirk-s3-mode
+   endmatch
+  endmatch
+ # <!-- Handle machines which have the same product string, but differ -->
+  match system.hardware.product regex 6510b
+   match system.hardware.product regex KE134EA
+    addquirk --quirk-none
+   endmatch
+   match system.hardware.product regex_inverse KE134EA
+    addquirk --quirk-vbe-post
+    addquirk --quirk-vbestate-restore
+   endmatch
+  endmatch
+  match system.hardware.product regex 6710b
+   match system.hardware.product regex KE123EA
+    addquirk --quirk-none
+   endmatch
+   match system.hardware.product regex KE124EA
+    addquirk --quirk-vbe-post
+    addquirk --quirk-vbemode-restore
+   endmatch
+  endmatch
+  match system.hardware.product regex 6710s
+   match system.firmware.version regex 68DDU
+    match system.hardware.product regex GC014ET
+     addquirk --quirk-vbe-post
+     addquirk --quirk-vbestate-restore
+    endmatch
+    match system.hardware.product regex_inverse GC014ET
+     addquirk --quirk-vbe-post
+     addquirk --quirk-dpms-on
+    endmatch
+   endmatch
+  endmatch
+  match system.hardware.product regex 6715b
+   match system.hardware.product regex GB835EA;RK156AV
+    addquirk --quirk-s3-bios
+    addquirk --quirk-s3-mode
+   endmatch
+   match system.hardware.product regex GB834EA
+    addquirk --quirk-vbe-post
+    addquirk --quirk-vbemode-restore
+   endmatch
+   match system.hardware.product regex RM174UT
+    addquirk --quirk-s3-bios
+    addquirk --quirk-vbemode-restore
+   endmatch
+  endmatch
+  match system.hardware.product regex 6910p
+   match system.firmware.version regex 68MCD
+    match system.hardware.product regex GB951EA
+     addquirk --quirk-vbemode-restore
+    endmatch
+    match system.hardware.product regex ^HP Compaq 6910p$
+     addquirk --quirk-s3-bios
+     addquirk --quirk-s3-mode
+    endmatch
+   endmatch
+   match system.firmware.version regex_inverse 68MCD
+    addquirk --quirk-vbe-post
+    addquirk --quirk-vbemode-restore
+   endmatch
+  endmatch
+  match system.hardware.product regex nc4400
+   match system.firmware.version regex ^68YHV
+    addquirk --quirk-vbe-post
+    match system.firmware.version regex F\.08
+     addquirk --quirk-vbestate-restore
+    endmatch
+    match system.firmware.version regex_inverse F\.08
+     addquirk --quirk-vbemode-restore
+    endmatch
+   endmatch
+  endmatch
+  match system.hardware.product regex nx6310
+   match system.firmware.version regex ^68YDU
+    addquirk --quirk-none
+   endmatch
+   match system.firmware.version regex_inverse 68YDU
+    addquirk --quirk-vbe-post
+   endmatch
+  endmatch
+  match system.hardware.product regex_ncase Pavilion 
+   match system.hardware.product regex dv4000 \\(ES973EA#
+    addquirk --quirk-vbe-post
+    addquirk --quirk-vbestate-restore
+    addquirk --quirk-no-fb
+   endmatch
+   match system.hardware.product regex dv4000 \\(EB911EA#; dv2600; dv6500
+    addquirk --quirk-s3-bios
+   endmatch
+   match system.hardware.product regex dv4000 \\(PX306UA#; dv6700 
+    addquirk --quirk-s3-bios
+    addquirk --quirk-s3-mode
+   endmatch
+   match system.hardware.product regex zd8000 \\(EL030EA#
+    addquirk --quirk-vbe-post
+   endmatch
+   match system.hardware.product regex ze2000
+    match system.hardware.product regex \\(EK791EA#
+     addquirk --quirk-none
+    endmatch
+    match system.hardware.product regex_inverse \\(EK791EA#
+     addquirk --quirk-s3-bios
+     addquirk --quirk-s3-mode
+    endmatch
+   endmatch
+   match system.hardware.product regex zt3300
+    match system.firmware.version regex 68BAL
+     addquirk --quirk-s3-bios
+    endmatch
+    match system.hardware.product regex PF083UA#
+     addquirk --quirk-none
+    endmatch
+   endmatch
+   match system.hardware.product regex  dv6000 
+    match system.hardware.version regex \\(GA378UA#;\\(GH907EA#
+     addquirk --quirk-s3-mode
+    endmatch
+   # <!-- note: (RP153UA#: suspend maybe only with binary nvidia module -->
+    match system.hardware.version regex \\(EW434AV#;\\(RP153UA#
+     addquirk --quirk-s3-bios
+     addquirk --quirk-s3-mode
+    endmatch
+    match system.hardware.version regex \\(EY798AV#;\\(GF688EA;\\(RM469EA;\\(RP980EA#
+     addquirk --quirk-none
+    endmatch
+   endmatch
+   match system.hardware.product regex ^HP Pavilion Notebook PC$
+    match system.hardware.version regex ^HP Pavilion Notebook$
+     match system.firmware.vendor regex ^Insyde Software$
+     # <!-- HP Pavilion ZT1000-IC -->
+      match system.firmware.version regex ^ IC\.M1\.04$
+       addquirk --quirk-s3-bios
+       addquirk --quirk-s3-mode
+       addquirk --quirk-vbemode-restore
+      endmatch
+     # <!-- HP Pavilion xz275  -->
+      match system.firmware.version regex ^ IC\.M1\.02$
+       addquirk --quirk-none
+      endmatch
+     endmatch
+    endmatch
+   endmatch
+   match system.hardware.product regex 8710p;dv2000;dv2500;tx1000;dv5000 \\(EZ535UA#;HP d530 SFF;ze4900; dv9700 
+    addquirk --quirk-none
+   endmatch
+  endmatch
+ endmatch
+# <!-- HP Media Center PC m7330n w/ ATI RS480 [Radeon Xpress 200G Series] -->
+ match system.hardware.vendor regex ^HP Pavilion
+  match system.hardware.product regex M7330N
+   addquirk --quirk-vbe-post
+   addquirk --quirk-vbestate-restore
+  endmatch
+  match system.hardware.product regex ^(D7223K-ABA A650E;EJ192AA-ABS t3250\.se;EP198AA-UUZ t3335\.ch;ES061AA-ABD t3320;PC098A-ABA M1070N)$
+   addquirk --quirk-none
+  endmatch
+ endmatch
+ match system.hardware.vendor regex ^HP-Pavilion
+  match system.hardware.product regex RZ418AA-ABH s3020
+   addquirk --quirk-vbemode-restore
+  endmatch
+  match system.hardware.product regex ^RP829AV-ABA d4790y$
+   addquirk --quirk-none
+  endmatch
+ endmatch
--- pm-utils-1.3.0~rc3.orig/video-quirks/20-video-quirk-pm-acer.quirkdb
+++ pm-utils-1.3.0~rc3/video-quirks/20-video-quirk-pm-acer.quirkdb
@@ -0,0 +1,148 @@
+# <?xml version="1.0" encoding="ISO-8859-1"?> <!-- -*- SGML -*- -->
+ match system.hardware.vendor regex_ncase ^Acer
+  match system.hardware.product regex ^TravelMate
+   match system.hardware.product regex C300
+    addquirk --quirk-vbestate-restore
+   endmatch
+   match system.hardware.product regex 2350;2410;2420;2490;3220;4000;4650;5320
+    addquirk --quirk-s3-bios
+    addquirk --quirk-s3-mode
+   endmatch
+   match system.hardware.product regex 3000;4100
+    addquirk --quirk-vbe-post
+    addquirk --quirk-vbestate-restore
+   endmatch
+   match system.hardware.product regex 2300;2310;3010;3020;6291
+    addquirk --quirk-vbe-post
+    addquirk --quirk-vbemode-restore
+   endmatch
+   match system.hardware.product regex 3260
+    addquirk --quirk-vbe-post
+    addquirk --quirk-vbemode-restore
+    addquirk --quirk-pci-save
+   endmatch
+   match system.hardware.product regex 7520;8000
+    addquirk --quirk-s3-bios
+   endmatch
+   match system.hardware.product regex C100;6460
+    addquirk --quirk-vbe-post
+   endmatch
+   match system.hardware.product regex C200;2450;4400;6492
+    addquirk --quirk-none
+   endmatch
+  # <!-- these need the full name to prevent mixes with other machines
+  # NOTE: HAL removes whitespaces at the end of the sysfs and dmidecode output,
+  # we need to do exact string matches.
+  # -->
+   match system.hardware.product regex ^(TravelMate 240;TravelMate 250;TravelMate 650)$
+    addquirk --quirk-vbe-post
+    addquirk --quirk-vbestate-restore
+   endmatch
+   match system.hardware.product regex ^TravelMate 380$
+    addquirk --quirk-vbe-post
+    addquirk --quirk-vbestate-restore
+    addquirk --quirk-s3-mode
+   endmatch
+  # <!-- TravelMate 630Lci -->
+   match system.hardware.product regex ^(TravelMate 630;TravelMate 230)$
+    addquirk --quirk-s3-bios
+    addquirk --quirk-s3-mode
+   endmatch
+   match system.hardware.product regex ^TravelMate 660$
+    addquirk --quirk-vbe-post
+    addquirk --quirk-vbemode-restore
+   endmatch
+   match system.hardware.product regex ^TravelMate 800$
+    addquirk --quirk-vbe-post
+   endmatch
+  endmatch
+  match system.hardware.product regex ^Aspire
+   match system.hardware.product regex 5050
+    addquirk --quirk-s3-bios
+   endmatch
+   match system.hardware.product regex 1670;3610;3620;3690;5630
+    addquirk --quirk-s3-bios
+    addquirk --quirk-s3-mode
+   endmatch
+   match system.hardware.product regex 5610
+   # <!-- report from s2ram for a 5610Z, not sure if the 5610 is the same, so do this check -->
+    match system.hardware.product regex 5610Z
+     addquirk --quirk-s3-bios
+     addquirk --quirk-s3-mode
+    endmatch
+    match system.hardware.product regex_inverse 5610Z
+     addquirk --quirk-vbe-post
+    endmatch
+   endmatch
+   match system.hardware.product regex 5000;5020;5500
+    addquirk --quirk-vbe-post
+   endmatch
+   match system.hardware.product regex 1640
+    addquirk --quirk-vbestate-restore
+   endmatch
+   match system.hardware.product regex 1500;3000
+    addquirk --quirk-vbe-post
+    addquirk --quirk-vbestate-restore
+   endmatch
+   match system.hardware.product regex 1520;1650;5100;5110;5570;5920
+    addquirk --quirk-vbe-post
+    addquirk --quirk-vbemode-restore
+   endmatch
+   match system.hardware.product regex 1690;1694
+    addquirk --quirk-vbe-post
+    addquirk --quirk-vbestate-restore
+    addquirk --quirk-no-fb
+   endmatch
+   match system.hardware.product regex 1350$
+    addquirk --quirk-vbe-post
+    addquirk --quirk-vbemode-restore
+    addquirk --quirk-no-fb
+   endmatch
+   match system.hardware.product regex 2010;2920;3100;4520;5500Z;5580;5920G
+    addquirk --quirk-none
+   endmatch
+  endmatch
+  match system.hardware.product regex ^Extensa
+   match system.hardware.product regex 6220
+    addquirk --quirk-s3-bios
+   endmatch
+   match system.hardware.product regex 2900;3000;4150;5620
+    addquirk --quirk-s3-bios
+    addquirk --quirk-s3-mode
+   endmatch
+   match system.hardware.product regex 5220
+    addquirk --quirk-s3-bios
+    addquirk --quirk-vbe-post
+   endmatch
+  endmatch
+  match system.hardware.product regex ^Ferrari
+   match system.hardware.product regex 4000
+    addquirk --quirk-vbe-post
+    addquirk --quirk-vbestate-restore
+    addquirk --quirk-no-fb
+   endmatch
+   match system.hardware.product regex 1000
+    addquirk --quirk-vbe-post
+    addquirk --quirk-vbestate-restore
+   endmatch
+  # <!-- does not work with fglrx -->
+   match system.hardware.product regex 5000
+    addquirk --quirk-vbe-post
+    addquirk --quirk-vbemode-restore
+   endmatch
+  endmatch
+  match system.hardware.product regex ^Xspire
+   match system.hardware.product regex 1650
+    addquirk --quirk-none
+   endmatch
+  endmatch
+  match system.hardware.product regex ^AcerPower
+   match system.hardware.product regex 2000
+    addquirk --quirk-none
+   endmatch
+  endmatch
+ # <!-- Aspire One 110 -->
+  match system.hardware.product regex ^(AOA110;AOA150)
+   addquirk --quirk-none
+  endmatch
+ endmatch
--- pm-utils-1.3.0~rc3.orig/video-quirks/20-video-quirk-pm-asus.quirkdb
+++ pm-utils-1.3.0~rc3/video-quirks/20-video-quirk-pm-asus.quirkdb
@@ -0,0 +1,101 @@
+# <?xml version="1.0" encoding="ISO-8859-1"?> <!-- -*- SGML -*- -->
+ match system.hardware.vendor regex ^ASUS
+  match system.hardware.product regex ^(U5F ;M2000E;F2J )
+   addquirk --quirk-s3-bios
+  endmatch
+  match system.hardware.product regex ^(K8N-E-Deluxe;L2000D;M6Ne;M51Sr ;U6S;A8N)
+   addquirk --quirk-s3-mode
+  endmatch
+ # <!--NOTE: s2ram list the F3F with power_management.quirk.none=true -->
+  match system.hardware.product regex ^(M6VA;M6N ;M5N;M7A;S6F;S5N ;W3A;W5A ;M2N ;A2D ;F3F ;V6V;A8He;A6Kt ;F3JC ;F3Sc)
+   addquirk --quirk-s3-bios
+   addquirk --quirk-s3-mode
+  endmatch
+  match system.hardware.product regex ^Z35FM 
+   addquirk --quirk-s3-bios
+   addquirk --quirk-pci-save
+  endmatch
+  match system.hardware.product regex ^(A6M;Z84F)
+   addquirk --quirk-vbe-post
+  endmatch
+  match system.hardware.product regex ^W7J
+   addquirk --quirk-vbemode-restore
+  endmatch
+  match system.hardware.product regex ^(L3000D;M3N ;U3S ;X51RL )
+   addquirk --quirk-vbe-post
+   addquirk --quirk-vbestate-restore
+  endmatch
+  match system.hardware.product regex ^F3Ka
+   addquirk --quirk-vbe-post
+   addquirk --quirk-vbestate-restore
+   addquirk --quirk-no-fb
+  endmatch
+  match system.hardware.product regex ^V1J 
+   addquirk --quirk-vbe-post
+   addquirk --quirk-vbemode-restore
+   addquirk --quirk-no-fb
+  endmatch
+ # <!-- Z91E is identified as A3E -->
+  match system.hardware.product regex ^(A6J ;A6U;A3E;F3JP)
+   addquirk --quirk-vbe-post
+   addquirk --quirk-vbemode-restore
+  endmatch
+ # <!-- Asus Eee PC (Note: there is a report from s2ram to use vbe_post, vbemode_restore)-->
+  match system.hardware.product regex ^(701;900)$
+   addquirk --quirk-s3-bios
+   addquirk --quirk-dpms-on
+  endmatch
+ # <!-- these need no quirks, whitelist them -->
+  match system.hardware.product regex ^(A2H/L;A6Km;A6JC ;A6K ;A6T;A6G;A6VA;A8JS ;F3Sg;F3T;F9E ;G1S;K8V-MX;1000H;F2JE)
+   addquirk --quirk-none
+  endmatch
+ endmatch
+# <!-- ASUS Laptop with different vendor string (M2400N) -->
+ match system.hardware.vendor regex ^ERGOUK
+  match system.hardware.product regex ^M2N 
+   addquirk --quirk-s3-bios
+   addquirk --quirk-s3-mode
+  endmatch
+ endmatch
+# <!-- ASUS Mainboard with different vendor string -->
+ match system.hardware.vendor regex ^System manufacturer$
+  match system.hardware.product regex ^P5Q DELUXE$
+   match system.firmware.version regex ^System Version
+    addquirk --quirk-s3-bios
+    addquirk --quirk-s3-mode
+   endmatch
+  endmatch
+  match system.hardware.version regex ^P5KR
+   match system.hardware.product regex ^System Version
+    addquirk --quirk-none
+   endmatch
+  endmatch
+ endmatch
+# <!-- Board with broken system.hardware.* fields. Use system.board.* instead -->
+ match system.board.product regex ^P5LD2
+  addquirk --quirk-s3-bios
+ endmatch
+# <!-- ASUS a7v600 motherboard, has no usable sys_* entries besides bios_version -->
+ match system.firmware.version regex ^ASUS A7V600
+  addquirk --quirk-s3-bios
+  addquirk --quirk-s3-mode
+ endmatch
+# <!-- another ASUS Mainboard -->
+ match system.firmware.version regex ^(ASUS M2N32-SLI DELUXE ACPI BIOS Revision 1201;ASUS M2N32-SLI DELUXE ACPI BIOS Revision 1101;ASUS M2A-VM HDMI ACPI BIOS Revision 1603;ASUS A7V8X-X ACPI BIOS Revision)
+  addquirk --quirk-vbe-post
+  addquirk --quirk-vbemode-restore
+ endmatch
+ match system.firmware.version regex ^ASUS M2A-VM ACPI BIOS Revision
+  match system.firmware.version regex  1101
+   addquirk --quirk-s3-bios
+   addquirk --quirk-vbemode-restore
+  endmatch
+  match system.firmware.version regex_inverse  1101
+   addquirk --quirk-vbe-post
+   addquirk --quirk-vbemode-restore
+  endmatch
+ endmatch
+# <!-- another ASUS Mainboard, this need no quirk -->
+ match system.firmware.version regex ^(ASUS M2N-E ACPI BIOS Revision;ASUS Striker ACPI BIOS Revision;ASUS A7V ACPI BIOS Revision)
+  addquirk --quirk-none
+ endmatch
--- pm-utils-1.3.0~rc3.orig/video-quirks/20-video-quirk-pm-dell.quirkdb
+++ pm-utils-1.3.0~rc3/video-quirks/20-video-quirk-pm-dell.quirkdb
@@ -0,0 +1,166 @@
+# <?xml version="1.0" encoding="ISO-8859-1"?> <!-- -*- SGML -*- -->
+ match system.hardware.vendor regex ^Dell
+ # <!-- Dell Latitude -->
+  match system.hardware.product regex ^Latitude
+   match system.hardware.product regex C500
+    addquirk --quirk-dpms-suspend
+    addquirk --quirk-vbe-post
+   endmatch
+   match system.hardware.product regex C600
+    addquirk --quirk-radeon-off
+   endmatch
+   match system.hardware.product regex C800
+    addquirk --quirk-vbemode-restore
+   endmatch
+   match system.hardware.product regex X300;D820
+   # <!-- the Dell D820 is also reported to work with vbe_post+vbemode_restore and
+   # need may dpms_on -->
+    addquirk --quirk-vbestate-restore
+   endmatch
+   match system.hardware.product regex CPx J800GT;D400;D410;D420;D430;D520;D530;C610;D620;D830
+    addquirk --quirk-vbe-post
+    addquirk --quirk-vbemode-restore
+   endmatch
+   match system.hardware.product regex C400;C840;D500;D505;D800;X200
+    addquirk --quirk-vbe-post
+    addquirk --quirk-vbestate-restore
+   endmatch
+   match system.hardware.product regex D600;D610
+    addquirk --quirk-vbe-post
+    addquirk --quirk-vbestate-restore
+    addquirk --quirk-no-fb
+   endmatch
+   match system.hardware.product regex D630
+    match system.firmware.version compare_lt A12
+     addquirk --quirk-vbe-post
+     addquirk --quirk-vbestate-restore
+     addquirk --quirk-no-fb
+    endmatch
+    match system.firmware.version compare_ge A12
+     addquirk --quirk-vbemode-restore
+    endmatch
+   endmatch
+   match system.hardware.product regex X1$
+    addquirk --quirk-vbe-post
+   endmatch
+  # <!-- these need no quirks -->
+   match system.hardware.product regex CPx J650GT;LS ;D810
+    addquirk --quirk-none
+   endmatch
+  endmatch
+ # <!-- Dell Inspiron -->
+  match system.hardware.product regex ^Inspiron
+   match system.hardware.product regex 1501;8600
+    addquirk --quirk-s3-bios
+    addquirk --quirk-s3-mode
+   endmatch
+   match system.hardware.product regex  510m 
+    addquirk --quirk-vbe-post
+   endmatch
+   match system.hardware.product regex  5100 
+    match system.firmware.version regex ^Revision A0$
+     addquirk --quirk-vbe-post
+     addquirk --quirk-vbestate-restore
+     addquirk --quirk-pci-save
+    endmatch
+    match system.firmware.version regex_inverse Revision A0
+     addquirk --quirk-no-fb
+    endmatch
+   endmatch
+   match system.hardware.product regex 5150;8000;8500
+    addquirk --quirk-vbe-post
+    addquirk --quirk-vbestate-restore
+   endmatch
+   match system.hardware.product regex 500m;600m;1100;1420;1525;2200;5160
+    addquirk --quirk-vbe-post
+    addquirk --quirk-vbemode-restore
+   endmatch
+   match system.hardware.product regex 700m
+   # <!-- ONLY needed with i810 X.org driver 1.x versions,
+   # DO NOT use with intel X.org driver 2.x version (not needed and causes problems)
+   # <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
+   # <merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
+   # <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
+   # <merge key="power_management.quirk.vga_mode3" type="bool">true</merge> -->
+    addquirk --quirk-none
+   endmatch
+  # <!-- these need no quirks -->
+   match system.hardware.product regex  1150; 1520; 1720
+    addquirk --quirk-none
+   endmatch
+  endmatch
+ # <!-- Dell Precision -->
+  match system.hardware.product regex ^Precision
+   match system.hardware.product regex M20
+    addquirk --quirk-vbe-post
+    addquirk --quirk-vbestate-restore
+   endmatch
+   match system.hardware.product regex M6300 
+    addquirk --quirk-vbe-post
+    addquirk --quirk-vbemode-restore
+   endmatch
+   match system.hardware.product regex  M60
+    addquirk --quirk-vbestate-restore
+   endmatch
+   match system.hardware.product regex M65
+    addquirk --quirk-dpms-on
+    addquirk --quirk-vbe-post
+   endmatch
+  # <!-- these need no quirks -->
+   match system.hardware.product regex  M90 ;WorkStation 360; M4300
+    addquirk --quirk-none
+   endmatch
+  endmatch
+ # <!-- Dell Dimension -->
+  match system.hardware.product regex ^Dimension
+   match system.hardware.product regex 2400;3000;9100
+    addquirk --quirk-vbe-post
+    addquirk --quirk-vbemode-restore
+   endmatch
+  endmatch
+ # <!-- Dell Vostro -->
+  match system.hardware.product regex ^Vostro
+   match system.hardware.product regex  1000 
+    addquirk --quirk-s3-bios
+    addquirk --quirk-s3-mode
+   endmatch
+   match system.hardware.product regex  1500
+    addquirk --quirk-vbe-post
+    addquirk --quirk-vbemode-restore
+   endmatch
+   match system.hardware.product regex 1710
+    addquirk --quirk-none
+   endmatch
+  endmatch
+ # <!-- Dell OptiPlex -->
+  match system.hardware.product regex_ncase ^OptiPlex
+   match system.hardware.product regex GX520;GX260
+    addquirk --quirk-vbe-post
+    addquirk --quirk-vbemode-restore
+   endmatch
+   match system.hardware.product regex 755
+    addquirk --quirk-vbe-post
+    addquirk --quirk-no-fb
+   endmatch
+   match system.hardware.product regex_ncase fx160
+    addquirk --quirk-s3-bios
+    addquirk --quirk-s3-mode
+   endmatch
+   match system.hardware.product regex 170L;GX620
+    addquirk --quirk-none
+   endmatch
+  endmatch
+ # <!-- Dell Inspiron 640m, XPS M1210 -->
+  match system.hardware.product regex MXC061;MXC062
+   addquirk --quirk-vbe-post
+  endmatch
+ # <!-- Dell XPS M1330, MM061 = Inspiron E1505 or/and 6400 -->
+  match system.hardware.product regex XPS M1330;MM061
+   addquirk --quirk-vbe-post
+   addquirk --quirk-vbemode-restore
+  endmatch
+ # <!-- these need no quirks : Dimension E520, DXP051, Inspiron: 1300, E1702/E1705, 630m, M1710 (only resumes with vesafb) -->
+  match system.hardware.product regex DM061 ;DXP051;ME051;MP061;MXC051;MXG061;XPS M1530
+   addquirk --quirk-none
+  endmatch
+ endmatch
--- pm-utils-1.3.0~rc3.orig/video-quirks/20-video-quirk-pm-fujitsu.quirkdb
+++ pm-utils-1.3.0~rc3/video-quirks/20-video-quirk-pm-fujitsu.quirkdb
@@ -0,0 +1,107 @@
+# <?xml version="1.0" encoding="ISO-8859-1"?> <!-- -*- SGML -*- -->
+ match system.hardware.vendor regex ^FUJITSU
+  match system.hardware.product regex_ncase amilo
+   match system.hardware.product regex A1667G Serie;Pa 1510;Li 1718;M1425
+    addquirk --quirk-s3-bios
+   endmatch
+   match system.hardware.product regex Pro V3205;Pro Edition V3405;Pro Edition V3505;Xi 1546;Si 1520;A7640;Pi 1505;A1645
+    addquirk --quirk-s3-bios
+    addquirk --quirk-s3-mode
+   endmatch
+   match system.hardware.product regex A1650G
+    addquirk --quirk-vbemode-restore
+   endmatch
+   match system.hardware.product regex ^M Series$
+    addquirk --quirk-vbestate-restore
+   endmatch
+   match system.hardware.product regex Amilo D Series;PRO V2030;PRO V2035;PRO V8010;Pi 1536;Pi 2515; L Series
+    addquirk --quirk-vbe-post
+    addquirk --quirk-vbemode-restore
+   endmatch
+   match system.hardware.product regex AMILO M;A Series
+    match system.hardware.version regex -1 ;0\.01
+     addquirk --quirk-vbe-post
+     addquirk --quirk-vbestate-restore
+     match system.firmware.version regex ^R01-S0N
+      addquirk --quirk-pci-save
+     endmatch
+    endmatch
+   endmatch
+   match system.hardware.product regex A7645
+    addquirk --quirk-s3-bios
+    addquirk --quirk-s3-mode
+    addquirk --quirk-vbestate-restore
+   endmatch
+   match system.hardware.product regex Pro V2040;Pro Series V3525
+    addquirk --quirk-none
+   endmatch
+  endmatch
+  match system.hardware.product regex_ncase lifebook
+   match system.hardware.product regex P7010D;S2110
+    addquirk --quirk-s3-bios
+   endmatch
+   match system.hardware.product regex E8410;T4010;S2210;P8010
+    addquirk --quirk-s3-bios
+    addquirk --quirk-s3-mode
+   endmatch
+  # <!-- S7020 is also reported with s3_bios/s3_mode/pci_save -->
+   match system.hardware.product regex S7020
+    addquirk --quirk-vbe-post
+    addquirk --quirk-reset-brightness
+   endmatch
+   match system.hardware.product regex E4010;P7120
+    addquirk --quirk-vbestate-restore
+   endmatch
+   match system.hardware.product regex E8020;S6410
+    addquirk --quirk-vbe-post
+    addquirk --quirk-vbemode-restore
+   endmatch
+   match system.hardware.product regex T2010
+    match system.hardware.product regex ^FUJITSU SIEMENS$
+     addquirk --quirk-vbe-post
+     addquirk --quirk-vbestate-restore
+     addquirk --quirk-pci-save
+    endmatch
+    match system.hardware.product regex ^FUJITSU$
+     addquirk --quirk-s3-bios
+     addquirk --quirk-s3-mode
+    endmatch
+   endmatch
+   match system.hardware.product regex T4210;P7230
+    addquirk --quirk-pci-save
+    addquirk --quirk-s3-bios
+    addquirk --quirk-s3-mode
+   endmatch
+   match system.hardware.product regex B Series;T Series;S7010;S7110;E8110;T301;T3010
+    addquirk --quirk-none
+   endmatch
+  endmatch
+  match system.hardware.product regex ^SCENIC
+   match system.hardware.product regex N300/N600;W300/W600;P / SCENICO P
+    addquirk --quirk-vbe-post
+    addquirk --quirk-vbemode-restore
+   endmatch
+   match system.hardware.product regex  W$
+    addquirk --quirk-vbe-post
+    addquirk --quirk-vbemode-restore
+   endmatch
+  endmatch
+  match system.hardware.product regex ^(ESPRIMO P;ESPRIMO Mobile M9400;ESPRIMO Mobile D9500)
+   addquirk --quirk-none
+  endmatch
+  match system.hardware.product regex ^Stylistic ST5000$
+   addquirk --quirk-s3-bios
+   addquirk --quirk-s3-mode
+  endmatch
+  match system.hardware.product regex ^P6VAP-AP$
+   addquirk --quirk-none
+  endmatch
+ endmatch
+# <!-- different vendor string -->
+ match system.hardware.vendor regex ^FUJITSO
+  match system.hardware.product regex ^FMVLT70R$
+   addquirk --quirk-s3-bios
+   addquirk --quirk-s3-mode
+   addquirk --quirk-pci-save
+  endmatch
+ endmatch
--- pm-utils-1.3.0~rc3.orig/video-quirks/20-video-quirk-pm-ibm.quirkdb
+++ pm-utils-1.3.0~rc3/video-quirks/20-video-quirk-pm-ibm.quirkdb
@@ -0,0 +1,112 @@
+# <?xml version="1.0" encoding="ISO-8859-1"?> <!-- -*- SGML -*- -->
+ match system.hardware.vendor regex ^IBM$
+  match system.hardware.version regex ^ThinkPad R50e$
+   addquirk --quirk-save-pci
+   addquirk --quirk-dpms-on
+  endmatch
+  match system.hardware.version regex ^ThinkPad R51$
+   addquirk --quirk-none
+  endmatch
+  match system.hardware.version regex ^ThinkPad R51e$
+   addquirk --quirk-s3-bios
+   addquirk --quirk-s3-mode
+  endmatch
+ # <!-- 600e -->
+  match system.hardware.product regex ^2645
+   match system.firmware.version regex ^INET17WW$
+    addquirk --quirk-vbe-post
+    addquirk --quirk-vbemode-restore
+   endmatch
+   match system.firmware.version regex_inverse INET17WW
+    addquirk --quirk-vbestate-restore
+   endmatch
+  endmatch
+ # <!-- A31-->
+  match system.hardware.product regex ^2652
+   addquirk --quirk-s3-bios
+   addquirk --quirk-s3-mode
+  # <!--
+  # There are reports that this quirk makes 2652 crash/fail on second suspend (bnc#309742)
+  # <merge key="power_management.quirk.radeon_off" type="bool">true</merge>
+  # -->
+   addquirk --quirk-dpms-suspend
+  endmatch
+ # <!-- X31, T30 , A31p-->
+  match system.hardware.product regex ^(2366;2367;2653)
+   addquirk --quirk-radeon-off
+  endmatch
+ # <!-- X22, X40, X32 -->
+  match system.hardware.product regex ^(2662;2672;2673)
+   addquirk --quirk-radeon-off
+   match system.hardware.version regex_inverse X31
+    addquirk --quirk-s3-bios
+    addquirk --quirk-s3-mode
+   endmatch
+  endmatch
+ # <!-- X31 -->
+  match system.hardware.product regex ^(2672;2673;2884;2885;2890;2891)
+   match system.hardware.version regex X31
+    addquirk --quirk-dpms-suspend
+    addquirk --quirk-radeon-off
+   endmatch
+   match system.hardware.version regex X32
+    addquirk --quirk-dpms-suspend
+   endmatch
+  endmatch
+ # <!-- T23(2647) -->
+  match system.hardware.product regex ^2647
+   addquirk --quirk-vbe-post
+  endmatch
+ # <!-- R50p, R52, X41t, X40, T30, T41p, T41p, T42, X40, Z60t, X41, Z60m-->
+  match system.hardware.product regex ^(1832;1860;1869;2371;2373;2374;2376;2382;2386;2511;2513;2525;2526;2529;2530)
+   addquirk --quirk-s3-bios
+   addquirk --quirk-s3-mode
+  endmatch
+ # <!-- R52 ATI Mobility Radeon X300, G41 -->
+  match system.hardware.product regex ^(1846;1847;2886)
+   addquirk --quirk-vbe-post
+   addquirk --quirk-vbemode-restore
+  endmatch
+ # <!-- T41 -->
+  match system.hardware.version regex ^ThinkPad T41$
+   addquirk --quirk-s3-bios
+  endmatch
+ # <!-- T42, T42p -->
+  match system.hardware.product regex ^(2378;2379)
+   match system.hardware.version regex ^ThinkPad T42
+    addquirk --quirk-s3-bios
+   endmatch
+  endmatch
+ # <!-- T43 -->
+  match system.hardware.version regex ^ThinkPad T43$
+  # <!-- ATI graphics -->
+   match system.hardware.primary_video.vendor numeric_compare_eq 0x1002
+    addquirk --quirk-vbe-post
+    addquirk --quirk-vbemode-restore
+   endmatch
+  # <!-- Intel graphics -->
+   match system.hardware.primary_video.vendor numeric_compare_eq 0x8086
+    addquirk --quirk-s3-bios
+    addquirk --quirk-s3-mode
+   endmatch
+  endmatch
+ # <!-- G40 -->
+  match system.hardware.product regex ^2388
+   addquirk --quirk-vbestate-restore
+  endmatch
+ # <!-- need no quirks: A21m, A21p, R32, R40 (2x)-->
+  match system.hardware.product regex ^(2628;2629;2658;2681;2722)
+   addquirk --quirk-none
+  endmatch
+ # <!-- need no quirks: a X40, T40 -->
+  match system.hardware.version regex ^ThinkPad X40$
+   match system.firmware.version regex ^1UETD2WW
+    addquirk --quirk-none
+   endmatch
+  endmatch
+  match system.hardware.version regex ^ThinkPad T40 $
+   match system.firmware.version regex ^1RETDRWW
+    addquirk --quirk-none
+   endmatch
+  endmatch
+ endmatch