diff -Nru hibernate-2.0.git20100603~ppa5~precise1/debian/bugscript hibernate-2.0+15+g88d54a8/debian/bugscript --- hibernate-2.0.git20100603~ppa5~precise1/debian/bugscript 2010-09-12 20:50:57.000000000 +0000 +++ hibernate-2.0+15+g88d54a8/debian/bugscript 2016-01-10 23:36:03.000000000 +0000 @@ -32,7 +32,7 @@ case "$L" in 0|1|2) cat <<-_eof - Your hibernate LogVerbosity is set to $L. If would be of great + Your hibernate LogVerbosity is set to $L. It would be of great help if you could bump that up to 3, rerun hibernate to reproduce the bug, and then fire up reportbug. You may also wish to set the verbosity to 4 and submit a URL to your /var/log/hibernate.log in diff -Nru hibernate-2.0.git20100603~ppa5~precise1/debian/bzr-builder.manifest hibernate-2.0+15+g88d54a8/debian/bzr-builder.manifest --- hibernate-2.0.git20100603~ppa5~precise1/debian/bzr-builder.manifest 1970-01-01 00:00:00.000000000 +0000 +++ hibernate-2.0+15+g88d54a8/debian/bzr-builder.manifest 2016-01-10 23:36:04.000000000 +0000 @@ -0,0 +1,2 @@ +# bzr-builder format 0.3 deb-version {debupstream}-1~15 +lp:ubuntu/trusty/hibernate revid:package-import@ubuntu.com-20120502235316-tu8q8dt87466lhll diff -Nru hibernate-2.0.git20100603~ppa5~precise1/debian/changelog hibernate-2.0+15+g88d54a8/debian/changelog --- hibernate-2.0.git20100603~ppa5~precise1/debian/changelog 2012-04-25 00:09:41.000000000 +0000 +++ hibernate-2.0+15+g88d54a8/debian/changelog 2016-01-10 23:36:04.000000000 +0000 @@ -1,8 +1,48 @@ -hibernate (2.0.git20100603~ppa5~precise1) precise; urgency=low +hibernate (2.0+15+g88d54a8-1~15~ubuntu12.04.1) precise; urgency=low - * New upstream GIT snapshot. + * Auto build. - -- Martin Schläffer Wed, 25 Apr 2012 02:09:41 +0200 + -- Martin Schläffer Sun, 10 Jan 2016 23:36:04 +0000 + +hibernate (2.0+15+g88d54a8-1) unstable; urgency=low + + [ martin f. krafft ] + * New upstream release (Closes: #491071, #532124, #555410). + + [ Andrey Rahmatullin ] + * Adopt the package (Closes: #651194). + * Bump Standards-Version to 3.9.3. + * Switch to source package format 3.0 (quilt). + * Switch to debhelper v9. + * Switch to dh(1). + * Change Priority to optional. + * Fix a typo in debian/bugscript (Closes: #531290). + * Remove Conflicts/Replaces on suspend-script. + * Add an md5sums control file. + * Use the Debian path to the userui program in the config (Closes: #492392). + * Do not install the initscript, it needs rewriting (Closes: #363004) + * Add Homepage. + * Update Description. + * Fix some manpage issues (Closes: #473530, #664830, #668978). + * Replace 2.6.99 with 3.99.0 as a "maximum possible" version in + blacklist-modules. + * Fix the license file name in debian/copyright. + * Fix option names for s2ram and apply s2ram options to s2both + (Closes: #505410). + * Update the default GRUB config name for GRUB2 (Closes: #512112). + * Move sh options from the shebang to the maintscript body. + * Remove outdated README.Debian (Closes: #495145). + * Drop the optional dependency on console-tools (Closes: #671081). + + -- Andrey Rahmatullin Wed, 02 May 2012 23:53:16 +0600 + +hibernate (1.99-1.1) unstable; urgency=low + + * Non-maintainer upload. + * Fix init.d LSB headers: hibernate should depend on mdadm-raid, not + mdadm; patch by martin f krafft. (Closes: #554905) + + -- Stefano Zacchiroli Sun, 20 Dec 2009 14:54:20 +0100 hibernate (1.99-1) unstable; urgency=low diff -Nru hibernate-2.0.git20100603~ppa5~precise1/debian/compat hibernate-2.0+15+g88d54a8/debian/compat --- hibernate-2.0.git20100603~ppa5~precise1/debian/compat 2010-09-12 20:50:57.000000000 +0000 +++ hibernate-2.0+15+g88d54a8/debian/compat 2016-01-10 23:36:03.000000000 +0000 @@ -1 +1 @@ -6 +9 diff -Nru hibernate-2.0.git20100603~ppa5~precise1/debian/control hibernate-2.0+15+g88d54a8/debian/control --- hibernate-2.0.git20100603~ppa5~precise1/debian/control 2010-09-12 20:50:57.000000000 +0000 +++ hibernate-2.0+15+g88d54a8/debian/control 2016-01-10 23:36:03.000000000 +0000 @@ -1,20 +1,20 @@ Source: hibernate Section: utils -Priority: extra -Maintainer: martin f. krafft -Uploaders: Cameron Patrick -Build-Depends: debhelper (>> 6), dpatch -Standards-Version: 3.7.3 +Priority: optional +Maintainer: Andrey Rahmatullin +Uploaders: martin f. krafft , Cameron Patrick +Build-Depends: debhelper (>= 9) +Standards-Version: 3.9.3 +Homepage: http://tuxonice.net/ Vcs-Git: git://git.debian.org/collab-maint/hibernate.git Vcs-Browser: http://git.debian.org/?p=collab-maint/hibernate.git Package: hibernate Architecture: all -Depends: console-tools | kbd +Pre-Depends: ${misc:Pre-Depends} +Depends: ${misc:Depends}, kbd Recommends: dash, hdparm, vbetool, uswsusp Suggests: 915resolution, xscreensaver | kscreensaver | gnome-screensaver | xlock | vlock -Conflicts: suspend-script (<= 0.94-1) -Replaces: suspend-script (<= 0.94-1) Description: smartly puts your computer to sleep (suspend to RAM or disk) The hibernate script helps you in putting your computer to sleep, using one of the various methods available in the kernel. @@ -27,4 +27,4 @@ . Currently the script supports all suspend mechanisms available through the /sys/power/state interface (including ACPI suspend and the in-kernel software - suspend), as well as Software Suspend 2 (http://www.suspend2.net) + suspend), as well as TuxOnIce. diff -Nru hibernate-2.0.git20100603~ppa5~precise1/debian/copyright hibernate-2.0+15+g88d54a8/debian/copyright --- hibernate-2.0.git20100603~ppa5~precise1/debian/copyright 2010-09-12 20:50:57.000000000 +0000 +++ hibernate-2.0+15+g88d54a8/debian/copyright 2016-01-10 23:36:03.000000000 +0000 @@ -17,4 +17,4 @@ (at your option) any later version. On Debian GNU/Linux systems, the complete text of the GNU General -Public License can be found in '/usr/share/common-licenses/GPL'. +Public License can be found in '/usr/share/common-licenses/GPL-2'. diff -Nru hibernate-2.0.git20100603~ppa5~precise1/debian/gbp.conf hibernate-2.0+15+g88d54a8/debian/gbp.conf --- hibernate-2.0.git20100603~ppa5~precise1/debian/gbp.conf 1970-01-01 00:00:00.000000000 +0000 +++ hibernate-2.0+15+g88d54a8/debian/gbp.conf 2016-01-10 23:36:03.000000000 +0000 @@ -0,0 +1,2 @@ +[DEFAULT] +pristine-tar = True diff -Nru hibernate-2.0.git20100603~ppa5~precise1/debian/hibernate.dirs hibernate-2.0+15+g88d54a8/debian/hibernate.dirs --- hibernate-2.0.git20100603~ppa5~precise1/debian/hibernate.dirs 2010-09-12 20:50:57.000000000 +0000 +++ hibernate-2.0+15+g88d54a8/debian/hibernate.dirs 2016-01-10 23:36:03.000000000 +0000 @@ -1,3 +1,4 @@ etc/logrotate.d etc/hibernate/scriptlets.d +usr/sbin usr/share/bug/hibernate diff -Nru hibernate-2.0.git20100603~ppa5~precise1/debian/hibernate.install hibernate-2.0+15+g88d54a8/debian/hibernate.install --- hibernate-2.0.git20100603~ppa5~precise1/debian/hibernate.install 2010-09-12 20:50:57.000000000 +0000 +++ hibernate-2.0+15+g88d54a8/debian/hibernate.install 2016-01-10 23:36:03.000000000 +0000 @@ -1,4 +1,3 @@ -hibernate /usr/sbin/ conf/hibernate.conf /etc/hibernate/ conf/ram.conf /etc/hibernate/ conf/disk.conf /etc/hibernate/ @@ -11,4 +10,3 @@ conf/common.conf /etc/hibernate/ blacklisted-modules /etc/hibernate/ scriptlets.d/ /usr/share/hibernate/ -module.d/hibernate /usr/lib/pm-utils/module.d/ diff -Nru hibernate-2.0.git20100603~ppa5~precise1/debian/hibernate.maintscript hibernate-2.0+15+g88d54a8/debian/hibernate.maintscript --- hibernate-2.0.git20100603~ppa5~precise1/debian/hibernate.maintscript 1970-01-01 00:00:00.000000000 +0000 +++ hibernate-2.0+15+g88d54a8/debian/hibernate.maintscript 2016-01-10 23:36:03.000000000 +0000 @@ -0,0 +1,2 @@ +mv_conffile /etc/hibernate/suspend2.conf /etc/hibernate/tuxonice.conf 1.99-1.1 +rm_conffile /etc/init.d/hibernate 1.99-1.1 diff -Nru hibernate-2.0.git20100603~ppa5~precise1/debian/hibernate.postinst hibernate-2.0+15+g88d54a8/debian/hibernate.postinst --- hibernate-2.0.git20100603~ppa5~precise1/debian/hibernate.postinst 2010-09-12 20:50:57.000000000 +0000 +++ hibernate-2.0+15+g88d54a8/debian/hibernate.postinst 2016-01-10 23:36:03.000000000 +0000 @@ -1,4 +1,4 @@ -#!/bin/sh -eu +#!/bin/sh # # Post-install script for Debian hibernate package # @@ -11,6 +11,9 @@ # $Id$ # +set -e +set -u + if [ "${1:-}" = configure ]; then mkdir --parent /usr/local/share/hibernate/scriptlets.d || : fi diff -Nru hibernate-2.0.git20100603~ppa5~precise1/debian/hibernate.prerm hibernate-2.0+15+g88d54a8/debian/hibernate.prerm --- hibernate-2.0.git20100603~ppa5~precise1/debian/hibernate.prerm 2010-09-12 20:50:57.000000000 +0000 +++ hibernate-2.0+15+g88d54a8/debian/hibernate.prerm 2016-01-10 23:36:03.000000000 +0000 @@ -1,4 +1,4 @@ -#! /bin/sh -eu +#!/bin/sh # # Pre-removal hook script for hibernate # @@ -11,6 +11,9 @@ # $Id$ # +set -e +set -u + if [ "${1:-}" = remove ]; then rmdir --ignore-fail-on-non-empty --parents \ /usr/local/share/hibernate/scriptlets.d 2>/dev/null || : diff -Nru hibernate-2.0.git20100603~ppa5~precise1/debian/NEWS hibernate-2.0+15+g88d54a8/debian/NEWS --- hibernate-2.0.git20100603~ppa5~precise1/debian/NEWS 2010-09-12 20:50:57.000000000 +0000 +++ hibernate-2.0+15+g88d54a8/debian/NEWS 2016-01-10 23:36:03.000000000 +0000 @@ -1,4 +1,4 @@ -hibernate (1.90-1) unstable; urgency=low +hibernate (1.91-1) unstable; urgency=low This version of hibernate introduces significant changes to the configuration file structure. Previously, /etc/hibernate/hibernate.conf was diff -Nru hibernate-2.0.git20100603~ppa5~precise1/debian/patches/10-grub-backup.disabled hibernate-2.0+15+g88d54a8/debian/patches/10-grub-backup.disabled --- hibernate-2.0.git20100603~ppa5~precise1/debian/patches/10-grub-backup.disabled 2010-09-12 20:50:57.000000000 +0000 +++ hibernate-2.0+15+g88d54a8/debian/patches/10-grub-backup.disabled 1970-01-01 00:00:00.000000000 +0000 @@ -1,63 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 10-grub-backup.dpatch by martin f. krafft -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Moves the grub menu.lst backup file to /var/backups . - -@DPATCH@ -diff -urNad upstream.trunk~/common.conf upstream.trunk/common.conf ---- upstream.trunk~/common.conf 2006-09-13 15:17:41.000000000 +0200 -+++ upstream.trunk/common.conf 2006-09-13 15:17:52.000000000 +0200 -@@ -54,7 +54,7 @@ - # ChangeGrubMenu yes - # GrubMenuFile /boot/grub/menu.lst - # AlternateGrubMenuFile /boot/grub/menu-suspended.lst --# BackupGrubMenuFile /boot/grub/menu.lst.hibernate.bak -+# BackupGrubMenuFile /var/backups/grub.conf.hibernate - - ### hardware_tweaks - # IbmAcpi yes -diff -urNad upstream.trunk~/scriptlets.d/grub upstream.trunk/scriptlets.d/grub ---- upstream.trunk~/scriptlets.d/grub 2006-09-13 15:16:38.000000000 +0200 -+++ upstream.trunk/scriptlets.d/grub 2006-09-13 15:17:44.000000000 +0200 -@@ -1,18 +1,20 @@ - # -*- sh -*- - # vim:ft=sh:ts=8:sw=4:noet - -+GRUB_MENU_DFLT_BACKUP_FILE="/var/backups/grub.conf.hibernate" -+ - AddConfigHandler GrubConfigOptions - AddConfigHelp "ChangeGrubMenu " "Change grub's config file to show system is suspended before suspending and restore after resume." - AddConfigHelp "GrubMenuFile " "Filename of grub's config file. Default is /boot/grub/grub.conf." - AddConfigHelp "AlternateGrubMenuFile " "Filename of the grub config file to put in place when the machine is suspended. If this is not specified, the script will add a small header to the existing grub menu." --AddConfigHelp "BackupGrubMenuFile " "Where to keep a backup of your real grub menu file. Defaults to the current grub menu file with '.hibernate.bak' appended." -+AddConfigHelp "BackupGrubMenuFile " "Where to keep a backup of your real grub menu file. Defaults to ${GRUB_MENU_DFLT_BACKUP_FILE}." - - AddOptionHandler GrubCmdlineOptions - AddShortOption 'g' - AddLongOption 'restore-grub' - AddOptionHelp '-g, --restore-grub' 'Restores the grub menu to normal (use if a resume was not completed sucessfully) and exits the script. A suspend is not performed.' - --GRUB_MENU_FILE="/boot/grub/grub.conf" -+GRUB_MENU_FILE="/boot/grub/menu.lst" - - GRUB_BEGIN_SENTINEL="### BEGIN HIBERNATE SENTINEL" - GRUB_END_SENTINEL="### END HIBERNATE SENTINEL" -@@ -25,7 +27,7 @@ - vecho 2 "Changing grub menu..." - - # Make a backup, and abort if we fail to. -- if ! cp "$GRUB_MENU_FILE" "${BACKUP_GRUB_MENU_FILE:-$GRUB_MENU_FILE.hibernate.bak}" ; then -+ if ! cp "$GRUB_MENU_FILE" "${BACKUP_GRUB_MENU_FILE:-$GRUB_MENU_DFLT_BACKUP_FILE}" ; then - vecho 0 "Could not make backup of grub menu. Not changing!" - return 1 # abort if not forced - fi -@@ -65,7 +67,7 @@ - $GRUB_MENU_FILE > $GRUB_MENU_FILE.hibernate.new \ - && mv $GRUB_MENU_FILE.hibernate.new $GRUB_MENU_FILE - else -- mv "${BACKUP_GRUB_MENU_FILE:-$GRUB_MENU_FILE.hibernate.bak}" "$GRUB_MENU_FILE" -+ mv "${BACKUP_GRUB_MENU_FILE:-$GRUB_MENU_DFLT_BACKUP_FILE}" "$GRUB_MENU_FILE" - fi - fi - } diff -Nru hibernate-2.0.git20100603~ppa5~precise1/debian/patches/10-grub-backup.patch hibernate-2.0+15+g88d54a8/debian/patches/10-grub-backup.patch --- hibernate-2.0.git20100603~ppa5~precise1/debian/patches/10-grub-backup.patch 1970-01-01 00:00:00.000000000 +0000 +++ hibernate-2.0+15+g88d54a8/debian/patches/10-grub-backup.patch 2016-01-10 23:36:03.000000000 +0000 @@ -0,0 +1,39 @@ +Description: Moves the grub menu.lst backup file to /var/backups +Author: martin f. krafft +Last-Update: 2012-05-01 + +--- a/scriptlets.d/grub ++++ b/scriptlets.d/grub +@@ -1,11 +1,13 @@ + # -*- sh -*- + # vim:ft=sh:ts=8:sw=4:noet + ++GRUB_MENU_DFLT_BACKUP_FILE="/var/backups/grub.conf.hibernate" ++ + AddConfigHandler GrubConfigOptions + AddConfigHelp "ChangeGrubMenu " "Change grub's config file to show system is suspended before suspending and restore after resume." + AddConfigHelp "GrubMenuFile " "Filename of grub's config file. Default is /boot/grub/grub.conf." + AddConfigHelp "AlternateGrubMenuFile " "Filename of the grub config file to put in place when the machine is suspended. If this is not specified, the script will add a small header to the existing grub menu." +-AddConfigHelp "BackupGrubMenuFile " "Where to keep a backup of your real grub menu file. Defaults to the current grub menu file with '.hibernate.bak' appended." ++AddConfigHelp "BackupGrubMenuFile " "Where to keep a backup of your real grub menu file. Defaults to ${GRUB_MENU_DFLT_BACKUP_FILE}." + + AddOptionHandler GrubCmdlineOptions + AddShortOption 'g' +@@ -25,7 +27,7 @@ + vecho 2 "Changing grub menu..." + + # Make a backup, and abort if we fail to. +- if ! cp "$GRUB_MENU_FILE" "${BACKUP_GRUB_MENU_FILE:-$GRUB_MENU_FILE.hibernate.bak}" ; then ++ if ! cp "$GRUB_MENU_FILE" "${BACKUP_GRUB_MENU_FILE:-$GRUB_MENU_DFLT_BACKUP_FILE}" ; then + vecho 0 "Could not make backup of grub menu. Not changing!" + return 1 # abort if not forced + fi +@@ -65,7 +67,7 @@ + $GRUB_MENU_FILE > $GRUB_MENU_FILE.hibernate.new \ + && mv $GRUB_MENU_FILE.hibernate.new $GRUB_MENU_FILE + else +- mv "${BACKUP_GRUB_MENU_FILE:-$GRUB_MENU_FILE.hibernate.bak}" "$GRUB_MENU_FILE" ++ mv "${BACKUP_GRUB_MENU_FILE:-$GRUB_MENU_DFLT_BACKUP_FILE}" "$GRUB_MENU_FILE" + fi + fi + } diff -Nru hibernate-2.0.git20100603~ppa5~precise1/debian/patches/50-init.d-lsb-depends.disabled hibernate-2.0+15+g88d54a8/debian/patches/50-init.d-lsb-depends.disabled --- hibernate-2.0.git20100603~ppa5~precise1/debian/patches/50-init.d-lsb-depends.disabled 2010-09-12 20:50:57.000000000 +0000 +++ hibernate-2.0+15+g88d54a8/debian/patches/50-init.d-lsb-depends.disabled 1970-01-01 00:00:00.000000000 +0000 @@ -1,19 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 50-init.d-lsb-depends.dpatch by martin f. krafft -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. - -@DPATCH@ -diff -urNad upstream.trunk~/init.d/hibernate-cleanup.sh upstream.trunk/init.d/hibernate-cleanup.sh ---- upstream.trunk~/init.d/hibernate-cleanup.sh 2007-06-23 18:22:03.000000000 +0100 -+++ upstream.trunk/init.d/hibernate-cleanup.sh 2007-06-23 18:22:48.000000000 +0100 -@@ -20,6 +20,8 @@ - # Default-Stop: - # Required-Start: - # Required-Stop: -+# Should-Start: udev devfsd raid2 mdadm lvm evms cryptdisks -+# X-Start-Before: mountall - # Short-Description: invalidates stale swsusp and TuxOnIce image - # Description: This script invalidates any stale swsusp and TuxOnIce images. It - # searches all swap partitions on your machine, as well as diff -Nru hibernate-2.0.git20100603~ppa5~precise1/debian/patches/50-init.d-lsb-depends.patch hibernate-2.0+15+g88d54a8/debian/patches/50-init.d-lsb-depends.patch --- hibernate-2.0.git20100603~ppa5~precise1/debian/patches/50-init.d-lsb-depends.patch 1970-01-01 00:00:00.000000000 +0000 +++ hibernate-2.0+15+g88d54a8/debian/patches/50-init.d-lsb-depends.patch 2016-01-10 23:36:03.000000000 +0000 @@ -0,0 +1,15 @@ +Description: Add Should-Start and X-Start-Before initscript headers +Author: martin f. krafft +Last-Update: 2012-02-11 + +--- a/init.d/hibernate-cleanup.sh ++++ b/init.d/hibernate-cleanup.sh +@@ -20,6 +20,8 @@ + # Default-Stop: + # Required-Start: + # Required-Stop: ++# Should-Start: udev devfsd raid2 mdadm-raid lvm evms cryptdisks ++# X-Start-Before: mountall + # Short-Description: invalidates stale swsusp and TuxOnIce image + # Description: This script invalidates any stale swsusp and TuxOnIce images. It + # searches all swap partitions on your machine, as well as diff -Nru hibernate-2.0.git20100603~ppa5~precise1/debian/patches/70-laptop-mode-rename.disabled hibernate-2.0+15+g88d54a8/debian/patches/70-laptop-mode-rename.disabled --- hibernate-2.0.git20100603~ppa5~precise1/debian/patches/70-laptop-mode-rename.disabled 2010-09-12 20:50:57.000000000 +0000 +++ hibernate-2.0+15+g88d54a8/debian/patches/70-laptop-mode-rename.disabled 1970-01-01 00:00:00.000000000 +0000 @@ -1,19 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 99-debian-misc.dpatch by martin f. krafft -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Change laptop-mode init.d script name. - -@DPATCH@ -diff -urNad hibernate-1.91~/common.conf hibernate-1.91/common.conf ---- hibernate-1.91~/common.conf 2006-06-05 14:13:19.328072919 +0200 -+++ hibernate-1.91/common.conf 2006-06-05 14:13:26.517094913 +0200 -@@ -99,7 +99,7 @@ - # IncompatiblePrograms xmms - - ### services --# RestartServices laptop_mode anacron -+# RestartServices laptop-mode anacron - # StopServices alsasound - # StartServices aumix - diff -Nru hibernate-2.0.git20100603~ppa5~precise1/debian/patches/70-laptop-mode-rename.patch hibernate-2.0+15+g88d54a8/debian/patches/70-laptop-mode-rename.patch --- hibernate-2.0.git20100603~ppa5~precise1/debian/patches/70-laptop-mode-rename.patch 1970-01-01 00:00:00.000000000 +0000 +++ hibernate-2.0+15+g88d54a8/debian/patches/70-laptop-mode-rename.patch 2016-01-10 23:36:03.000000000 +0000 @@ -0,0 +1,15 @@ +Description: Change laptop-mode init.d script name. +Author: martin f. krafft +Last-Update: 2012-02-11 + +--- a/conf/common.conf ++++ b/conf/common.conf +@@ -121,7 +121,7 @@ + # IncompatiblePrograms xmms + + ### services +-# RestartServices laptop_mode anacron ++# RestartServices laptop-mode anacron + # StopServices alsasound + # StartServices aumix + diff -Nru hibernate-2.0.git20100603~ppa5~precise1/debian/patches/80-log-permissions.disabled hibernate-2.0+15+g88d54a8/debian/patches/80-log-permissions.disabled --- hibernate-2.0.git20100603~ppa5~precise1/debian/patches/80-log-permissions.disabled 2010-09-12 20:50:57.000000000 +0000 +++ hibernate-2.0+15+g88d54a8/debian/patches/80-log-permissions.disabled 1970-01-01 00:00:00.000000000 +0000 @@ -1,35 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 80-log-permissions.dpatch by martin f. krafft -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. - -@DPATCH@ -diff -urNad upstream.trunk~/hibernate.sh upstream.trunk/hibernate.sh ---- upstream.trunk~/hibernate.sh 2006-08-07 23:56:03.000000000 +0100 -+++ upstream.trunk/hibernate.sh 2006-08-08 11:45:52.198837598 +0100 -@@ -826,7 +826,14 @@ - ParseOptions "$@" - - # Set a logfile if we need one. --[ -n "$LOGFILE" ] && LOGPIPE="tee -a -i $LOGFILE" -+if [ -n "$LOGFILE" ]; then -+ if [ ! -f "$LOGFILE" ]; then -+ touch "$LOGFILE" -+ chmod 644 "$LOGFILE" -+ chown root:adm "$LOGFILE" -+ fi -+ LOGPIPE="tee -a -i $LOGFILE" -+fi - - # Redirect everything to a given VT if we've been given one - if [ -n "$SWSUSPVT" ] && [ -c /dev/tty$SWSUSPVT ] ; then -diff -urNad upstream.trunk~/logrotate.d-hibernate-script upstream.trunk/logrotate.d-hibernate-script ---- upstream.trunk~/logrotate.d-hibernate-script 2006-08-07 23:56:03.000000000 +0100 -+++ upstream.trunk/logrotate.d-hibernate-script 2006-08-08 11:46:11.439702283 +0100 -@@ -3,4 +3,5 @@ - rotate 5 - size 100k - weekly -+ notifempty - } diff -Nru hibernate-2.0.git20100603~ppa5~precise1/debian/patches/80-log-permissions.patch hibernate-2.0+15+g88d54a8/debian/patches/80-log-permissions.patch --- hibernate-2.0.git20100603~ppa5~precise1/debian/patches/80-log-permissions.patch 1970-01-01 00:00:00.000000000 +0000 +++ hibernate-2.0+15+g88d54a8/debian/patches/80-log-permissions.patch 2016-01-10 23:36:03.000000000 +0000 @@ -0,0 +1,28 @@ +Author: martin f. krafft + +--- a/hibernate.sh ++++ b/hibernate.sh +@@ -876,7 +876,14 @@ + ParseOptions "$@" + + # Set a logfile if we need one. +-[ -n "$LOGFILE" ] && LOGPIPE="tee -a -i $LOGFILE" ++if [ -n "$LOGFILE" ]; then ++ if [ ! -f "$LOGFILE" ]; then ++ touch "$LOGFILE" ++ chmod 644 "$LOGFILE" ++ chown root:adm "$LOGFILE" ++ fi ++ LOGPIPE="tee -a -i $LOGFILE" ++fi + + # Redirect everything to a given VT if we've been given one + if [ -n "$SWSUSPVT" ] && [ -c /dev/tty$SWSUSPVT ] ; then +--- a/logrotate.d-hibernate-script ++++ b/logrotate.d-hibernate-script +@@ -3,4 +3,5 @@ + rotate 5 + size 100k + weekly ++ notifempty + } diff -Nru hibernate-2.0.git20100603~ppa5~precise1/debian/patches/99-store-ifdown-auto.disabled hibernate-2.0+15+g88d54a8/debian/patches/99-store-ifdown-auto.disabled --- hibernate-2.0.git20100603~ppa5~precise1/debian/patches/99-store-ifdown-auto.disabled 2010-09-12 20:50:57.000000000 +0000 +++ hibernate-2.0+15+g88d54a8/debian/patches/99-store-ifdown-auto.disabled 1970-01-01 00:00:00.000000000 +0000 @@ -1,136 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 99-store-ifdown-auto.dpatch by martin f. krafft -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. - -@DPATCH@ -diff -urNad upstream.trunk~/scriptlets.d/network upstream.trunk/scriptlets.d/network ---- upstream.trunk~/scriptlets.d/network 2007-07-09 17:34:28.000000000 +0200 -+++ upstream.trunk/scriptlets.d/network 2007-07-09 17:46:09.000000000 +0200 -@@ -30,9 +30,7 @@ - [ "$int" = "lo" ] && continue - fi - vecho 2 "Bringing down interface $int" -- network_ifdown $int -- [ $? -ne 0 ] && ret=1 -- NETWORK_DOWNEDIFS="$int $NETWORK_DOWNEDIFS" -+ NETWORK_DOWNEDIFS="$(network_ifdown $int) $NETWORK_DOWNEDIFS" || ret=$? - done - return $ret - } -@@ -95,7 +93,9 @@ - [ -x "/etc/init.d/net.$1" ] && /etc/init.d/net.$1 start - } - network_ifdown() { -- [ -x "/etc/init.d/net.$1" ] && /etc/init.d/net.$1 stop -+ [ -x "/etc/init.d/net.$1" ] && /etc/init.d/net.$1 stop \ -+ || return $? -+ echo $1 - } - ;; - suse) -@@ -103,7 +103,8 @@ - /etc/init.d/network start - } - network_ifdown() { -- /etc/init.d/network stop -+ /etc/init.d/network stop || return $? -+ echo all - } - NETWORK_CALL_ONCE=1 - ;; -@@ -113,15 +114,20 @@ - --startas /sbin/ifup --name "hibernate_ifup_$1" -- $* - } - network_ifdown() { -- /sbin/ifdown $* -- } -+ STDERR="$(/sbin/ifdown $1 2>&1 1>/dev/null)" || return $? -+ case "$STDERR" in -+ "/sbin/ifdown: interface $1 not configured") :;; -+ *) echo $1;; -+ esac -+ } - ;; - mandrake|fedora|redhat) - network_ifup() { - /sbin/ifup $* - } - network_ifdown() { -- /sbin/ifdown $* -+ /sbin/ifdown $* || return $? -+ echo $* - } - ;; - slackware) -@@ -129,7 +135,8 @@ - /etc/rc.d/rc.inet1 start - } - network_ifdown() { -- /etc/rc.d/rc.inet1 stop -+ /etc/rc.d/rc.inet1 stop || return $? -+ echo all - } - NETWORK_CALL_ONCE=1 - ;; -@@ -140,28 +147,35 @@ - /sbin/ifup $* - } - network_ifdown() { -- /sbin/ifdown $* -+ STDERR="$(/sbin/ifdown $1 2>&1 1>/dev/null)" || return $? -+ case "$STDERR" in -+ "/sbin/ifdown: interface $1 not configured") :;; -+ *) echo $1;; -+ esac - } - elif [ -x "/etc/init.d/ifup" ] ; then - network_ifup() { - /etc/init.d/ifup $* - } - network_ifdown() { -- /etc/init.d/ifdown $* -+ /etc/init.d/ifdown $* || return $? -+ echo $* - } - elif [ -x "/etc/sysconfig/network-scripts/ifup" ] ; then - network_ifup() { - /etc/sysconfig/network-scripts/ifup $* - } - network_ifdown() { -- /etc/sysconfig/network-scripts/ifdown $* -+ /etc/sysconfig/network-scripts/ifdown $* || return $? -+ echo $* - } - elif [ -x "/etc/init.d/networking" ] ; then - network_ifup() { - /etc/init.d/networking start - } - network_ifdown() { -- /etc/init.d/networking stop -+ /etc/init.d/networking stop || return $? -+ echo all - } - NETWORK_CALL_ONCE=1 - elif [ -x "/etc/init.d/network" ] ; then -@@ -169,7 +183,8 @@ - /etc/init.d/network start - } - network_ifdown() { -- /etc/init.d/network stop -+ /etc/init.d/network stop || return $? -+ echo all - } - NETWORK_CALL_ONCE=1 - else -@@ -177,7 +192,8 @@ - /sbin/ifconfig $1 up - } - network_ifdown() { -- /sbin/ifconfig $1 down -+ /sbin/ifconfig $1 down || return $? -+ echo $1 - } - fi - esac diff -Nru hibernate-2.0.git20100603~ppa5~precise1/debian/patches/99-store-ifdown-auto.patch hibernate-2.0+15+g88d54a8/debian/patches/99-store-ifdown-auto.patch --- hibernate-2.0.git20100603~ppa5~precise1/debian/patches/99-store-ifdown-auto.patch 1970-01-01 00:00:00.000000000 +0000 +++ hibernate-2.0+15+g88d54a8/debian/patches/99-store-ifdown-auto.patch 2016-01-10 23:36:03.000000000 +0000 @@ -0,0 +1,130 @@ +Author: martin f. krafft + +--- a/scriptlets.d/network ++++ b/scriptlets.d/network +@@ -30,9 +30,7 @@ + [ "$int" = "lo" ] && continue + fi + vecho 2 "Bringing down interface $int" +- network_ifdown $int +- [ $? -ne 0 ] && ret=1 +- NETWORK_DOWNEDIFS="$int $NETWORK_DOWNEDIFS" ++ NETWORK_DOWNEDIFS="$(network_ifdown $int) $NETWORK_DOWNEDIFS" || ret=$? + done + return $ret + } +@@ -103,7 +101,9 @@ + [ -x "/etc/init.d/net.$1" ] && /etc/init.d/net.$1 start + } + network_ifdown() { +- [ -x "/etc/init.d/net.$1" ] && /etc/init.d/net.$1 stop ++ [ -x "/etc/init.d/net.$1" ] && /etc/init.d/net.$1 stop \ ++ || return $? ++ echo $1 + } + ;; + suse) +@@ -111,7 +111,8 @@ + /etc/init.d/network start + } + network_ifdown() { +- /etc/init.d/network stop ++ /etc/init.d/network stop || return $? ++ echo all + } + NETWORK_CALL_ONCE=1 + ;; +@@ -121,15 +122,20 @@ + --startas /sbin/ifup --name "hibernate_ifup_$1" -- $* + } + network_ifdown() { +- /sbin/ifdown $* +- } ++ STDERR="$(/sbin/ifdown $1 2>&1 1>/dev/null)" || return $? ++ case "$STDERR" in ++ "/sbin/ifdown: interface $1 not configured") :;; ++ *) echo $1;; ++ esac ++ } + ;; + mandrake|fedora|redhat) + network_ifup() { + /sbin/ifup $* + } + network_ifdown() { +- /sbin/ifdown $* ++ /sbin/ifdown $* || return $? ++ echo $* + } + ;; + slackware) +@@ -137,7 +143,8 @@ + /etc/rc.d/rc.inet1 start + } + network_ifdown() { +- /etc/rc.d/rc.inet1 stop ++ /etc/rc.d/rc.inet1 stop || return $? ++ echo all + } + NETWORK_CALL_ONCE=1 + ;; +@@ -148,28 +155,35 @@ + /sbin/ifup $* + } + network_ifdown() { +- /sbin/ifdown $* ++ STDERR="$(/sbin/ifdown $1 2>&1 1>/dev/null)" || return $? ++ case "$STDERR" in ++ "/sbin/ifdown: interface $1 not configured") :;; ++ *) echo $1;; ++ esac + } + elif [ -x "/etc/init.d/ifup" ] ; then + network_ifup() { + /etc/init.d/ifup $* + } + network_ifdown() { +- /etc/init.d/ifdown $* ++ /etc/init.d/ifdown $* || return $? ++ echo $* + } + elif [ -x "/etc/sysconfig/network-scripts/ifup" ] ; then + network_ifup() { + /etc/sysconfig/network-scripts/ifup $* + } + network_ifdown() { +- /etc/sysconfig/network-scripts/ifdown $* ++ /etc/sysconfig/network-scripts/ifdown $* || return $? ++ echo $* + } + elif [ -x "/etc/init.d/networking" ] ; then + network_ifup() { + /etc/init.d/networking start + } + network_ifdown() { +- /etc/init.d/networking stop ++ /etc/init.d/networking stop || return $? ++ echo all + } + NETWORK_CALL_ONCE=1 + elif [ -x "/etc/init.d/network" ] ; then +@@ -177,7 +191,8 @@ + /etc/init.d/network start + } + network_ifdown() { +- /etc/init.d/network stop ++ /etc/init.d/network stop || return $? ++ echo all + } + NETWORK_CALL_ONCE=1 + else +@@ -185,7 +200,8 @@ + /sbin/ifconfig $1 up + } + network_ifdown() { +- /sbin/ifconfig $1 down ++ /sbin/ifconfig $1 down || return $? ++ echo $1 + } + fi + esac diff -Nru hibernate-2.0.git20100603~ppa5~precise1/debian/patches/blacklisted-modules-3.x.patch hibernate-2.0+15+g88d54a8/debian/patches/blacklisted-modules-3.x.patch --- hibernate-2.0.git20100603~ppa5~precise1/debian/patches/blacklisted-modules-3.x.patch 1970-01-01 00:00:00.000000000 +0000 +++ hibernate-2.0+15+g88d54a8/debian/patches/blacklisted-modules-3.x.patch 2016-01-10 23:36:03.000000000 +0000 @@ -0,0 +1,51 @@ +Description: Replace 2.6.99 with 3.99.0 in blacklisted-modules +Author: Andrey Rahmatullin +Last-Update: 2012-05-01 + +diff --git a/blacklisted-modules b/blacklisted-modules +index 4400b37..bb69889 100644 +--- a/blacklisted-modules ++++ b/blacklisted-modules +@@ -27,14 +27,14 @@ acx_pci + hsfmodem + prism54 + +-bcm4400 2.6.0 2.6.99 +-emu10k1 2.4.0 2.4.99 2.6.0 2.6.99 +-forcedeth 2.4.0 2.4.99 2.6.0 2.6.99 ++bcm4400 2.6.0 3.99.0 ++emu10k1 2.4.0 2.4.99 2.6.0 3.99.0 ++forcedeth 2.4.0 2.4.99 2.6.0 3.99.0 + @ipw2100 0.0 1.0.2 + @ipw2200 0.0 0.20 +-natsemi 2.6.0 2.6.99 ++natsemi 2.6.0 3.99.0 + psmouse 2.6.0 2.6.19 +-rt2400 2.4.0 2.4.99 2.6.0 2.6.99 ++rt2400 2.4.0 2.4.99 2.6.0 3.99.0 + ehci_hcd 2.6.0 2.6.14 + ohci_hcd 2.6.0 2.6.14 + uhci_hcd 2.6.0 2.6.14 +@@ -45,16 +45,16 @@ snd_ens1370 2.6.0 2.6.19 + snd_ens1371 2.6.0 2.6.19 + snd_maestro3 2.6.0 2.6.19 + @snd_bt_sco 0.0 1.18 +-en1370 2.6.0 2.6.99 +-en1371 2.6.0 2.6.99 ++en1370 2.6.0 3.99.0 ++en1371 2.6.0 3.99.0 + via_agp 2.6.0 2.6.8 +-via_rhine 2.6.0 2.6.99 +-i8042 2.6.10 2.6.99 +-intel_mch_agp 2.6.0 2.6.99 ++via_rhine 2.6.0 3.99.0 ++i8042 2.6.10 3.99.0 ++intel_mch_agp 2.6.0 3.99.0 + rt2500 2.6.0 2.6.14 + + button 2.6.9 2.6.22 +-speedstep_smi 2.6.12 2.6.99 ++speedstep_smi 2.6.12 3.99.0 + + @ndiswrapper 0.10 0.11 + diff -Nru hibernate-2.0.git20100603~ppa5~precise1/debian/patches/fix-grub-config-name.patch hibernate-2.0+15+g88d54a8/debian/patches/fix-grub-config-name.patch --- hibernate-2.0.git20100603~ppa5~precise1/debian/patches/fix-grub-config-name.patch 1970-01-01 00:00:00.000000000 +0000 +++ hibernate-2.0+15+g88d54a8/debian/patches/fix-grub-config-name.patch 2016-01-10 23:36:03.000000000 +0000 @@ -0,0 +1,46 @@ +Description: Update the default GRUB config name for GRUB2. +Author: Andrey Rahmatullin +Bug-Debian: http://bugs.debian.org/512112 +Last-Update: 2012-05-01 + +--- a/conf/common.conf ++++ b/conf/common.conf +@@ -53,9 +53,9 @@ + + ### grub + # ChangeGrubMenu yes +-# GrubMenuFile /boot/grub/menu.lst +-# AlternateGrubMenuFile /boot/grub/menu-suspended.lst +-# BackupGrubMenuFile /boot/grub/menu.lst.hibernate.bak ++# GrubMenuFile /boot/grub/grub.cfg ++# AlternateGrubMenuFile /boot/grub/grub-suspended.cfg ++# BackupGrubMenuFile /var/backups/grub.cfg.hibernate + + # see http://bugs.debian.org/317479 + # RemountXFSBoot yes +--- a/scriptlets.d/grub ++++ b/scriptlets.d/grub +@@ -1,11 +1,12 @@ + # -*- sh -*- + # vim:ft=sh:ts=8:sw=4:noet + +-GRUB_MENU_DFLT_BACKUP_FILE="/var/backups/grub.conf.hibernate" ++GRUB_MENU_FILE="/boot/grub/grub.cfg" ++GRUB_MENU_DFLT_BACKUP_FILE="/var/backups/grub.cfg.hibernate" + + AddConfigHandler GrubConfigOptions + AddConfigHelp "ChangeGrubMenu " "Change grub's config file to show system is suspended before suspending and restore after resume." +-AddConfigHelp "GrubMenuFile " "Filename of grub's config file. Default is /boot/grub/grub.conf." ++AddConfigHelp "GrubMenuFile " "Filename of grub's config file. Default is ${GRUB_MENU_FILE}." + AddConfigHelp "AlternateGrubMenuFile " "Filename of the grub config file to put in place when the machine is suspended. If this is not specified, the script will add a small header to the existing grub menu." + AddConfigHelp "BackupGrubMenuFile " "Where to keep a backup of your real grub menu file. Defaults to ${GRUB_MENU_DFLT_BACKUP_FILE}." + +@@ -14,8 +15,6 @@ + AddLongOption 'restore-grub' + AddOptionHelp '-g, --restore-grub' 'Restores the grub menu to normal (use if a resume was not completed sucessfully) and exits the script. A suspend is not performed.' + +-GRUB_MENU_FILE="/boot/grub/grub.conf" +- + GRUB_BEGIN_SENTINEL="### BEGIN HIBERNATE SENTINEL" + GRUB_END_SENTINEL="### END HIBERNATE SENTINEL" + diff -Nru hibernate-2.0.git20100603~ppa5~precise1/debian/patches/fix-manpage-parentheses.patch hibernate-2.0+15+g88d54a8/debian/patches/fix-manpage-parentheses.patch --- hibernate-2.0.git20100603~ppa5~precise1/debian/patches/fix-manpage-parentheses.patch 1970-01-01 00:00:00.000000000 +0000 +++ hibernate-2.0+15+g88d54a8/debian/patches/fix-manpage-parentheses.patch 2016-01-10 23:36:03.000000000 +0000 @@ -0,0 +1,16 @@ +Description: Fix a typo in hibernate.conf(5) +Author: Aditya Vaidya +Bug-Debian: http://bugs.debian.org/668978 +Last-Update: 2012-04-22 + +--- hibernate-1.99~/gen-manpages.sh 2008-05-01 07:00:21.000000000 -0500 ++++ hibernate-1.99/gen-manpages.sh 2012-04-02 17:53:17.888038183 -0500 +@@ -161,7 +161,7 @@ + reads its configuration from the + .I /etc/hibernate/hibernate.conf + file when it runs (unless an alternative configuration file is +-specified on the command line. ++specified on the command line). + .PP + If configuration directives are specified multiple times, typically + the last one will take effect. diff -Nru hibernate-2.0.git20100603~ppa5~precise1/debian/patches/fix-s2ram-options.patch hibernate-2.0+15+g88d54a8/debian/patches/fix-s2ram-options.patch --- hibernate-2.0.git20100603~ppa5~precise1/debian/patches/fix-s2ram-options.patch 1970-01-01 00:00:00.000000000 +0000 +++ hibernate-2.0+15+g88d54a8/debian/patches/fix-s2ram-options.patch 2016-01-10 23:36:03.000000000 +0000 @@ -0,0 +1,42 @@ +Description: Fix option names for s2ram and apply s2ram options to s2both. +Bug-Debian: http://bugs.debian.org/505410 +Origin: vendor, http://bugs.debian.org/505410#5 +Last-Update: 2012-05-01 + +diff --git a/scriptlets.d/ususpend b/scriptlets.d/ususpend +index 25d9aa5..edf801e 100644 +--- a/scriptlets.d/ususpend ++++ b/scriptlets.d/ususpend +@@ -33,10 +33,7 @@ USuspendConfigEnabler() { + case "$1" in + ususpendmethod) + case "$2" in +- disk|both) USUSPEND_PROG=s2$2;; +- ram) +- USUSPEND_PROG=s2ram +- ;; ++ disk|both|ram) USUSPEND_PROG=s2$2;; + *) + vecho 1 "$EXE: Invalid value fo USuspendMethod." + return 2 +@@ -104,13 +101,13 @@ USuspendOptionHandler() { + DoUSuspend() { + if [ -z "$USUSPEND_NO_SUSPEND" ] ; then + ARGS= +- if [ "$USUSPEND_PROG" = s2ram ]; then +- [ $USUSPEND_RAM_FORCE -eq 1 ] && ARGS="$ARGS -f" +- [ $USUSPEND_RAM_VBESAVE -eq 1 ] && ARGS="$ARGS -s" +- [ $USUSPEND_RAM_VBEPOST -eq 1 ] && ARGS="$ARGS -p" +- [ $USUSPEND_RAM_RADEONTOOL -eq 1 ] && ARGS="$ARGS -r" +- [ $USUSPEND_RAM_VBEMODE -eq 1 ] && ARGS="$ARGS -m" +- [ $USUSPEND_RAM_ACPISLEEP -ne 0 ] && ARGS="$ARGS -a $USUSPEND_RAM_ACPISLEEP" ++ if [ "$USUSPEND_PROG" = s2ram -o "$USUSPEND_PROG" = s2both ]; then ++ [ $USUSPEND_RAM_FORCE -eq 1 ] && ARGS="$ARGS --force" ++ [ $USUSPEND_RAM_VBESAVE -eq 1 ] && ARGS="$ARGS --vbe_save" ++ [ $USUSPEND_RAM_VBEPOST -eq 1 ] && ARGS="$ARGS --vbe_post" ++ [ $USUSPEND_RAM_RADEONTOOL -eq 1 ] && ARGS="$ARGS --radeontool" ++ [ $USUSPEND_RAM_VBEMODE -eq 1 ] && ARGS="$ARGS --vbe_mode" ++ [ $USUSPEND_RAM_ACPISLEEP -ne 0 ] && ARGS="$ARGS --acpi_sleep $USUSPEND_RAM_ACPISLEEP" + [ $USUSPEND_RAM_PCISAVE -eq 1 ] && ARGS="$ARGS -v" + fi + vecho 1 "$EXE: Running $USUSPEND_PROG_PATH $ARGS..." diff -Nru hibernate-2.0.git20100603~ppa5~precise1/debian/patches/fix-typos.patch hibernate-2.0+15+g88d54a8/debian/patches/fix-typos.patch --- hibernate-2.0.git20100603~ppa5~precise1/debian/patches/fix-typos.patch 1970-01-01 00:00:00.000000000 +0000 +++ hibernate-2.0+15+g88d54a8/debian/patches/fix-typos.patch 2016-01-10 23:36:03.000000000 +0000 @@ -0,0 +1,26 @@ +Description: Fix some typos in help strings. +Author: Andrey Rahmatullin +Last-Update: 2012-05-01 + +--- a/scriptlets.d/grub ++++ b/scriptlets.d/grub +@@ -13,7 +13,7 @@ + AddOptionHandler GrubCmdlineOptions + AddShortOption 'g' + AddLongOption 'restore-grub' +-AddOptionHelp '-g, --restore-grub' 'Restores the grub menu to normal (use if a resume was not completed sucessfully) and exits the script. A suspend is not performed.' ++AddOptionHelp '-g, --restore-grub' 'Restores the grub menu to normal (use if a resume was not completed successfully) and exits the script. A suspend is not performed.' + + GRUB_BEGIN_SENTINEL="### BEGIN HIBERNATE SENTINEL" + GRUB_END_SENTINEL="### END HIBERNATE SENTINEL" +--- a/scriptlets.d/modules ++++ b/scriptlets.d/modules +@@ -3,7 +3,7 @@ + + AddConfigHandler ModulesOptions + AddConfigHelp "UnloadModules [...]" "Names of modules to unload prior to suspending." +-AddConfigHelp "LoadModules auto| [...]" "Names of modules to load after resumimg. If auto is specified, the modules that were unloaded previously are loaded." ++AddConfigHelp "LoadModules auto| [...]" "Names of modules to load after resuming. If auto is specified, the modules that were unloaded previously are loaded." + AddConfigHelp "UnloadBlacklistedModules " "Try to remove any modules that are known to be incompatible with hibernation prior to suspending." + AddConfigHelp "UnloadAllModules " "Try to remove all modules loaded prior to suspending." + AddConfigHelp "LoadModulesFromFile " "Load default modules after resuming from a given filename. Each module name must appear on its own line, and lines starting with # are ignored. (eg, Debian's /etc/modules, Gentoo's /etc/modules.autoload)" diff -Nru hibernate-2.0.git20100603~ppa5~precise1/debian/patches/fix-userui-path.patch hibernate-2.0+15+g88d54a8/debian/patches/fix-userui-path.patch --- hibernate-2.0.git20100603~ppa5~precise1/debian/patches/fix-userui-path.patch 1970-01-01 00:00:00.000000000 +0000 +++ hibernate-2.0+15+g88d54a8/debian/patches/fix-userui-path.patch 2016-01-10 23:36:03.000000000 +0000 @@ -0,0 +1,19 @@ +Description: Update default userui path to Debian default. +Author: Andrey Rahmatullin +Bug-Debian: http://bugs.debian.org/492392 +Forwarded: not-needed +Last-Update: 2012-04-22 + +diff --git a/conf/tuxonice.conf b/conf/tuxonice.conf +index 4fee3fb..69828ec 100644 +--- a/conf/tuxonice.conf ++++ b/conf/tuxonice.conf +@@ -37,7 +37,7 @@ Encryptor none + # VerifyFilewriterResume2 yes + + ## Specify a userui like this: +-# ProcSetting userui_program /usr/local/sbin/tuxoniceui_text ++# ProcSetting userui_program /usr/lib/tuxonice-userui/tuxoniceui + + # Scale CPU to full speed to make sure we suspend as fast as possible. + FullSpeedCPU yes diff -Nru hibernate-2.0.git20100603~ppa5~precise1/debian/patches/Makefile hibernate-2.0+15+g88d54a8/debian/patches/Makefile --- hibernate-2.0.git20100603~ppa5~precise1/debian/patches/Makefile 2010-09-12 20:50:57.000000000 +0000 +++ hibernate-2.0+15+g88d54a8/debian/patches/Makefile 1970-01-01 00:00:00.000000000 +0000 @@ -1,4 +0,0 @@ -.PHONY: 00list -00list: - find . -maxdepth 1 -name Makefile -prune -o -name 00list -prune -o -type f -print \ - | sed -ne 's,\./\(.*\)\.dpatch,\1,p' | sort -n > $@ diff -Nru hibernate-2.0.git20100603~ppa5~precise1/debian/patches/series hibernate-2.0+15+g88d54a8/debian/patches/series --- hibernate-2.0.git20100603~ppa5~precise1/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ hibernate-2.0+15+g88d54a8/debian/patches/series 2016-01-10 23:36:03.000000000 +0000 @@ -0,0 +1,10 @@ +10-grub-backup.patch +70-laptop-mode-rename.patch +80-log-permissions.patch +99-store-ifdown-auto.patch +fix-userui-path.patch +fix-manpage-parentheses.patch +blacklisted-modules-3.x.patch +fix-s2ram-options.patch +fix-grub-config-name.patch +fix-typos.patch diff -Nru hibernate-2.0.git20100603~ppa5~precise1/debian/README.Debian hibernate-2.0+15+g88d54a8/debian/README.Debian --- hibernate-2.0.git20100603~ppa5~precise1/debian/README.Debian 2010-09-12 20:50:57.000000000 +0000 +++ hibernate-2.0+15+g88d54a8/debian/README.Debian 1970-01-01 00:00:00.000000000 +0000 @@ -1,29 +0,0 @@ -hibernate for Debian -==================== - -Patches for Suspend2 which apply to vanilla (non-Debian) kernels can be -obtained from the upstream web site at http://www.suspend2.net/ - -Those who prefer to run Debian kernels (compiled from the sources in the -kernel-source-2.6.x packages) won't be able to use these patches, due to the -changes in the Debian kernels and the invasiveness of the suspend2 patch. -A kernel patch package for Debian (linux-patch-suspend2) is planned. Please -contact me if you would be able to donate time to make it happen. - -Hibernate will just fall back to using the in-kernel suspend methods when -suspend2 is not present. - -Users with /boot/grub on an XFS partition, make sure to read -/usr/share/doc/README.xfs! - -hibernate is maintained with SVN as part of Alioth's collab-maint project. Get -the source from - - anonymous: svn://svn.debian.org/svn/collab-maint/deb-maint/hibernate/trunk - developer: svn+ssh://@svn.debian.org/svn/collab-maint/deb-maint/hibernate/trunk - -It is designed to be used with svn-buildpackage. - - -- martin f. krafft Sat, 15 Jul 2006 19:07:59 +0200 - -$Id$ diff -Nru hibernate-2.0.git20100603~ppa5~precise1/debian/rules hibernate-2.0+15+g88d54a8/debian/rules --- hibernate-2.0.git20100603~ppa5~precise1/debian/rules 2010-09-12 20:50:57.000000000 +0000 +++ hibernate-2.0+15+g88d54a8/debian/rules 2016-01-10 23:36:03.000000000 +0000 @@ -1,85 +1,22 @@ #!/usr/bin/make -f -# -# Debian rules file for hibernate -# -# Originally written by Cameron Patrick, 2004 and released to the public domain. -# Modified by martin f. krafft. -# -# Copyright © martin f. krafft -# Released under the terms of the Artistic Licence 2.0 -# -# $Id$ -# -include /usr/share/dpatch/dpatch.make +%: + dh $@ -$(DPATCH_STAMPFN): debian/patches/00list -force-run: -.PHONY: force-run -debian/patches/00list: force-run - dh_testdir - make -sC debian/patches - -configure: debian/patches/00list - -hibernate: hibernate.sh - install -m755 $< $@ - -hibernate.8 hibernate.conf.5: +override_dh_auto_build: sh ./gen-manpages.sh + sed -i 's,^'\''-misc,\\\&\0,' hibernate.conf.5 -debian/hibernate.init: init.d/hibernate-cleanup.sh - ln $< $@ - -build: build-stamp -build-stamp: configure patch hibernate hibernate.8 hibernate.conf.5 debian/hibernate.init - dh_testdir - touch $@ -.PHONY: build-stamp - -binary: binary-arch binary-indep - -binary-arch: - -binary-indep: build - dh_testroot - dh_testdir - dh_clean -i -k - dh_installdirs -i - dh_install -i - - install -o root -g root -m 644 logrotate.d-hibernate-script \ - debian/hibernate/etc/logrotate.d/hibernate - - install -o root -g root -m 755 debian/bugscript \ - debian/hibernate/usr/share/bug/hibernate/script +override_dh_auto_install: + install -m 644 logrotate.d-hibernate-script \ + debian/hibernate/etc/logrotate.d/hibernate + install -m 755 debian/bugscript \ + debian/hibernate/usr/share/bug/hibernate/script + install -m 755 hibernate.sh \ + debian/hibernate/usr/sbin/hibernate +override_dh_install: + dh_install sed -i -e 's,^[^#].*Distribution.*,# &,' \ -e 's,^# Distribution.*,Distribution debian,' \ debian/hibernate/etc/hibernate/common.conf - - find debian/hibernate -type d -name .svn -print0 | xargs -0 rm -rf - - dh_installdocs -i - dh_installexamples -i - dh_installchangelogs -i CHANGELOG - dh_installinit --no-start -- start 31 S . - dh_installman -i - dh_link -i - dh_compress -i - dh_fixperms -i - dh_installdeb -i - dh_gencontrol -i - dh_builddeb -i - -clean: clean-patched unpatch - -clean-patched: - dh_testdir - dh_testroot - dh_clean - $(MAKE) -C debian/patches - rm -f hibernate hibernate.8 hibernate.conf.5 debian/hibernate.init - rm -f configure-stamp build-stamp - -# arch-tag: daab4fb5-a946-4271-be82-425047e0d2ac diff -Nru hibernate-2.0.git20100603~ppa5~precise1/debian/source/format hibernate-2.0+15+g88d54a8/debian/source/format --- hibernate-2.0.git20100603~ppa5~precise1/debian/source/format 1970-01-01 00:00:00.000000000 +0000 +++ hibernate-2.0+15+g88d54a8/debian/source/format 2016-01-10 23:36:03.000000000 +0000 @@ -0,0 +1 @@ +3.0 (quilt) diff -Nru hibernate-2.0.git20100603~ppa5~precise1/module.d/hibernate hibernate-2.0+15+g88d54a8/module.d/hibernate --- hibernate-2.0.git20100603~ppa5~precise1/module.d/hibernate 2010-09-12 20:50:57.000000000 +0000 +++ hibernate-2.0+15+g88d54a8/module.d/hibernate 1970-01-01 00:00:00.000000000 +0000 @@ -1,43 +0,0 @@ -#!/bin/sh - -export TUXONICE_LOC -# TODO tuxonice supports all sorts of knobs to twiddle. Since this should be as -# simple as possible, it does not provide a mechanism for twiddling those knobs. -# If you need more customization than this file has, consider using a hook to -# set the appropriate values. - -HIBERNATE_SCRIPT="/usr/sbin/hibernate" - -# more locations might be nice -for loc in "/sys/power/tuxonice" "/sys/power/suspend2"; do - [ -d "${loc}" ] && { TUXONICE_LOC="${loc}"; break; } -done - -if [ -z "$HIBERNATE_MODULE" -a -n "$TUXONICE_LOC" ] && \ - [ -f "${TUXONICE_LOC}/do_hibernate" ]; then - HIBERNATE_MODULE="tuxonice" - do_hibernate() - { - echo 5 > "${TUXONICE_LOC}/powerdown_method" - # calling hibernate script - $HIBERNATE_SCRIPT - } -fi - -if [ -z "$SUSPEND_HYBRID_MODULE" -a -n "$TUXONICE_LOC" ] && \ - grep -q mem /sys/power/state && \ - [ -f "${TUXONICE_LOC}/do_hibernate" ]; then - SUSPEND_HYBRID_MODULE="tuxonice" - do_suspend_hybrid() - { - r=0 - echo 3 >"${TUXONICE_LOC}/powerdown_method" - # calling hibernate script - $HIBERNATE_SCRIPT - r=$? - [ -f /sys/power/tuxonice/did_suspend_to_both ] && \ - [ "$(cat /sys/power/tuxonice/did_suspend_to_both)" != "1" ] && \ - REVERSE="thaw" - return $r - } -fi