[Pkg-utopia-commits] r653 - in packages/experimental/hal/debian: .
patches
Sjoerd Simons
sjoerd at costa.debian.org
Fri Feb 24 19:10:17 UTC 2006
Author: sjoerd
Date: 2006-02-24 19:10:17 +0000 (Fri, 24 Feb 2006)
New Revision: 653
Removed:
packages/experimental/hal/debian/patches/02_hal_addon_pmu.patch
packages/experimental/hal/debian/patches/03_hald_runnerpath.patch
Modified:
packages/experimental/hal/debian/changelog
Log:
* New upstream release
* debian/patches/02_hal_addon_pmu.patch
+ Removed. Fixed upstream
* debian/patches/03_hald_runnerpath.patch
+ Removed. Fixed upstream
Modified: packages/experimental/hal/debian/changelog
===================================================================
--- packages/experimental/hal/debian/changelog 2006-02-24 19:02:44 UTC (rev 652)
+++ packages/experimental/hal/debian/changelog 2006-02-24 19:10:17 UTC (rev 653)
@@ -1,8 +1,12 @@
hal (0.5.7-1) experimental; urgency=low
- * New upstream release
+ * New upstream release
+ * debian/patches/02_hal_addon_pmu.patch
+ + Removed. Fixed upstream
+ * debian/patches/03_hald_runnerpath.patch
+ + Removed. Fixed upstream
- -- Sjoerd Simons <sjoerd at debian.org> Fri, 24 Feb 2006 20:01:49 +0100
+ -- Sjoerd Simons <sjoerd at debian.org> Fri, 24 Feb 2006 20:03:09 +0100
hal (0.5.6+cvs20060219-1) experimental; urgency=low
Deleted: packages/experimental/hal/debian/patches/02_hal_addon_pmu.patch
===================================================================
--- packages/experimental/hal/debian/patches/02_hal_addon_pmu.patch 2006-02-24 19:02:44 UTC (rev 652)
+++ packages/experimental/hal/debian/patches/02_hal_addon_pmu.patch 2006-02-24 19:10:17 UTC (rev 653)
@@ -1,60 +0,0 @@
---- 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 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) {
-@@ -94,7 +79,7 @@
- else
- state = FALSE;
-
-- if ((fd = open ("/dev/adb", O_RDWR | O_NONBLOCK)) < 0) {
-+ if ((fd = open ("/dev/adb", O_RDWR)) < 0) {
- dbg ("Cannot open /dev/adb");
- goto out;
- }
-@@ -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) {
-- 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);
- }
-
-
Deleted: packages/experimental/hal/debian/patches/03_hald_runnerpath.patch
===================================================================
--- packages/experimental/hal/debian/patches/03_hald_runnerpath.patch 2006-02-24 19:02:44 UTC (rev 652)
+++ packages/experimental/hal/debian/patches/03_hald_runnerpath.patch 2006-02-24 19:10:17 UTC (rev 653)
@@ -1,66 +0,0 @@
-Index: hald-runner/main.c
-===================================================================
-RCS file: /cvs/hal/hal/hald-runner/main.c,v
-retrieving revision 1.3
-diff -u -r1.3 main.c
---- hald-runner/main.c 23 Jan 2006 14:54:48 -0000 1.3
-+++ hald-runner/main.c 19 Feb 2006 21:35:26 -0000
-@@ -47,13 +47,15 @@
- if (!dbus_message_iter_next(iter) || dbus_message_iter_get_arg_type(iter) != DBUS_TYPE_ARRAY)
- goto malformed;
- dbus_message_iter_recurse(iter, &sub_iter);
-- r->environment = get_string_array(&sub_iter);
-+ /* Add default path for the programs we start */
-+ tmpstr = g_strdup_printf("PATH=/sbin:/usr/sbin:/bin:/usr/bin:%s", getenv("PATH"));
-+ r->environment = get_string_array(&sub_iter, tmpstr);
-
- /* Then argv */
- if (!dbus_message_iter_next(iter) || dbus_message_iter_get_arg_type(iter) != DBUS_TYPE_ARRAY)
- goto malformed;
- dbus_message_iter_recurse(iter, &sub_iter);
-- r->argv = get_string_array(&sub_iter);
-+ r->argv = get_string_array(&sub_iter, NULL);
-
- return TRUE;
-
-Index: hald-runner/utils.c
-===================================================================
-RCS file: /cvs/hal/hal/hald-runner/utils.c,v
-retrieving revision 1.2
-diff -u -r1.2 utils.c
---- hald-runner/utils.c 23 Jan 2006 14:54:48 -0000 1.2
-+++ hald-runner/utils.c 19 Feb 2006 21:35:26 -0000
-@@ -31,7 +31,7 @@
- #include "utils.h"
-
- char **
--get_string_array(DBusMessageIter *iter)
-+get_string_array(DBusMessageIter *iter, char *extra)
- {
- GArray *array;
- char **result;
-@@ -45,6 +45,8 @@
- g_array_append_vals(array, &t, 1);
- dbus_message_iter_next(iter);
- }
-+ if (extra != NULL)
-+ g_array_append_vals(array, &extra, 1);
- result = (char **) array->data;
- g_array_free(array, FALSE);
- return result;
-Index: hald-runner/utils.h
-===================================================================
-RCS file: /cvs/hal/hal/hald-runner/utils.h,v
-retrieving revision 1.1
-diff -u -r1.1 utils.h
---- hald-runner/utils.h 21 Jan 2006 02:45:27 -0000 1.1
-+++ hald-runner/utils.h 19 Feb 2006 21:35:26 -0000
-@@ -28,7 +28,7 @@
- #define DBUS_API_SUBJECT_TO_CHANGE
- #include <dbus/dbus-glib-lowlevel.h>
-
--char **get_string_array(DBusMessageIter *iter);
-+char **get_string_array(DBusMessageIter *iter, gchar *extra);
- char **get_string_array_from_fd(int fd);
- void free_string_array(char **array);
-
More information about the Pkg-utopia-commits
mailing list