[arch-commits] Commit in pm-utils/repos (5 files)

Sun Apr 20 12:41:02 UTC 2008

Date: Sunday, April 20, 2008 @ 08:41:02
  Author: jgc
Revision: 512

Merged revisions 2-511 via svnmerge from 
svn+ssh://svn.archlinux.org/home/svn-packages/pm-utils/trunk

........
  r67 | jgc | 2008-04-10 17:47:49 +0000 (Thu, 10 Apr 2008) | 2 lines
  
  upgpkg: pm-utils 1.1.0-1
      Update to new version, adds uswsusp support (FS#9456)
........
  r356 | aaron | 2008-04-18 22:56:27 +0000 (Fri, 18 Apr 2008) | 1 line
  
  Added svn:keywords to all PKGBUILDs
........

Modified:
  pm-utils/repos/extra-i686/	(properties)
  pm-utils/repos/extra-i686/PKGBUILD
  pm-utils/repos/extra-i686/service.patch
Deleted:
  pm-utils/repos/extra-i686/no-usleep.patch
  pm-utils/repos/extra-i686/pm-utils-0.99.3-cfg.patch

---------------------------+
 PKGBUILD                  |   14 +++++---------
 no-usleep.patch           |   33 ---------------------------------
 pm-utils-0.99.3-cfg.patch |   11 -----------
 service.patch             |   20 +++++++++++---------
 4 files changed, 16 insertions(+), 62 deletions(-)


Property changes on: pm-utils/repos/extra-i686
___________________________________________________________________
Name: svnmerge-integrated
   - /pm-utils/trunk:1
   + /pm-utils/trunk:1-511

Modified: extra-i686/PKGBUILD
===================================================================

--- extra-i686/PKGBUILD	2008-04-20 12:39:44 UTC (rev 511)
+++ extra-i686/PKGBUILD	2008-04-20 12:41:02 UTC (rev 512)
@@ -1,7 +1,7 @@
 #$Id$
 #Maintainer: Jan de Groot <jgc at archlinux.org>
 pkgname=pm-utils
-pkgver=0.99.4
+pkgver=1.1.0
 pkgrel=1
 pkgdesc="Utilities and scripts for power management"
 arch=('i686' 'x86_64')
@@ -9,24 +9,20 @@
 license=('GPL')
 depends=('glibc' 'vbetool' 'procps')
 install=pm-utils.install
-source=(http://ftp.archlinux.org/other/pm-utils/${pkgname}-${pkgver}.tar.gz
-	pm-utils-0.99.3-cfg.patch
-	no-usleep.patch
+source=(http://pm-utils.freedesktop.org/releases/${pkgname}-${pkgver}.tar.gz
 	service.patch
 	11netcfg)
+md5sums=('a9fcb1ee69ddc24bcc174ebf56f2cf11'
+         '3e170a6c7ae7d9110f95bab54235c089'
+         '9839687c8787d99fd4ff36aa3238c27b')
 
 build() {
   cd ${startdir}/src/${pkgname}-${pkgver}
-  patch -Np1 -i ${startdir}/src/pm-utils-0.99.3-cfg.patch || return 1
-  patch -Np1 -i ${startdir}/src/no-usleep.patch || return 1
   patch -Np0 -i ${startdir}/src/service.patch || return 1
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var || return 1
   make || return 1
   make DESTDIR=${startdir}/pkg install || return 1
 
-  #Remove unsupported hooks
-  rm -f ${startdir}/pkg/usr/lib/pm-utils/sleep.d/60sysfont || return 1
-
   #Install additional hooks
   install -m755 ${startdir}/src/11netcfg ${startdir}/pkg/usr/lib/pm-utils/sleep.d/11netcfg || return 1
 }

Deleted: extra-i686/no-usleep.patch
===================================================================
--- extra-i686/no-usleep.patch	2008-04-20 12:39:44 UTC (rev 511)
+++ extra-i686/no-usleep.patch	2008-04-20 12:41:02 UTC (rev 512)
@@ -1,33 +0,0 @@
-diff -ruN pm-utils-0.99.4.orig/pm/functions pm-utils-0.99.4/pm/functions
---- pm-utils-0.99.4.orig/pm/functions	2007-05-15 14:55:58.000000000 +0000
-+++ pm-utils-0.99.4/pm/functions	2007-12-26 13:17:15.000000000 +0000
-@@ -52,7 +52,7 @@
- 	rm -f /var/run/pm-suspend
- 	chvt 1
- 	chvt $VT
--	openvt -- sh -c "usleep $1 ; rm -f /.suspended >/dev/null 2>&1 0<&1" >/dev/null 2>&1 0<&1 &
-+	openvt -- sh -c "sleep $1 ; rm -f /.suspended >/dev/null 2>&1 0<&1" >/dev/null 2>&1 0<&1 &
- }
- 
- find_sleepd_files()
-@@ -153,7 +153,7 @@
- 
- 	run_hooks "$2" reverse
- 
--	remove_suspend_lock 200
-+	remove_suspend_lock 0.0002
- 
- 	return 0
- }
-diff -ruN pm-utils-0.99.4.orig/pm/hooks/99video pm-utils-0.99.4/pm/hooks/99video
---- pm-utils-0.99.4.orig/pm/hooks/99video	2007-06-18 20:39:53.000000000 +0000
-+++ pm-utils-0.99.4/pm/hooks/99video	2007-12-26 13:17:53.000000000 +0000
-@@ -47,7 +47,7 @@
- 	# We might need to do one or many of these quirks
- 	if [ "${DISPLAY_QUIRK_VBE_POST}" == "true" ]; then
- 		vbe post
--		usleep 100000
-+		usleep 0.1
- 	fi
- 	if [ "${DISPLAY_QUIRK_VBESTATE_RESTORE}" == "true" ]; then
- 		vbe vbestate restore < /var/run/vbestate

Deleted: extra-i686/pm-utils-0.99.3-cfg.patch
===================================================================
--- extra-i686/pm-utils-0.99.3-cfg.patch	2008-04-20 12:39:44 UTC (rev 511)
+++ extra-i686/pm-utils-0.99.3-cfg.patch	2008-04-20 12:41:02 UTC (rev 512)
@@ -1,11 +0,0 @@
---- pm-utils-0.99.3/pm/functions.cfg	2007-05-29 15:40:55.000000000 +0200
-+++ pm-utils-0.99.3/pm/functions	2007-05-29 15:41:22.000000000 +0200
-@@ -24,7 +24,7 @@
- {
- 	cfgs="/etc/pm/config.d/*[^~]"
- 	for cfg in $cfgs ; do
--		[ -f $cfgs ] || continue
-+		[ -f $cfg ] || continue
- 		set -a
- 		. $cfg
- 		set +a

Modified: extra-i686/service.patch
===================================================================
--- extra-i686/service.patch	2008-04-20 12:39:44 UTC (rev 511)
+++ extra-i686/service.patch	2008-04-20 12:41:02 UTC (rev 512)
@@ -1,13 +1,15 @@
---- pm/functions~	2007-08-25 10:02:02.000000000 +0000
-+++ pm/functions	2007-08-25 10:03:28.000000000 +0000
-@@ -217,8 +217,8 @@
- _service=$(type -p service)
- if [ -z "$_service" ]; then
- 	service() {
+--- pm/functions.in~	2008-04-10 17:39:48.000000000 +0000
++++ pm/functions.in	2008-04-10 17:39:58.000000000 +0000
+@@ -138,10 +138,10 @@
+ if ! command_exists service; then
+ 	service()
+ 	{
 -		if [ -x "/etc/init.d/$1" ]; then
--			"/etc/init.d/$@"
 +		if [ -x "/etc/rc.d/$1" ]; then
-+			"/etc/rc.d/$@"
+ 			svc="$1"
+ 			shift
+-			"/etc/init.d/$svc" "$@"
++			"/etc/rc.d/$svc" "$@"
  		else
- 			echo "$1" $": unrecognized service" 1>&2
+ 			log "$1" $": unrecognized service" 1>&2
  			return 1



