[Pkg-wmaker-commits] [wmbattery] 76/241: * Patch from Vincent Bernat adding support for 2.6.21, which changes yet again where the ACPI version number is stored. Closes: #423612

[Doug Torrance]

This is an automated email from the git hooks/post-receive script.

dtorrance-guest pushed a commit to branch master
in repository wmbattery.

commit 9ddaabcaa9bc334ef590d63201ff21f83e5c7824
Author: joey <joey at a4a2c43b-8ac3-0310-8836-e0e880c912e2>
Date:   Mon May 14 18:26:09 2007 +0000

    * Patch from Vincent Bernat adding support for 2.6.21, which changes
      yet again where the ACPI version number is stored. Closes: #423612
---
 acpi.c           | 12 +++++++++---
 debian/changelog |  6 ++++--
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/acpi.c b/acpi.c
index 2ff7d42..65062d2 100644
--- a/acpi.c
+++ b/acpi.c
@@ -245,10 +245,16 @@ int acpi_supported (void) {
 	}
 	closedir(dir);
 	
-	version = get_acpi_value(PROC_ACPI "/info", "ACPI-CA Version:");
+	/* If kernel is 2.6.21 or newer, version is in
+	   /sys/module/acpi/parameters/acpica_version */
+	
+	version = get_acpi_file("/sys/module/acpi/parameters/acpica_version");
 	if (version == NULL) {
-		/* 2.5 kernel acpi */
-		version = get_acpi_value(PROC_ACPI "/info", "version:");
+		version = get_acpi_value(PROC_ACPI "/info", "ACPI-CA Version:");
+		if (version == NULL) {
+			/* 2.5 kernel acpi */
+			version = get_acpi_value(PROC_ACPI "/info", "version:");
+		}
 	}
 	if (version == NULL) {
 		return 0;
diff --git a/debian/changelog b/debian/changelog
index 42bb321..604c4e6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
-wmbattery (2.27) UNRELEASED; urgency=low
+wmbattery (2.27) unstable; urgency=low
 
   * Minor bug fix to acpi code, don't skip over dotfiles.
+  * Patch from Vincent Bernat adding support for 2.6.21, which changes
+    yet again where the ACPI version number is stored. Closes: #423612
 
- -- Joey Hess <joeyh at debian.org>  Wed, 24 Jan 2007 22:18:51 -0500
+ -- Joey Hess <joeyh at debian.org>  Mon, 14 May 2007 14:23:09 -0400
 
 wmbattery (2.26) unstable; urgency=medium
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wmaker/wmbattery.git