From 02835a786fa9392e090376c605b082954e64e8cd Mon Sep 17 00:00:00 2001 From: Richard Hughes Date: Thu, 2 Jul 2009 11:12:31 +0100 Subject: udev rules files now live in /lib/udev/rules.d, not /etc/udev/rules.d --- src/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/Makefile.am') diff --git a/src/Makefile.am b/src/Makefile.am index daffad1..a7219a4 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -108,7 +108,7 @@ dbusconf_DATA = $(dbusconf_in_files:.conf.in=.conf) $(dbusconf_DATA): $(dbusconf_in_files) Makefile cp $< $@ -udevrulesdir = $(sysconfdir)/udev/rules.d +udevrulesdir = $(slashlibdir)/udev/rules.d udevrules_DATA = \ 95-devkit-power-wup.rules \ 95-devkit-power-hid.rules \ -- cgit v1.2.1 From ccc3643f7e9d26e449ed362daca5de4f81891bb0 Mon Sep 17 00:00:00 2001 From: Richard Hughes Date: Fri, 3 Jul 2009 09:11:36 +0100 Subject: Add battery recall data rules --- src/Makefile.am | 34 +++++++++++++++++++--------------- 1 file changed, 19 insertions(+), 15 deletions(-) (limited to 'src/Makefile.am') diff --git a/src/Makefile.am b/src/Makefile.am index a7219a4..bff432b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -54,13 +54,13 @@ dkp-wakeups-glue.h: org.freedesktop.DeviceKit.Power.Wakeups.xml Makefile.am libexec_PROGRAMS = devkit-power-daemon dbusifdir = $(datadir)/dbus-1/interfaces -dbusif_DATA = \ - org.freedesktop.DeviceKit.Power.xml \ - org.freedesktop.DeviceKit.Power.Device.xml \ - org.freedesktop.DeviceKit.Power.QoS.xml \ +dbusif_DATA = \ + org.freedesktop.DeviceKit.Power.xml \ + org.freedesktop.DeviceKit.Power.Device.xml \ + org.freedesktop.DeviceKit.Power.QoS.xml \ org.freedesktop.DeviceKit.Power.Wakeups.xml -devkit_power_daemon_SOURCES = \ +devkit_power_daemon_SOURCES = \ egg-debug.c \ egg-debug.h \ dkp-polkit.h dkp-polkit.c \ @@ -79,13 +79,13 @@ devkit_power_daemon_SOURCES = \ dkp-main.c \ $(BUILT_SOURCES) -devkit_power_daemon_CPPFLAGS = \ +devkit_power_daemon_CPPFLAGS = \ -I$(top_srcdir)/src \ -DG_LOG_DOMAIN=\"dkp-daemon\" \ $(DISABLE_DEPRECATED) \ $(AM_CPPFLAGS) -devkit_power_daemon_LDADD = \ +devkit_power_daemon_LDADD = \ -lm \ $(USB_LIBS) \ $(GIO_LIBS) \ @@ -109,9 +109,15 @@ $(dbusconf_DATA): $(dbusconf_in_files) Makefile cp $< $@ udevrulesdir = $(slashlibdir)/udev/rules.d -udevrules_DATA = \ - 95-devkit-power-wup.rules \ - 95-devkit-power-hid.rules \ +udevrules_DATA = \ + 95-devkit-power-battery-recall-dell.rules \ + 95-devkit-power-battery-recall-fujitsu.rules \ + 95-devkit-power-battery-recall-gateway.rules \ + 95-devkit-power-battery-recall-ibm.rules \ + 95-devkit-power-battery-recall-lenovo.rules \ + 95-devkit-power-battery-recall-toshiba.rules \ + 95-devkit-power-wup.rules \ + 95-devkit-power-hid.rules \ 95-devkit-power-csr.rules install-data-hook: @@ -122,15 +128,13 @@ install-data-hook: CLEANFILES = $(BUILT_SOURCES) EXTRA_DIST = \ - org.freedesktop.DeviceKit.Power.xml \ + org.freedesktop.DeviceKit.Power.xml \ org.freedesktop.DeviceKit.Power.Device.xml \ org.freedesktop.DeviceKit.Power.QoS.xml \ org.freedesktop.DeviceKit.Power.Wakeups.xml \ dkp-marshal.list \ - 95-devkit-power-csr.rules \ - 95-devkit-power-hid.rules \ - 95-devkit-power-wup.rules \ - $(service_in_files) \ + $(udevrules_DATA) \ + $(service_in_files) \ $(dbusconf_in_files) clean-local : -- cgit v1.2.1 From 0a5149ea6a1db4064077236806fb5eed520743b1 Mon Sep 17 00:00:00 2001 From: Richard Hughes Date: Fri, 3 Jul 2009 10:52:24 +0100 Subject: Protect the non-GObject accessors with DKP_DISABLE_DEPRECIATED and fix up the client tool --- src/Makefile.am | 1 + 1 file changed, 1 insertion(+) (limited to 'src/Makefile.am') diff --git a/src/Makefile.am b/src/Makefile.am index bff432b..0b4c601 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -11,6 +11,7 @@ INCLUDES = \ -DPACKAGE_LIB_DIR=\""$(libdir)"\" \ -D_POSIX_PTHREAD_SEMANTICS -D_REENTRANT \ -DDKP_COMPILATION \ + -DDKP_DISABLE_DEPRECIATED \ -DEGG_LOG_FILE=\""$(DKP_LOG_DIR)/DeviceKit-power"\" \ -DEGG_VERBOSE="\"DKP_VERBOSE\"" \ -DEGG_LOGGING="\"DKP_LOGGING\"" \ -- cgit v1.2.1 From db41483230c7f5ad221be0167922cc42bf762634 Mon Sep 17 00:00:00 2001 From: Richard Hughes Date: Fri, 3 Jul 2009 11:05:00 +0100 Subject: I must learn to spell deprecated... --- src/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/Makefile.am') diff --git a/src/Makefile.am b/src/Makefile.am index 0b4c601..bef1213 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -11,7 +11,7 @@ INCLUDES = \ -DPACKAGE_LIB_DIR=\""$(libdir)"\" \ -D_POSIX_PTHREAD_SEMANTICS -D_REENTRANT \ -DDKP_COMPILATION \ - -DDKP_DISABLE_DEPRECIATED \ + -DDKP_DISABLE_DEPRECATED \ -DEGG_LOG_FILE=\""$(DKP_LOG_DIR)/DeviceKit-power"\" \ -DEGG_VERBOSE="\"DKP_VERBOSE\"" \ -DEGG_LOGGING="\"DKP_LOGGING\"" \ -- cgit v1.2.1 From 5380720f959541a949346033c511cecc83ba977a Mon Sep 17 00:00:00 2001 From: Richard Hughes Date: Fri, 3 Jul 2009 11:53:34 +0100 Subject: Move the udev rules to thier own directory --- src/Makefile.am | 13 ------------- 1 file changed, 13 deletions(-) (limited to 'src/Makefile.am') diff --git a/src/Makefile.am b/src/Makefile.am index bef1213..14f68de 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -109,18 +109,6 @@ dbusconf_DATA = $(dbusconf_in_files:.conf.in=.conf) $(dbusconf_DATA): $(dbusconf_in_files) Makefile cp $< $@ -udevrulesdir = $(slashlibdir)/udev/rules.d -udevrules_DATA = \ - 95-devkit-power-battery-recall-dell.rules \ - 95-devkit-power-battery-recall-fujitsu.rules \ - 95-devkit-power-battery-recall-gateway.rules \ - 95-devkit-power-battery-recall-ibm.rules \ - 95-devkit-power-battery-recall-lenovo.rules \ - 95-devkit-power-battery-recall-toshiba.rules \ - 95-devkit-power-wup.rules \ - 95-devkit-power-hid.rules \ - 95-devkit-power-csr.rules - install-data-hook: if test -w $(DESTDIR)$(prefix)/; then \ mkdir -p $(DESTDIR)$(localstatedir)/lib/DeviceKit-power; \ @@ -134,7 +122,6 @@ EXTRA_DIST = \ org.freedesktop.DeviceKit.Power.QoS.xml \ org.freedesktop.DeviceKit.Power.Wakeups.xml \ dkp-marshal.list \ - $(udevrules_DATA) \ $(service_in_files) \ $(dbusconf_in_files) -- cgit v1.2.1 From fec78d3fbb440ff0abbf095edd63d8c1d25cbbeb Mon Sep 17 00:00:00 2001 From: Richard Hughes Date: Fri, 3 Jul 2009 13:25:07 +0100 Subject: Add a backlight interface so we can control backlight brightness without HAL --- src/Makefile.am | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'src/Makefile.am') diff --git a/src/Makefile.am b/src/Makefile.am index 14f68de..7062a06 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -31,6 +31,7 @@ BUILT_SOURCES = \ dkp-device-glue.h \ dkp-qos-glue.h \ dkp-wakeups-glue.h \ + dkp-backlight-glue.h \ dkp-marshal.h \ dkp-marshal.c @@ -52,6 +53,9 @@ dkp-qos-glue.h: org.freedesktop.DeviceKit.Power.QoS.xml Makefile.am dkp-wakeups-glue.h: org.freedesktop.DeviceKit.Power.Wakeups.xml Makefile.am dbus-binding-tool --prefix=dkp_wakeups --mode=glib-server --output=dkp-wakeups-glue.h org.freedesktop.DeviceKit.Power.Wakeups.xml +dkp-backlight-glue.h: org.freedesktop.DeviceKit.Power.Backlight.xml Makefile.am + dbus-binding-tool --prefix=dkp_backlight --mode=glib-server --output=dkp-backlight-glue.h org.freedesktop.DeviceKit.Power.Backlight.xml + libexec_PROGRAMS = devkit-power-daemon dbusifdir = $(datadir)/dbus-1/interfaces @@ -59,6 +63,7 @@ dbusif_DATA = \ org.freedesktop.DeviceKit.Power.xml \ org.freedesktop.DeviceKit.Power.Device.xml \ org.freedesktop.DeviceKit.Power.QoS.xml \ + org.freedesktop.DeviceKit.Power.Backlight.xml \ org.freedesktop.DeviceKit.Power.Wakeups.xml devkit_power_daemon_SOURCES = \ @@ -75,6 +80,7 @@ devkit_power_daemon_SOURCES = \ dkp-input.h dkp-input.c \ dkp-qos.h dkp-qos.c \ dkp-wakeups.h dkp-wakeups.c \ + dkp-backlight.h dkp-backlight.c \ dkp-history.h dkp-history.c \ sysfs-utils.h sysfs-utils.c \ dkp-main.c \ @@ -120,6 +126,7 @@ EXTRA_DIST = \ org.freedesktop.DeviceKit.Power.xml \ org.freedesktop.DeviceKit.Power.Device.xml \ org.freedesktop.DeviceKit.Power.QoS.xml \ + org.freedesktop.DeviceKit.Power.Backlight.xml \ org.freedesktop.DeviceKit.Power.Wakeups.xml \ dkp-marshal.list \ $(service_in_files) \ -- cgit v1.2.1 From 37767c77bbda8ca932cfaf9bdf0a6692b8b51fdb Mon Sep 17 00:00:00 2001 From: Richard Hughes Date: Sun, 5 Jul 2009 09:34:55 +0100 Subject: Revert "Add a backlight interface so we can control backlight brightness without HAL" This reverts commit fec78d3fbb440ff0abbf095edd63d8c1d25cbbeb. --- src/Makefile.am | 7 ------- 1 file changed, 7 deletions(-) (limited to 'src/Makefile.am') diff --git a/src/Makefile.am b/src/Makefile.am index 7062a06..14f68de 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -31,7 +31,6 @@ BUILT_SOURCES = \ dkp-device-glue.h \ dkp-qos-glue.h \ dkp-wakeups-glue.h \ - dkp-backlight-glue.h \ dkp-marshal.h \ dkp-marshal.c @@ -53,9 +52,6 @@ dkp-qos-glue.h: org.freedesktop.DeviceKit.Power.QoS.xml Makefile.am dkp-wakeups-glue.h: org.freedesktop.DeviceKit.Power.Wakeups.xml Makefile.am dbus-binding-tool --prefix=dkp_wakeups --mode=glib-server --output=dkp-wakeups-glue.h org.freedesktop.DeviceKit.Power.Wakeups.xml -dkp-backlight-glue.h: org.freedesktop.DeviceKit.Power.Backlight.xml Makefile.am - dbus-binding-tool --prefix=dkp_backlight --mode=glib-server --output=dkp-backlight-glue.h org.freedesktop.DeviceKit.Power.Backlight.xml - libexec_PROGRAMS = devkit-power-daemon dbusifdir = $(datadir)/dbus-1/interfaces @@ -63,7 +59,6 @@ dbusif_DATA = \ org.freedesktop.DeviceKit.Power.xml \ org.freedesktop.DeviceKit.Power.Device.xml \ org.freedesktop.DeviceKit.Power.QoS.xml \ - org.freedesktop.DeviceKit.Power.Backlight.xml \ org.freedesktop.DeviceKit.Power.Wakeups.xml devkit_power_daemon_SOURCES = \ @@ -80,7 +75,6 @@ devkit_power_daemon_SOURCES = \ dkp-input.h dkp-input.c \ dkp-qos.h dkp-qos.c \ dkp-wakeups.h dkp-wakeups.c \ - dkp-backlight.h dkp-backlight.c \ dkp-history.h dkp-history.c \ sysfs-utils.h sysfs-utils.c \ dkp-main.c \ @@ -126,7 +120,6 @@ EXTRA_DIST = \ org.freedesktop.DeviceKit.Power.xml \ org.freedesktop.DeviceKit.Power.Device.xml \ org.freedesktop.DeviceKit.Power.QoS.xml \ - org.freedesktop.DeviceKit.Power.Backlight.xml \ org.freedesktop.DeviceKit.Power.Wakeups.xml \ dkp-marshal.list \ $(service_in_files) \ -- cgit v1.2.1