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

[Eric Belanger]

    Date: Sunday, October 5, 2008 @ 18:11:37
  Author: eric
Revision: 14360

Merged revisions 14207,14309 via svnmerge from 
svn+ssh://svn.archlinux.org/home/svn-packages/pm-utils/trunk

........
  r14207 | thayer | 2008-10-04 14:12:05 -0400 (Sat, 04 Oct 2008) | 2 lines
  
  upgpkg: pm-utils 1.2.0-1
      upstream release v1.2.0
........
  r14309 | thayer | 2008-10-05 13:09:59 -0400 (Sun, 05 Oct 2008) | 2 lines
  
  upgpkg: pm-utils 1.2.1-1
      upstream release v1.2.1
........

Modified:
  pm-utils/repos/extra-x86_64/	(properties)
  pm-utils/repos/extra-x86_64/PKGBUILD
  pm-utils/repos/extra-x86_64/service.patch

---------------+
 PKGBUILD      |    8 ++++----
 service.patch |    8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)


Property changes on: pm-utils/repos/extra-x86_64
___________________________________________________________________
Name: svnmerge-integrated
   - /pm-utils/trunk:1-7583
   + /pm-utils/trunk:1-14359

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2008-10-05 22:11:01 UTC (rev 14359)
+++ extra-x86_64/PKGBUILD	2008-10-05 22:11:37 UTC (rev 14360)
@@ -1,7 +1,7 @@
 #$Id$
-#Maintainer: Jan de Groot <jgc at archlinux.org>
+#Maintainer: Thayer Williams <thayer at archlinux.org>
 pkgname=pm-utils
-pkgver=1.1.2.4
+pkgver=1.2.1
 pkgrel=1
 pkgdesc="Utilities and scripts for power management"
 arch=('i686' 'x86_64')
@@ -13,8 +13,8 @@
 source=(http://pm-utils.freedesktop.org/releases/${pkgname}-${pkgver}.tar.gz
 	service.patch
 	11netcfg)
-md5sums=('5aa6d338fb8172f1826a1b08ae601a42'
-         '3e170a6c7ae7d9110f95bab54235c089'
+md5sums=('c8b6ee8f85c085fcc3a12d0ef959f5b8'
+         'bf6560934c4efa79143c91dcca5a07b8'
          '9839687c8787d99fd4ff36aa3238c27b')
 
 build() {

Modified: extra-x86_64/service.patch
===================================================================
--- extra-x86_64/service.patch	2008-10-05 22:11:01 UTC (rev 14359)
+++ extra-x86_64/service.patch	2008-10-05 22:11:37 UTC (rev 14360)
@@ -1,6 +1,6 @@
---- 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 @@
+--- pm/functions.in	2008-10-03 19:14:35.000000000 -0700
++++ pm/functions.in~	2008-10-04 16:44:21.000000000 -0700
+@@ -129,10 +129,10 @@
  if ! command_exists service; then
  	service()
  	{
@@ -11,5 +11,5 @@
 -			"/etc/init.d/$svc" "$@"
 +			"/etc/rc.d/$svc" "$@"
  		else
- 			log "$1" $": unrecognized service" 1>&2
+ 			log "${1}: unrecognized service"
  			return 1