[arch-commits] CVS update of extra/system/hibernate-script (3 files)
Thomas Baechler
thomas at archlinux.org
Tue Aug 21 20:53:23 UTC 2007
Date: Tuesday, August 21, 2007 @ 16:53:23
Author: thomas
Path: /home/cvs-extra/extra/system/hibernate-script
Added: hibernate-script-1.96-arch.patch (1.1)
Modified: PKGBUILD (1.11 -> 1.12)
Removed: hibernate-script-1.95-arch.patch (1.1)
upgpkg: hibernate-script 1.96-1
----------------------------------+
PKGBUILD | 15 +++-----
hibernate-script-1.95-arch.patch | 54 ------------------------------
hibernate-script-1.96-arch.patch | 66 +++++++++++++++++++++++++++++++++++++
3 files changed, 73 insertions(+), 62 deletions(-)
Index: extra/system/hibernate-script/PKGBUILD
diff -u extra/system/hibernate-script/PKGBUILD:1.11 extra/system/hibernate-script/PKGBUILD:1.12
--- extra/system/hibernate-script/PKGBUILD:1.11 Mon May 21 13:54:50 2007
+++ extra/system/hibernate-script/PKGBUILD Tue Aug 21 16:53:23 2007
@@ -1,9 +1,8 @@
-# $Id: PKGBUILD,v 1.11 2007/05/21 17:54:50 thomas Exp $
-# Maintainer: James Rayner <iphitus at gmail.com>
-# Contributor: sonixX http://bbs.archlinux.org/viewtopic.php?p=95310#95310
+# $Id: PKGBUILD,v 1.12 2007/08/21 20:53:23 thomas Exp $
+# Maintainer: Thomas Baechler <thomas at archlinux.org>
pkgname=hibernate-script
-pkgver=1.95
+pkgver=1.96
pkgrel=1
pkgdesc="Scripts needed for software suspend aka hibernate"
arch=(i686 x86_64)
@@ -16,9 +15,9 @@
'etc/hibernate/ususpend-disk.conf')
url="http://www.suspend2.net"
source=(http://www.suspend2.net/downloads/all/hibernate-script-$pkgver.tar.gz \
- hibernate-script-1.95-arch.patch hibernate.rc)
-md5sums=('026a7a8992da4fe56fb19530df998806'
- '920037161b4478cf0b6c6457add7ab41'
+ hibernate-script-${pkgver}-arch.patch hibernate.rc)
+md5sums=('1ca5fc5505131c0fa08cfcc1caf39b0f'
+ '88662d3516888761ea57042aadd6015d'
'7e470bc1f8090c41f57f50b63aba6d29')
depends=(bash kbd)
@@ -26,7 +25,7 @@
build() {
cd $startdir/src/hibernate-script-$pkgver
# Fix scriptlets to work properly with Archlinux
- patch -Np1 -i ../hibernate-script-1.95-arch.patch || return 1
+ patch -Np1 -i ../hibernate-script-${pkgver}-arch.patch || return 1
export BASE_DIR=${startdir}/pkg
export PREFIX=/usr
mkdir -p $startdir/pkg/etc/{rc,logrotate}.d
Index: extra/system/hibernate-script/hibernate-script-1.95-arch.patch
diff -u extra/system/hibernate-script/hibernate-script-1.95-arch.patch:1.1 extra/system/hibernate-script/hibernate-script-1.95-arch.patch:removed
--- extra/system/hibernate-script/hibernate-script-1.95-arch.patch:1.1 Mon May 21 13:54:50 2007
+++ extra/system/hibernate-script/hibernate-script-1.95-arch.patch Tue Aug 21 16:53:23 2007
@@ -1,54 +0,0 @@
-diff -Nur hibernate-script-1.95.orig/common.conf hibernate-script-1.95/common.conf
---- hibernate-script-1.95.orig/common.conf 2007-02-08 03:26:39.000000000 +0100
-+++ hibernate-script-1.95/common.conf 2007-05-21 19:33:38.000000000 +0200
-@@ -14,7 +14,7 @@
- # AlwaysForce yes
- # AlwaysKill yes
- # HibernateVT 15
--# Distribution debian (or fedora/gentoo/mandrake/redhat/slackware/suse)
-+Distribution arch (or debian/fedora/gentoo/mandrake/redhat/slackware/suse)
- # XDisplay :0
-
- ##############################################################################
-diff -Nur hibernate-script-1.95.orig/scriptlets.d/hardware_tweaks hibernate-script-1.95/scriptlets.d/hardware_tweaks
---- hibernate-script-1.95.orig/scriptlets.d/hardware_tweaks 2007-05-05 01:42:34.000000000 +0200
-+++ hibernate-script-1.95/scriptlets.d/hardware_tweaks 2007-05-21 19:36:43.000000000 +0200
-@@ -86,7 +86,7 @@
- local action
- action=start
- [ "$DISTRIBUTION" = "gentoo" ] && action=restart
-- /etc/init.d/915resolution $action || return 1
-+ /etc/rc.d/915resolution $action || return 1
- return 0
- }
-
-diff -Nur hibernate-script-1.95.orig/scriptlets.d/network hibernate-script-1.95/scriptlets.d/network
---- hibernate-script-1.95.orig/scriptlets.d/network 2007-04-13 12:02:22.000000000 +0200
-+++ hibernate-script-1.95/scriptlets.d/network 2007-05-21 19:33:38.000000000 +0200
-@@ -90,6 +90,14 @@
- NetworkDetectDistro() {
- # Use either a given $DISTRIBUTION or autodetect one.
- case "$DISTRIBUTION" in
-+ arch)
-+ network_ifup() {
-+ /etc/rc.d/network ifup $1
-+ }
-+ network_ifdown() {
-+ /etc/rc.d/network ifdown $1
-+ }
-+ ;;
- gentoo)
- network_ifup() {
- [ -x "/etc/init.d/net.$1" ] && /etc/init.d/net.$1 start
-diff -Nur hibernate-script-1.95.orig/scriptlets.d/services hibernate-script-1.95/scriptlets.d/services
---- hibernate-script-1.95.orig/scriptlets.d/services 2007-04-13 12:02:22.000000000 +0200
-+++ hibernate-script-1.95/scriptlets.d/services 2007-05-21 19:33:38.000000000 +0200
-@@ -75,7 +75,7 @@
- debian|ubuntu|redhat|fedora)
- INITDIR=/etc/init.d
- ;;
-- slackware)
-+ slackware|arch)
- INITDIR=/etc/rc.d
- ;;
- *)
Index: extra/system/hibernate-script/hibernate-script-1.96-arch.patch
diff -u /dev/null extra/system/hibernate-script/hibernate-script-1.96-arch.patch:1.1
--- /dev/null Tue Aug 21 16:53:23 2007
+++ extra/system/hibernate-script/hibernate-script-1.96-arch.patch Tue Aug 21 16:53:23 2007
@@ -0,0 +1,66 @@
+diff -Nur hibernate-script-1.96.orig/common.conf hibernate-script-1.96/common.conf
+--- hibernate-script-1.96.orig/common.conf 2007-07-16 14:32:41.000000000 +0200
++++ hibernate-script-1.96/common.conf 2007-08-21 22:43:04.000000000 +0200
+@@ -14,7 +14,7 @@
+ # AlwaysForce yes
+ # AlwaysKill yes
+ # HibernateVT 15
+-# Distribution debian (or fedora/gentoo/mandrake/redhat/slackware/suse)
++Distribution arch
+ # XDisplay :0
+
+ ##############################################################################
+diff -Nur hibernate-script-1.96.orig/scriptlets.d/hardware_tweaks hibernate-script-1.96/scriptlets.d/hardware_tweaks
+--- hibernate-script-1.96.orig/scriptlets.d/hardware_tweaks 2007-07-16 14:33:09.000000000 +0200
++++ hibernate-script-1.96/scriptlets.d/hardware_tweaks 2007-08-21 22:42:19.000000000 +0200
+@@ -86,7 +86,7 @@
+ local action
+ action=start
+ [ "$DISTRIBUTION" = "gentoo" ] && action=restart
+- /etc/init.d/915resolution $action || return 1
++ /etc/rc.d/915resolution $action || return 1
+ return 0
+ }
+
+diff -Nur hibernate-script-1.96.orig/scriptlets.d/network hibernate-script-1.96/scriptlets.d/network
+--- hibernate-script-1.96.orig/scriptlets.d/network 2007-07-16 14:33:09.000000000 +0200
++++ hibernate-script-1.96/scriptlets.d/network 2007-08-21 22:42:19.000000000 +0200
+@@ -90,6 +90,14 @@
+ NetworkDetectDistro() {
+ # Use either a given $DISTRIBUTION or autodetect one.
+ case "$DISTRIBUTION" in
++ arch)
++ network_ifup() {
++ /etc/rc.d/network ifup $1
++ }
++ network_ifdown() {
++ /etc/rc.d/network ifdown $1
++ }
++ ;;
+ gentoo)
+ network_ifup() {
+ [ -x "/etc/init.d/net.$1" ] && /etc/init.d/net.$1 start
+diff -Nur hibernate-script-1.96.orig/scriptlets.d/services hibernate-script-1.96/scriptlets.d/services
+--- hibernate-script-1.96.orig/scriptlets.d/services 2007-07-16 14:33:09.000000000 +0200
++++ hibernate-script-1.96/scriptlets.d/services 2007-08-21 22:42:19.000000000 +0200
+@@ -75,7 +75,7 @@
+ debian|ubuntu|redhat|fedora)
+ INITDIR=/etc/init.d
+ ;;
+- slackware)
++ slackware|arch)
+ INITDIR=/etc/rc.d
+ ;;
+ *)
+diff -Nur hibernate-script-1.96.orig/suspend2.conf hibernate-script-1.96/suspend2.conf
+--- hibernate-script-1.96.orig/suspend2.conf 2007-07-16 14:32:41.000000000 +0200
++++ hibernate-script-1.96/suspend2.conf 2007-08-21 22:45:47.000000000 +0200
+@@ -37,7 +37,7 @@
+ # VerifyFilewriterResume2 yes
+
+ ## Specify a userui like this:
+-# ProcSetting userui_program /usr/local/sbin/suspend2ui_text
++# ProcSetting userui_program /usr/sbin/tuxoniceui_text
+
+ # Scale CPU to full speed to make sure we suspend as fast as possible.
+ FullSpeedCPU yes
More information about the arch-commits
mailing list