[Pkg-utopia-commits] r607 - in packages/experimental/hal/debian: . patches

[Sjoerd Simons]

Author: sjoerd
Date: 2006-02-17 21:24:33 +0000 (Fri, 17 Feb 2006)
New Revision: 607

Modified:
   packages/experimental/hal/debian/changelog
   packages/experimental/hal/debian/patches/02_hal_addon_pmu.patch
Log:
* debian/patches/02_hal_addon_pmu.patch
  + Updated
* Sync with Ubuntu

Modified: packages/experimental/hal/debian/changelog
===================================================================
--- packages/experimental/hal/debian/changelog	2006-02-17 21:23:19 UTC (rev 606)
+++ packages/experimental/hal/debian/changelog	2006-02-17 21:24:33 UTC (rev 607)
@@ -3,19 +3,21 @@
   * CVS snapshot
   * debian/patches/01_hal_privsep.patch
     + Removed. Fixed upstream
+  * debian/patches/02_hal_addon_pmu.patch
+    + Updated
   * debian/patches/03_storage_sigio.patch
     + Removed. Fixed upstream
   * debian/patches/04_hald-no-patch.patch
     + Removed. Fixed upstream
   * debian/patches/05_hald_clear_udev_buffer.patch
     + Removed. Fixed upstream
-  * Sync with Ubuntu 
+  * Sync with Ubuntu
     + Remove unneeded build-depends (libsysfs-dev and libcap-dev)
     + force-reload dbus instead of reload
     + Remove obsolete fdi example conffile
     + Add small utility script to run hald from the debian dir.
 
- -- Sjoerd Simons <sjoerd at debian.org>  Fri, 17 Feb 2006 22:06:47 +0100
+ -- Sjoerd Simons <sjoerd at debian.org>  Fri, 17 Feb 2006 22:24:01 +0100
 
 hal (0.5.6-4) unstable; urgency=high
 

Modified: packages/experimental/hal/debian/patches/02_hal_addon_pmu.patch
===================================================================
--- packages/experimental/hal/debian/patches/02_hal_addon_pmu.patch	2006-02-17 21:23:19 UTC (rev 606)
+++ packages/experimental/hal/debian/patches/02_hal_addon_pmu.patch	2006-02-17 21:24:33 UTC (rev 607)
@@ -1,26 +1,35 @@
-diff -ruN hal-0.5.6-old/hald/linux2/addons/addon-pmu.c hal-0.5.6/hald/linux2/addons/addon-pmu.c
---- hal-0.5.6-old/hald/linux2/addons/addon-pmu.c	2005-11-02 16:35:09.000000000 +0100
-+++ hal-0.5.6/hald/linux2/addons/addon-pmu.c	2006-01-19 23:11:54.000000000 +0100
-@@ -66,15 +66,10 @@
- 		goto out;
+Index: hald/linux2/addons/addon-pmu.c
+===================================================================
+RCS file: /cvs/hal/hal/hald/linux2/addons/addon-pmu.c,v
+retrieving revision 1.5
+diff -u -r1.5 addon-pmu.c
+--- hald/linux2/addons/addon-pmu.c	18 Jan 2006 23:22:33 -0000	1.5
++++ hald/linux2/addons/addon-pmu.c	17 Feb 2006 19:25:53 -0000
+@@ -66,23 +66,8 @@
  
  	dbus_error_init (&error);
--	if ((conn = dbus_bus_get (DBUS_BUS_SYSTEM, &error)) == NULL)
--		goto out;
--	
--	if ((ctx = libhal_ctx_new ()) == NULL)
--		goto out;
--	if (!libhal_ctx_set_dbus_connection (ctx, conn))
--		goto out;
--	if (!libhal_ctx_init (ctx, &error))
-+	if ((ctx = libhal_ctx_init_direct (&error)) == NULL) {
-+    fprintf(stderr, "Context setup failed\n");
+ 
+-#if 0
+-	{
+-		DBusConnection *conn;
+-		if ((conn = dbus_bus_get (DBUS_BUS_SYSTEM, &error)) == NULL)
+-			goto out;
+-		
+-		if ((ctx = libhal_ctx_new ()) == NULL)
+-			goto out;
+-		if (!libhal_ctx_set_dbus_connection (ctx, conn))
+-			goto out;
+-		if (!libhal_ctx_init (ctx, &error))
+-			goto out;
+-	}
+-#else
+ 	if ((ctx = libhal_ctx_init_direct (&error)) == NULL)
  		goto out;
-+  }
+-#endif
  
  	/* initial state */
  	if ((strstate = getenv ("HAL_PROP_BUTTON_STATE_VALUE")) == NULL) {
-@@ -86,7 +81,7 @@
+@@ -94,7 +79,7 @@
  	else
  		state = FALSE;
  
@@ -29,12 +38,28 @@
                  dbg ("Cannot open /dev/adb");
                  goto out;
  	}
-@@ -101,7 +96,7 @@
+@@ -106,14 +91,9 @@
+ 		buf[1] = PMU_GET_COVER;
+ 
+ 		n = write (fd, buf, 2);
+-
+-		usleep (100 * 1000);
+-
  		if (n == 2) {
  			rd = read (fd, buf, sizeof (buf));
  			if (rd <= 0) {
--				dbg ("Error reading from fd; read returned %d; err=%s", strerror (errno));
-+				dbg ("Error reading from fd; read returned %d; err=%s", rd, strerror (errno));
+-				if (errno == EAGAIN)
+-					goto tryagain;
+ 				dbg ("Error reading from fd; read returned %d; err=%s", errno, strerror (errno));
  				goto out;
  			}
+@@ -144,8 +124,7 @@
  
+ 			
+ 		}
+-	tryagain:
+-		usleep (900 * 1000);
++		usleep (1000 * 1000);
+ 	}
+ 
+