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

[Thayer Williams]

    Date: Monday, November 17, 2008 @ 19:08:10
  Author: thayer
Revision: 19258

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

........
  r19257 | thayer | 2008-11-17 16:07:29 -0800 (Mon, 17 Nov 2008) | 2 lines
  
  upgpkg: pm-utils 1.2.2.1-2
      removed install file && misc cleanup
........

Modified:
  pm-utils/repos/extra-i686/	(properties)
  pm-utils/repos/extra-i686/PKGBUILD
Deleted:
  pm-utils/repos/extra-i686/pm-utils.install

------------------+
 PKGBUILD         |   15 ++++++++-------
 pm-utils.install |   15 ---------------
 2 files changed, 8 insertions(+), 22 deletions(-)


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

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2008-11-18 00:07:29 UTC (rev 19257)
+++ extra-i686/PKGBUILD	2008-11-18 00:08:10 UTC (rev 19258)
@@ -1,15 +1,15 @@
 #$Id$
 #Maintainer: Thayer Williams <thayer at archlinux.org>
+
 pkgname=pm-utils
 pkgver=1.2.2.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Utilities and scripts for power management"
 arch=('i686' 'x86_64')
 url="http://pm-utils.freedesktop.org"
 license=('GPL')
 depends=('glibc' 'vbetool' 'procps')
 makedepends=('xmlto')
-install=pm-utils.install
 source=(http://pm-utils.freedesktop.org/releases/${pkgname}-${pkgver}.tar.gz
 	service.patch
 	11netcfg)
@@ -18,12 +18,13 @@
          '9839687c8787d99fd4ff36aa3238c27b')
 
 build() {
-  cd ${startdir}/src/${pkgname}-${pkgver}
-  patch -Np0 -i ${startdir}/src/service.patch || return 1
+  cd $srcdir/$pkgname-$pkgver
+  patch -Np0 -i $srcdir/service.patch || return 1
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var || return 1
   make || return 1
-  make DESTDIR=${startdir}/pkg install || return 1
+  make DESTDIR=$pkgdir install || return 1
 
-  #Install additional hooks
-  install -m755 ${startdir}/src/11netcfg ${startdir}/pkg/usr/lib/pm-utils/sleep.d/11netcfg || return 1
+  # install additional hooks
+  install -m755 $srcdir/11netcfg $pkgdir/usr/lib/pm-utils/sleep.d/11netcfg || return 1
 }
+

Deleted: extra-i686/pm-utils.install
===================================================================
--- extra-i686/pm-utils.install	2008-11-18 00:07:29 UTC (rev 19257)
+++ extra-i686/pm-utils.install	2008-11-18 00:08:10 UTC (rev 19258)
@@ -1,15 +0,0 @@
-# arg 1:  the new package version
-post_install() {
-  cat << _EOF
-
-Powersave has been deprecated as suspend/resume framework and has been replaced
-by pm-utils. Pm-utils provides everything you need for suspend/resume, but does
-not load your cpufreq modules like powersaved does. You have to load these
-modules by hand if you want to use them.
-
-_EOF
-}
-
-op=$1
-shift
-$op $*