[arch-commits] Commit in laptop-mode-tools/repos (4 files)

[Eric Bélanger]

    Date: Saturday, December 5, 2009 @ 03:31:41
  Author: eric
Revision: 60459

Merged revisions 59686,60458 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/laptop-mode-tools/trunk

........
  r59686 | eric | 2009-11-26 15:09:46 -0500 (Thu, 26 Nov 2009) | 1 line
  
  Added check for /var/run/laptop-mode-tools in daemon script (close FS#17240)
........
  r60458 | eric | 2009-12-05 03:31:22 -0500 (Sat, 05 Dec 2009) | 2 lines
  
  upgpkg: laptop-mode-tools 1.52-2
      Added acpid optdepends (close FS#17378)
........

Modified:
  laptop-mode-tools/repos/extra-any/	(properties)
  laptop-mode-tools/repos/extra-any/ChangeLog
  laptop-mode-tools/repos/extra-any/PKGBUILD
  laptop-mode-tools/repos/extra-any/laptop-mode

-------------+
 ChangeLog   |    6 ++++++
 PKGBUILD    |    7 ++++---
 laptop-mode |    6 ++++--
 3 files changed, 14 insertions(+), 5 deletions(-)


Property changes on: laptop-mode-tools/repos/extra-any
___________________________________________________________________
Modified: svnmerge-integrated
   - /laptop-mode-tools/trunk:1-55858
   + /laptop-mode-tools/trunk:1-60458

Modified: extra-any/ChangeLog
===================================================================
--- extra-any/ChangeLog	2009-12-05 08:31:22 UTC (rev 60458)
+++ extra-any/ChangeLog	2009-12-05 08:31:41 UTC (rev 60459)
@@ -1,3 +1,9 @@
+2009-12-05  Eric Belanger  <eric at archlinux.org>
+
+	* laptop-mode-tools 1.52-2
+	* Added check for /var/run/laptop-mode-tools in daemon script (close FS#17240)
+	* Added acpid optdepends (close FS#17378)
+
 2009-10-14  Eric Belanger  <eric at archlinux.org>
 
 	* laptop-mode-tools 1.52-1

Modified: extra-any/PKGBUILD
===================================================================
--- extra-any/PKGBUILD	2009-12-05 08:31:22 UTC (rev 60458)
+++ extra-any/PKGBUILD	2009-12-05 08:31:41 UTC (rev 60459)
@@ -4,12 +4,13 @@
 
 pkgname=laptop-mode-tools
 pkgver=1.52
-pkgrel=1
+pkgrel=2
 pkgdesc="Laptop mode is a kernel mode that allows you to extend the battery life of your laptop"
 arch=('any')
 url="http://www.samwel.tk/laptop_mode/"
 license=('GPL')
 depends=('bash' 'hdparm')
+optdepends=('acpid: for ACPI support')
 backup=(etc/laptop-mode/conf.d/ac97-powersave.conf
         etc/laptop-mode/conf.d/auto-hibernate.conf
         etc/laptop-mode/conf.d/battery-level-polling.conf
@@ -33,8 +34,8 @@
         etc/laptop-mode/laptop-mode.conf
         etc/laptop-mode/lm-profiler.conf)
 source=(http://www.samwel.tk/laptop_mode/tools/downloads/${pkgname}_${pkgver}.tar.gz laptop-mode)
-md5sums=('75841694db2dfc9e5adb29c160b514ee' '241a0e07fc3b340b3381bcde8a74b71d')
-sha1sums=('80fcb3600315ec6f60cad52c6c7166cccc4ca4fc' 'e69239683c320ecc4c27060eb2ace768d06696bc')
+md5sums=('75841694db2dfc9e5adb29c160b514ee' 'fe47441f14e2b39c2fe473685f04395f')
+sha1sums=('80fcb3600315ec6f60cad52c6c7166cccc4ca4fc' 'f98e3c35d365c7aa0e662ec61c2991640640ac9b')
 
 build() {
   cd "${srcdir}/${pkgname}_${pkgver}"

Modified: extra-any/laptop-mode
===================================================================
--- extra-any/laptop-mode	2009-12-05 08:31:22 UTC (rev 60458)
+++ extra-any/laptop-mode	2009-12-05 08:31:41 UTC (rev 60459)
@@ -3,11 +3,13 @@
 . /etc/rc.conf
 . /etc/rc.d/functions
 
-test -f /usr/sbin/laptop_mode || exit 0
-
 case "$1" in
   start)
+    if [ -x /etc/rc.d/acpid ]; then
+      ck_daemon acpid && /etc/rc.d/acpid start
+    fi
     stat_busy "Starting laptop-mode"
+    [ ! -d /var/run/laptop-mode-tools ] && install -d /var/run/laptop-mode-tools
     touch /var/run/laptop-mode-tools/enabled
     /usr/sbin/laptop_mode auto >/dev/null 2>&1
     if [ $? -gt 0 ]; then