2010/2/5 Martin Pitt <[email protected]>: > Hello Richard, > > Richard Hughes [2010-02-01 11:56 +0000]: >> Version 0.9.0 > > Yay upower, thanks! > > When I started to package this I noticed that the transition is still > incomplete, and the daemon/tools are still using dk-power-gobject, not > libupower-glib. > > After some two hours I now have some 90% of the remaining porting > done, but now I'm stuck at the two up-device.h versions in src/ and > libupower-glib/ which conflict to each other. I'm afraid I need your > help with that to figure out what the real fix is. > > I attached my current porting patch to > https://bugs.freedesktop.org/show_bug.cgi?id=26437 , perhaps we can > discuss the remaining bits there?
I guess I chime in here and help with the porting. Please find attached three patches which further cleanup references to DeviceKit-power. Richard, if you prefer a bug report, just let me know. Cheers, Michael -- Why is it that all of the instruments seeking intelligent life in the universe are pointed away from Earth?
From ee855ca15dba6e08005705a302787dd42983e71b Mon Sep 17 00:00:00 2001 From: Michael Biebl <[email protected]> Date: Fri, 5 Feb 2010 05:07:10 +0100 Subject: [PATCH 1/3] Remove EGG_* log define. The EGG_* log defines don't seem to be used and still reference the old DeviceKit-power name. So just remove it. --- src/Makefile.am | 4 ---- src/dummy/Makefile.am | 4 ---- src/freebsd/Makefile.am | 4 ---- src/linux/Makefile.am | 4 ---- tools/Makefile.am | 4 ---- 5 files changed, 0 insertions(+), 20 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index ea5a8c3..343ed27 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -15,10 +15,6 @@ INCLUDES = \ -DG_UDEV_API_IS_SUBJECT_TO_CHANGE \ -DUP_COMPILATION \ -DUP_DISABLE_DEPRECATED \ - -DEGG_LOG_FILE=\""$(UP_LOG_DIR)/DeviceKit-power"\" \ - -DEGG_VERBOSE="\"UP_VERBOSE\"" \ - -DEGG_LOGGING="\"UP_LOGGING\"" \ - -DEGG_CONSOLE="\"UP_CONSOLE\"" \ -I$(top_srcdir)/libupower-glib \ -I$(top_srcdir)/devkit-power-gobject \ -I$(top_srcdir) \ diff --git a/src/dummy/Makefile.am b/src/dummy/Makefile.am index ef1742b..d2bc86a 100644 --- a/src/dummy/Makefile.am +++ b/src/dummy/Makefile.am @@ -2,10 +2,6 @@ INCLUDES = \ -I$(top_builddir)/src -I$(top_srcdir)/src \ - -DEGG_LOG_FILE=\""$(UP_LOG_DIR)/DeviceKit-power"\" \ - -DEGG_VERBOSE="\"UP_VERBOSE\"" \ - -DEGG_LOGGING="\"UP_LOGGING\"" \ - -DEGG_CONSOLE="\"UP_CONSOLE\"" \ -DUP_COMPILATION \ -DEGG_TEST \ -I$(top_srcdir)/devkit-power-gobject \ diff --git a/src/freebsd/Makefile.am b/src/freebsd/Makefile.am index 85f792f..2bd456c 100644 --- a/src/freebsd/Makefile.am +++ b/src/freebsd/Makefile.am @@ -2,10 +2,6 @@ INCLUDES = \ -I$(top_builddir)/src -I$(top_srcdir)/src \ - -DEGG_LOG_FILE=\""$(UP_LOG_DIR)/DeviceKit-power"\" \ - -DEGG_VERBOSE="\"UP_VERBOSE\"" \ - -DEGG_LOGGING="\"UP_LOGGING\"" \ - -DEGG_CONSOLE="\"UP_CONSOLE\"" \ -DUP_COMPILATION \ -I$(top_srcdir)/devkit-power-gobject \ $(DBUS_GLIB_CFLAGS) \ diff --git a/src/linux/Makefile.am b/src/linux/Makefile.am index 79b3187..2ab4dbb 100644 --- a/src/linux/Makefile.am +++ b/src/linux/Makefile.am @@ -2,10 +2,6 @@ INCLUDES = \ -I$(top_builddir)/src -I$(top_srcdir)/src \ - -DEGG_LOG_FILE=\""$(UP_LOG_DIR)/DeviceKit-power"\" \ - -DEGG_VERBOSE="\"UP_VERBOSE\"" \ - -DEGG_LOGGING="\"UP_LOGGING\"" \ - -DEGG_CONSOLE="\"UP_CONSOLE\"" \ -DUP_COMPILATION \ -DG_UDEV_API_IS_SUBJECT_TO_CHANGE \ -I$(top_srcdir)/devkit-power-gobject \ diff --git a/tools/Makefile.am b/tools/Makefile.am index 58fcc0a..a82123e 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -2,10 +2,6 @@ INCLUDES = \ -DUP_COMPILATION \ - -DEGG_LOG_FILE=\""$(UP_LOG_DIR)/DeviceKit-power"\" \ - -DEGG_VERBOSE="\"DKP_VERBOSE\"" \ - -DEGG_LOGGING="\"DKP_LOGGING\"" \ - -DEGG_CONSOLE="\"DKP_CONSOLE\"" \ -I$(top_srcdir) \ -I$(top_srcdir)/devkit-power-gobject \ $(DBUS_GLIB_CFLAGS) \ -- 1.6.6.1
From 912b606e56f69b0eea119d16502b200b79ad8670 Mon Sep 17 00:00:00 2001 From: Michael Biebl <[email protected]> Date: Fri, 5 Feb 2010 05:10:48 +0100 Subject: [PATCH 2/3] Use the new project name in g_option_context_new --- src/up-main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/up-main.c b/src/up-main.c index 1e221d4..493de25 100644 --- a/src/up-main.c +++ b/src/up-main.c @@ -146,7 +146,7 @@ main (gint argc, gchar **argv) g_type_init (); - context = g_option_context_new ("DeviceKit Power Daemon"); + context = g_option_context_new ("upower daemon"); g_option_context_add_main_entries (context, options, NULL); g_option_context_add_group (context, egg_debug_get_option_group ()); g_option_context_parse (context, &argc, &argv, NULL); -- 1.6.6.1
From c14986c98c7121d4ca8da2ddf0d7153c61684226 Mon Sep 17 00:00:00 2001 From: Michael Biebl <[email protected]> Date: Fri, 5 Feb 2010 05:11:57 +0100 Subject: [PATCH 3/3] Move the history files to /var/lib/upower Distros should move existing files from /var/lib/DeviceKit-power to /var/lib/upower on upgrades in their maintainer scripts. --- src/Makefile.am | 2 +- src/up-history.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 343ed27..928a759 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -175,7 +175,7 @@ $(dbusconf_DATA): $(dbusconf_in_files) Makefile install-data-hook: if test -w $(DESTDIR)$(prefix)/; then \ - mkdir -p $(DESTDIR)$(localstatedir)/lib/DeviceKit-power; \ + mkdir -p $(DESTDIR)$(localstatedir)/lib/upower; \ fi install-exec-hook: diff --git a/src/up-history.c b/src/up-history.c index a6f981d..19c263b 100644 --- a/src/up-history.c +++ b/src/up-history.c @@ -382,7 +382,7 @@ up_history_get_filename (UpHistory *history, const gchar *type) gchar *filename; filename = g_strdup_printf ("history-%s-%s.dat", type, history->priv->id); - path = g_build_filename (PACKAGE_LOCALSTATE_DIR, "lib", "DeviceKit-power", filename, NULL); + path = g_build_filename (PACKAGE_LOCALSTATE_DIR, "lib", "upower", filename, NULL); g_free (filename); return path; } -- 1.6.6.1
_______________________________________________ devkit-devel mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/devkit-devel
