[arch-commits] Commit in ibam/trunk (03acpi-check.dpatch PKGBUILD)

[Balló György]

    Date: Thursday, September 5, 2013 @ 20:01:34
  Author: bgyorgy
Revision: 96801

upgpkg: ibam 0.5.2-6

Replace the sysfs patch with an another patch from Debian (FS#22078)

Added:
  ibam/trunk/03acpi-check.dpatch
Modified:
  ibam/trunk/PKGBUILD

---------------------+
 03acpi-check.dpatch |   28 ++++++++++++++++++++++++++++
 PKGBUILD            |    8 ++++----
 2 files changed, 32 insertions(+), 4 deletions(-)

Added: 03acpi-check.dpatch
===================================================================
--- 03acpi-check.dpatch	                        (rev 0)
+++ 03acpi-check.dpatch	2013-09-05 18:01:34 UTC (rev 96801)
@@ -0,0 +1,28 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 03acpi-check.dpatch by Martin Wuertele <maxx at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: change detection for sysfs and sysfs variable names for 2.6.30+ kernels
+
+ at DPATCH@
+--- ibam-0.5.2/ibam.inl.orig    2010-01-03 12:17:10.000000000 +0100
++++ ibam-0.5.2/ibam.inl 2010-01-03 12:17:19.000000000 +0100
+@@ -945,7 +945,7 @@
+    string sysfs_path = "/sys/class/power_supply"; // ...
+    ifstream pmu,acpi,sysfs;
+    pmu.open((pmu_path+"/info").c_str());
+-   acpi.open((acpi_path+"/info").c_str());
++   acpi.open((acpi_path+"/event").c_str());
+    if (pmu.is_open()) {
+ #ifdef IBAM_DEBUG
+       cout << "using pmu" << endl;
+@@ -959,7 +959,7 @@
+       acpi.close();
+       apm = new acpi_status();
+    } else {
+-      sysfs.open((sysfs_path+"/BAT1/charge_full").c_str());
++      sysfs.open((sysfs_path+"/BAT0/present").c_str());
+       if(sysfs.is_open()) {
+ #ifdef IBAM_DEBUG
+       cout << "using sysfs" << endl;
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-09-05 17:24:38 UTC (rev 96800)
+++ PKGBUILD	2013-09-05 18:01:34 UTC (rev 96801)
@@ -5,7 +5,7 @@
 
 pkgname=ibam
 pkgver=0.5.2
-pkgrel=5
+pkgrel=6
 pkgdesc="An intelligent battery monitor"
 arch=('i686' 'x86_64')
 url="http://ibam.sourceforge.net/"
@@ -15,9 +15,9 @@
 optdepends=('gnuplot: graphs support')
 install="ibam.install"
 source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz"
-	ibam-0.5.2-sysfs.patch)
+	03acpi-check.dpatch)
 md5sums=('2d5222ff504dd19e7c1ea8acc2f13cf5'
-         'c3aafebd5ad9159c89f71beab4a0f414')
+         '2f27fc97932bd59cabacbad063a13f0e')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -26,7 +26,7 @@
 	-e "s|/local/bin|/bin|g" \
 	-e "s|^CFLAGS=-O3|CFLAGS=${CFLAGS}|g" \
 	Makefile
-  patch -p1 <$srcdir/ibam-0.5.2-sysfs.patch
+  patch -p1 <$srcdir/03acpi-check.dpatch
 
   make
 }