Bug#604067: unblock: pm-utils/1.3.0-3
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: freeze-exception
Please unblock package pm-utils
As already discussed, uswsusp is currently in a sad state and has been
removed from squeeze as a consequence and I don't want pm-utils to use
it automatically any longer.
Changelog:
pm-utils (1.3.0-3) unstable; urgency=low
* debian/control
- Bump Standards-Version to 3.9.1. No further changes.
* Stop using SLEEP_MODULE="auto".
In auto mode we use s2ram/s2disk from uswsusp if installed.
As s2ram does not handle KMS correctly, which is the default for the main
graphics drivers in squeeze, this causes problems, so we no longer
suggest the usage of uswsusp and by default use the kernel backend.
If you want to keep using uswsusp you need to configure this explicitly.
See the pm-suspend(8) man page for details.
-- Michael Biebl <biebl@debian.org> Wed, 17 Nov 2010 05:04:07 +0100
debdiff is attached
Michael
unblock pm-utils/1.3.0-3
-- System Information:
Debian Release: squeeze/sid
APT prefers unstable
APT policy: (500, 'unstable'), (200, 'experimental')
Architecture: i386 (i686)
Kernel: Linux 2.6.32-5-686 (SMP w/1 CPU core)
Locale: LANG=de_DE.utf8, LC_CTYPE=de_DE.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff --git a/debian/changelog b/debian/changelog
index c5c0b00..58ecc3f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+pm-utils (1.3.0-3) unstable; urgency=low
+
+ * debian/control
+ - Bump Standards-Version to 3.9.1. No further changes.
+ * Stop using SLEEP_MODULE="auto".
+ In auto mode we use s2ram/s2disk from uswsusp if installed.
+ As s2ram does not handle KMS correctly, which is the default for the main
+ graphics drivers in squeeze, this causes problems, so we no longer
+ suggest the usage of uswsusp and by default use the kernel backend.
+ If you want to keep using uswsusp you need to configure this explicitly.
+ See the pm-suspend(8) man page for details.
+
+ -- Michael Biebl <biebl@debian.org> Wed, 17 Nov 2010 05:04:07 +0100
+
pm-utils (1.3.0-2) unstable; urgency=low
* debian/control
diff --git a/debian/control b/debian/control
index 790f6bb..e178b4b 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,8 @@ 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
+Build-Depends: cdbs, debhelper (>= 7), xmlto, quilt
+Standards-Version: 3.9.1
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/
@@ -13,7 +13,7 @@ Package: pm-utils
Architecture: all
Depends: ${misc:Depends}, powermgmt-base, kbd | console-tools
Recommends: vbetool, radeontool, procps
-Suggests: cpufrequtils, uswsusp
+Suggests: cpufrequtils
Description: utilities and scripts for power management
This package provides simple shell command line tools to suspend and
hibernate your computer.
diff --git a/debian/patches/10-debian-defaults.patch b/debian/patches/10-debian-defaults.patch
deleted file mode 100644
index 21fd874..0000000
--- a/debian/patches/10-debian-defaults.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-# 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.
diff --git a/debian/patches/series b/debian/patches/series
index b05abfb..3a87f72 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,7 +3,6 @@
06-quirk-lkw-cache.patch
08-fix-lock-file-handling.patch
09-document-add-drop-parameters.patch
-10-debian-defaults.patch
11-handle-on_ac_power-255-return-code.patch
12-man-page-fixes.patch
25-pmu.patch
diff --git a/debian/rules b/debian/rules
index 76b64dd..5a7a71b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -34,10 +34,3 @@ binary-install/pm-utils::
# 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
-
Reply to: