[arch-commits] Commit in pm-utils/trunk (PKGBUILD daemons.patch typo.patch)
Thayer Williams
thayer at archlinux.org
Sun Feb 15 19:30:50 UTC 2009
Date: Sunday, February 15, 2009 @ 14:30:50
Author: thayer
Revision: 27032
upgpkg: pm-utils 1.2.4-1
new upstream release
Modified:
pm-utils/trunk/PKGBUILD
pm-utils/trunk/daemons.patch
Deleted:
pm-utils/trunk/typo.patch
---------------+
PKGBUILD | 16 ++++++----------
daemons.patch | 10 +++++-----
typo.patch | 12 ------------
3 files changed, 11 insertions(+), 27 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2009-02-15 18:54:03 UTC (rev 27031)
+++ PKGBUILD 2009-02-15 19:30:50 UTC (rev 27032)
@@ -2,8 +2,8 @@
#Maintainer: Thayer Williams <thayer at archlinux.org>
pkgname=pm-utils
-pkgver=1.2.3
-pkgrel=4
+pkgver=1.2.4
+pkgrel=1
pkgdesc="Utilities and scripts for suspend and hibernate power management"
arch=('i686' 'x86_64')
url="http://pm-utils.freedesktop.org"
@@ -12,12 +12,11 @@
makedepends=('xmlto')
source=(http://pm-utils.freedesktop.org/releases/${pkgname}-${pkgver}.tar.gz
11netcfg
- daemons.patch
- typo.patch)
-md5sums=('2a9a9e3de8bcda43c88a9e346866fd55'
+ daemons.patch)
+
+md5sums=('965bdce8fccaaa5ae2b304e52b362c6e'
'9839687c8787d99fd4ff36aa3238c27b'
- '67bafe375f385e66bae432b9db914aaf'
- 'd80018ca6592b989cefa334399b2dba1')
+ 'cb4d9ca6f46b1822c6ca823b158f34e5')
build() {
cd $srcdir/$pkgname-$pkgver
@@ -25,9 +24,6 @@
# make sure Arch Linux daemons are properly handled
patch -Np0 -i $srcdir/daemons.patch || return 1
- # fix a pkg-config typo (should be removed on next release)
- patch -Np0 -i $srcdir/typo.patch || return 1
-
./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
make || return 1
make DESTDIR=$pkgdir install || return 1
Modified: daemons.patch
===================================================================
--- daemons.patch 2009-02-15 18:54:03 UTC (rev 27031)
+++ daemons.patch 2009-02-15 19:30:50 UTC (rev 27032)
@@ -1,11 +1,11 @@
---- ./pm/functions.in.bak 2008-12-07 12:05:33.000000000 -0800
-+++ ./pm/functions.in 2008-12-07 12:15:20.000000000 -0800
+--- ./pm/functions.in.orig 2009-02-15 11:23:25.747225766 -0800
++++ ./pm/functions.in 2009-02-15 11:24:03.410775317 -0800
@@ -141,7 +141,7 @@
stopservice()
{
-- if service "$1" status 2>/dev/null | grep -c -q running; then
-+ if [[ -e "/var/run/daemons/$1" ]] || service "$1" status 2>/dev/null | grep -c -q running; then
+- if service "$1" status 2>/dev/null | grep -q -e running -e started
++ if [[ -e "/var/run/daemons/$1" ]] || service "$1" status 2>/dev/null | grep -q -e running -e started
+ then
touch "${STORAGEDIR}/service:$1"
service "$1" stop
- fi
Deleted: typo.patch
===================================================================
--- typo.patch 2009-02-15 18:54:03 UTC (rev 27031)
+++ typo.patch 2009-02-15 19:30:50 UTC (rev 27032)
@@ -1,12 +0,0 @@
---- ./pm-utils.pc.in.bak 2009-02-01 14:35:43.114890340 +0100
-+++ ./pm-utils.pc.in 2009-02-01 14:35:51.138964508 +0100
-@@ -6,7 +6,7 @@
- pm_libdir=${libdir}/pm-utils
- pm_sysconfdir=${sysconfdir}/pm
- pm_sleephooks=${pm_libdir}/sleep.d
--pm_powerhooks=${pm_libdir)/power.d
-+pm_powerhooks=${pm_libdir}/power.d
- pm_sleepmodules=${pm_libdir}/module.d
-
- Name: pm-utils
-
More information about the arch-commits
mailing list