[arch-commits] Commit in devicekit-power/trunk (3 files)

Jan de Groot jgc at archlinux.org
Sat Dec 19 19:28:56 UTC 2009


    Date: Saturday, December 19, 2009 @ 14:28:56
  Author: jgc
Revision: 61560

upgpkg: devicekit-power 013-1
    Update to 013 - add some upstream patches, remove some old ones applied in 013 already

Modified:
  devicekit-power/trunk/PKGBUILD
Deleted:
  devicekit-power/trunk/fix-hibernate.patch
  devicekit-power/trunk/fix-recall.patch

---------------------+
 PKGBUILD            |   20 ++++++++++----------
 fix-hibernate.patch |   21 ---------------------
 fix-recall.patch    |   26 --------------------------
 3 files changed, 10 insertions(+), 57 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-12-19 19:21:33 UTC (rev 61559)
+++ PKGBUILD	2009-12-19 19:28:56 UTC (rev 61560)
@@ -3,9 +3,9 @@
 # Contributor: Denis Zawada <deno at rootnode.net>
 
 pkgname=devicekit-power
-pkgver=012
-pkgrel=2
-pkgdesc="DeviceKit-power is an abstraction for enumerating power devices, listening to device events and querying history and statistics"
+pkgver=013
+pkgrel=1
+pkgdesc="Abstraction for enumerating power devices, listening to device events and querying history and statistics"
 arch=('i686' 'x86_64')
 url="http://www.freedesktop.org/wiki/Software/DeviceKit"
 license=('GPL')
@@ -14,16 +14,16 @@
 replaces=('devicekit')
 options=('!emptydirs' '!libtool')
 source=(http://hal.freedesktop.org/releases/DeviceKit-power-${pkgver}.tar.gz
-        fix-hibernate.patch
-        fix-recall.patch)
-md5sums=('34b8d698658cce77050443125fa9fab4'
-         'a519e25412404d472e1d48f23dccebed'
-         '4b43f53622f71ebe922bf3db3c881515')
+        fix-segfault-history.patch
+        check-swap.patch)
+md5sums=('4fd56be8344556f55f86d476adbc9ab5'
+         'e6126f620264ab4f690bf3173515db2b'
+         '873222f0c6a1284d0cea3dda72a6d020')
 
 build() {
   cd "${srcdir}/DeviceKit-power-${pkgver}"
-  patch -Np1 -i "${srcdir}/fix-hibernate.patch" || return 1
-  patch -Np1 -i "${srcdir}/fix-recall.patch" || return 1
+  patch -Np1 -i "${srcdir}/fix-segfault-history.patch" || return 1
+  patch -Np1 -i "${srcdir}/check-swap.patch" || return 1
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
       --libexecdir=/usr/lib/DeviceKit --disable-static || return 1
   make || return 1

Deleted: fix-hibernate.patch
===================================================================
--- fix-hibernate.patch	2009-12-19 19:21:33 UTC (rev 61559)
+++ fix-hibernate.patch	2009-12-19 19:28:56 UTC (rev 61560)
@@ -1,21 +0,0 @@
-From 390c5b3aeb3d07ff6de3594fd08370e43b43c652 Mon Sep 17 00:00:00 2001
-From: Richard Hughes <richard at hughsie.com>
-Date: Wed, 21 Oct 2009 08:26:48 +0000
-Subject: Fix a trivial copy-paste error that broke hibernate for a lot of people
-
----
-diff --git a/src/dkp-daemon.c b/src/dkp-daemon.c
-index 20e65f8..eb16a63 100644
---- a/src/dkp-daemon.c
-+++ b/src/dkp-daemon.c
-@@ -563,7 +563,7 @@ dkp_daemon_hibernate (DkpDaemon *daemon, DBusGMethodInvocation *context)
- 	}
- 
- 	/* encrypted swap? */
--	if (!daemon->priv->hibernate_has_encrypted_swap) {
-+	if (daemon->priv->hibernate_has_encrypted_swap) {
- 		error = g_error_new (DKP_DAEMON_ERROR,
- 				     DKP_DAEMON_ERROR_GENERAL,
- 				     "Swap space is encrypted");
---
-cgit v0.8.2

Deleted: fix-recall.patch
===================================================================
--- fix-recall.patch	2009-12-19 19:21:33 UTC (rev 61559)
+++ fix-recall.patch	2009-12-19 19:28:56 UTC (rev 61560)
@@ -1,26 +0,0 @@
-From 54f37398c06fa2573aa6e734dd65ea87751ec3b1 Mon Sep 17 00:00:00 2001
-From: Martin Pitt <martin.pitt at ubuntu.com>
-Date: Wed, 14 Oct 2009 11:20:58 +0000
-Subject: Bug 24262 – incorrect battery recall warning for Lenovo T61
-
-According to
-http://www-307.ibm.com/pc/support/site.wss/document.do?sitestyle=lenovo&lndocid=BATT-LENOVO
-
-the Sony batteris are only recalled on some particular models.
----
-diff --git a/rules/95-devkit-power-battery-recall-ibm.rules b/rules/95-devkit-power-battery-recall-ibm.rules
-index ecff4fb..ad3800a 100644
---- a/rules/95-devkit-power-battery-recall-ibm.rules
-+++ b/rules/95-devkit-power-battery-recall-ibm.rules
-@@ -16,6 +16,9 @@ ATTR{type}!="Battery", GOTO="dkp_battery_recall_ibm_end"
- # only match correct manufacturer
- ATTR{manufacturer}!="SONY", GOTO="dkp_battery_recall_ibm_end"
- 
-+# only recalled on some particular models
-+ATTR{[dmi/id]product_version}!="*R60*|*T60*|*Z60m*|*Z61e*|*Z61m*|*Z61p*", GOTO="dkp_battery_recall_ibm_end"
-+
- ATTR{model_name}=="92P1072", ENV{DKP_RECALL_NOTICE}="1"
- ATTR{model_name}=="92P1073", ENV{DKP_RECALL_NOTICE}="1"
- ATTR{model_name}=="92P1088", ENV{DKP_RECALL_NOTICE}="1"
---
-cgit v0.8.2




More information about the arch-commits mailing list