diff options
| -rw-r--r-- | doc/Makefile.am | 12 | ||||
| -rw-r--r-- | doc/devkit-power-docs.xml | 2 | ||||
| -rw-r--r-- | doc/man/Makefile.am | 17 | ||||
| -rw-r--r-- | doc/man/UPower.xml (renamed from doc/man/DeviceKit-power.xml) | 22 | ||||
| -rw-r--r-- | doc/man/upower.xml (renamed from doc/man/devkit-power.xml) | 24 | ||||
| -rw-r--r-- | doc/man/upowerd.xml (renamed from doc/man/devkit-power-daemon.xml) | 20 | ||||
| -rw-r--r-- | src/.gitignore | 2 | ||||
| -rw-r--r-- | src/Makefile.am | 34 | ||||
| -rw-r--r-- | src/org.freedesktop.UPower.service.in | 2 | ||||
| -rw-r--r-- | src/up-main.c | 2 | ||||
| -rw-r--r-- | tools/Makefile.am | 2 |
11 files changed, 67 insertions, 72 deletions
diff --git a/doc/Makefile.am b/doc/Makefile.am index 5c31452..1f0bbaa 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -49,12 +49,12 @@ MKTMPL_OPTIONS= # Non-autogenerated SGML files to be included in $(DOC_MAIN_SGML_FILE) content_files = \ version.xml \ - man/devkit-power.xml \ - man/devkit-power-daemon.xml \ - man/DeviceKit-power.xml \ - dbus/org.freedesktop.UPower.ref.xml \ - dbus/org.freedesktop.UPower.Device.ref.xml \ - dbus/org.freedesktop.UPower.QoS.ref.xml \ + man/upower.xml \ + man/upowerd.xml \ + man/UPower.xml \ + dbus/org.freedesktop.UPower.ref.xml \ + dbus/org.freedesktop.UPower.Device.ref.xml \ + dbus/org.freedesktop.UPower.QoS.ref.xml \ $(NULL) # Images to copy into HTML directory diff --git a/doc/devkit-power-docs.xml b/doc/devkit-power-docs.xml index 6a4193b..51b67f2 100644 --- a/doc/devkit-power-docs.xml +++ b/doc/devkit-power-docs.xml @@ -77,7 +77,7 @@ </para> </partintro> <xi:include href="man/DeviceKit-power.xml"/> - <xi:include href="man/devkit-power-daemon.xml"/> + <xi:include href="man/upowerd.xml"/> <xi:include href="man/devkit-power.xml"/> </reference> diff --git a/doc/man/Makefile.am b/doc/man/Makefile.am index f49dde9..6a7489f 100644 --- a/doc/man/Makefile.am +++ b/doc/man/Makefile.am @@ -1,13 +1,9 @@ - -NULL = - if MAN_PAGES_ENABLED man_MANS = \ - devkit-power.1 \ - devkit-power-daemon.8 \ - DeviceKit-power.7 \ - $(NULL) + upower.1 \ + upowerd.8 \ + UPower.7 %.1 %.7 %.8 : %.xml $(XSLTPROC) -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $< @@ -15,10 +11,9 @@ man_MANS = \ endif # MAN_PAGES_ENABLED EXTRA_DIST= \ - devkit-power.xml \ - devkit-power-daemon.xml \ - DeviceKit-power.xml \ - $(NULL) + upower.xml \ + upowerd.xml \ + UPower.xml clean-local: rm -f *~ *.[178] diff --git a/doc/man/DeviceKit-power.xml b/doc/man/UPower.xml index 808faf9..2d4c14d 100644 --- a/doc/man/DeviceKit-power.xml +++ b/doc/man/UPower.xml @@ -1,24 +1,24 @@ -<refentry id="DeviceKit-power.7"> +<refentry id="UPower.7"> <refentryinfo> - <title>DeviceKit-power</title> + <title>UPower</title> <date>March 2008</date> - <productname>DeviceKit-power</productname> + <productname>UPower</productname> </refentryinfo> <refmeta> - <refentrytitle>DeviceKit-power</refentrytitle> + <refentrytitle>UPower</refentrytitle> <manvolnum>7</manvolnum> <refmiscinfo class="version"></refmiscinfo> </refmeta> <refnamediv> - <refname>DeviceKit-power</refname> + <refname>UPower</refname> <refpurpose>System-wide Power Management</refpurpose> </refnamediv> <refsect1><title>DESCRIPTION</title> <para> - DeviceKit-power provides an interface to enumerate power sources + UPower provides an interface to enumerate power sources on the system and control system-wide power management. Any application can access the <emphasis>org.freedesktop.UPower</emphasis> service @@ -29,7 +29,8 @@ <refsect1><title>AUTHOR</title> <para> - Written by David Zeuthen <email>davidz@redhat.com</email> with + Written by David Zeuthen <email>davidz@redhat.com</email>, + Richard Hughes <email>richard@hughsie.com</email> and with a lot of help from many others. </para> </refsect1> @@ -48,16 +49,13 @@ <title>SEE ALSO</title> <para> <citerefentry> - <refentrytitle>DeviceKit</refentrytitle><manvolnum>7</manvolnum> - </citerefentry>, - <citerefentry> <refentrytitle>PolicyKit</refentrytitle><manvolnum>8</manvolnum> </citerefentry>, <citerefentry> - <refentrytitle>devkit-power-daemon</refentrytitle><manvolnum>8</manvolnum> + <refentrytitle>upowerd</refentrytitle><manvolnum>8</manvolnum> </citerefentry>, <citerefentry> - <refentrytitle>devkit-power</refentrytitle><manvolnum>1</manvolnum> + <refentrytitle>upower</refentrytitle><manvolnum>1</manvolnum> </citerefentry> </para> </refsect1> diff --git a/doc/man/devkit-power.xml b/doc/man/upower.xml index 938d06c..7b11641 100644 --- a/doc/man/devkit-power.xml +++ b/doc/man/upower.xml @@ -1,24 +1,24 @@ -<refentry id="devkit-power.1"> +<refentry id="upower.1"> <refentryinfo> - <title>devkit-power</title> + <title>upower</title> <date>April 2008</date> - <productname>devkit-power</productname> + <productname>upower</productname> </refentryinfo> <refmeta> - <refentrytitle>devkit-power</refentrytitle> + <refentrytitle>upower</refentrytitle> <manvolnum>1</manvolnum> <refmiscinfo class="version"></refmiscinfo> </refmeta> <refnamediv> - <refname>devkit-power</refname> - <refpurpose>DeviceKit-power command line tool</refpurpose> + <refname>upower</refname> + <refpurpose>UPower command line tool</refpurpose> </refnamediv> <refsynopsisdiv> <cmdsynopsis> - <command>devkit-power</command> + <command>upower</command> <arg><option>--enumerate</option></arg> <arg><option>--monitor</option></arg> <arg><option>--monitor-detail</option></arg> @@ -29,9 +29,9 @@ <refsect1><title>DESCRIPTION</title> <para> - <emphasis><refentrytitle>devkit-power</refentrytitle></emphasis> is a + <emphasis><refentrytitle>upower</refentrytitle></emphasis> is a simple command line client for the - <citerefentry><refentrytitle>DeviceKit-power</refentrytitle><manvolnum>7</manvolnum></citerefentry> + <citerefentry><refentrytitle>UPower</refentrytitle><manvolnum>7</manvolnum></citerefentry> daemon. TODO: not fully documented. </para> </refsect1> @@ -43,7 +43,7 @@ <term><option>--monitor</option></term> <listitem> <para> - Connect to the DeviceKit-power daemon and print a line + Connect to the UPower daemon and print a line every time a power source is added, removed or changed. </para> </listitem> @@ -89,10 +89,10 @@ <title>SEE ALSO</title> <para> <citerefentry> - <refentrytitle>devkit-power-daemon</refentrytitle><manvolnum>8</manvolnum> + <refentrytitle>upowerd</refentrytitle><manvolnum>8</manvolnum> </citerefentry>, <citerefentry> - <refentrytitle>DeviceKit-power</refentrytitle><manvolnum>7</manvolnum> + <refentrytitle>UPower</refentrytitle><manvolnum>7</manvolnum> </citerefentry>, </para> </refsect1> diff --git a/doc/man/devkit-power-daemon.xml b/doc/man/upowerd.xml index d672348..511fe16 100644 --- a/doc/man/devkit-power-daemon.xml +++ b/doc/man/upowerd.xml @@ -1,24 +1,24 @@ -<refentry id="devkit-power-daemon.8"> +<refentry id="upowerd.8"> <refentryinfo> - <title>devkit-power-daemon</title> + <title>upowerd</title> <date>April 2008</date> - <productname>devkit-power-daemon</productname> + <productname>upowerd</productname> </refentryinfo> <refmeta> - <refentrytitle>devkit-power-daemon</refentrytitle> + <refentrytitle>upowerd</refentrytitle> <manvolnum>8</manvolnum> <refmiscinfo class="version"></refmiscinfo> </refmeta> <refnamediv> - <refname>devkit-power-daemon</refname> - <refpurpose>DeviceKit-power Daemon</refpurpose> + <refname>upowerd</refname> + <refpurpose>UPower Daemon</refpurpose> </refnamediv> <refsynopsisdiv> <cmdsynopsis> - <command>devkit-power-daemon</command> + <command>upowerd</command> <arg><option>--help</option></arg> </cmdsynopsis> </refsynopsisdiv> @@ -26,7 +26,7 @@ <refsect1><title>DESCRIPTION</title> <para> - <emphasis><refentrytitle>devkit-power-daemon</refentrytitle></emphasis> provides + <emphasis><refentrytitle>upowerd</refentrytitle></emphasis> provides the <emphasis>org.freedesktop.UPower</emphasis> service on the system message bus. Users or administrators should never need to start this daemon as it will be automatically started by @@ -71,10 +71,10 @@ <title>SEE ALSO</title> <para> <citerefentry> - <refentrytitle>DeviceKit-power</refentrytitle><manvolnum>7</manvolnum> + <refentrytitle>UPower</refentrytitle><manvolnum>7</manvolnum> </citerefentry>, <citerefentry> - <refentrytitle>devkit-power</refentrytitle><manvolnum>1</manvolnum> + <refentrytitle>upower</refentrytitle><manvolnum>1</manvolnum> </citerefentry>, <citerefentry> <refentrytitle>dbus-daemon</refentrytitle><manvolnum>1</manvolnum> diff --git a/src/.gitignore b/src/.gitignore index 75c1242..9e2bb52 100644 --- a/src/.gitignore +++ b/src/.gitignore @@ -1,5 +1,5 @@ .deps -devkit-power-daemon +upowerd dkp-self-test *.o *-glue.h diff --git a/src/Makefile.am b/src/Makefile.am index 8d27526..ea5a8c3 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -56,16 +56,16 @@ up-qos-glue.h: org.freedesktop.UPower.QoS.xml Makefile.am up-wakeups-glue.h: org.freedesktop.UPower.Wakeups.xml Makefile.am dbus-binding-tool --prefix=up_wakeups --mode=glib-server --output=up-wakeups-glue.h org.freedesktop.UPower.Wakeups.xml -libexec_PROGRAMS = devkit-power-daemon +libexec_PROGRAMS = upowerd dbusifdir = $(datadir)/dbus-1/interfaces dbusif_DATA = \ - org.freedesktop.UPower.xml \ - org.freedesktop.UPower.Device.xml \ - org.freedesktop.UPower.QoS.xml \ + org.freedesktop.UPower.xml \ + org.freedesktop.UPower.Device.xml \ + org.freedesktop.UPower.QoS.xml \ org.freedesktop.UPower.Wakeups.xml -devkit_power_daemon_SOURCES = \ +upowerd_SOURCES = \ egg-debug.c \ egg-debug.h \ up-polkit.h \ @@ -87,13 +87,12 @@ devkit_power_daemon_SOURCES = \ up-main.c \ $(BUILT_SOURCES) -devkit_power_daemon_CPPFLAGS = \ +upowerd_CPPFLAGS = \ -I$(top_srcdir)/src \ -DG_LOG_DOMAIN=\"up-daemon\" \ - $(DISABLE_DEPRECATED) \ $(AM_CPPFLAGS) -devkit_power_daemon_LDADD = \ +upowerd_LDADD = \ -lm \ $(USB_LIBS) \ $(GIO_LIBS) \ @@ -101,24 +100,24 @@ devkit_power_daemon_LDADD = \ $(POLKIT_LIBS) if BACKEND_TYPE_DUMMY -devkit_power_daemon_LDADD += \ +upowerd_LDADD += \ dummy/libupshared.la endif if BACKEND_TYPE_FREEBSD -devkit_power_daemon_LDADD += \ +upowerd_LDADD += \ freebsd/libupshared.la \ $(DEVKIT_POWER_LIBS) endif if BACKEND_TYPE_LINUX -devkit_power_daemon_LDADD += \ +upowerd_LDADD += \ linux/libupshared.la \ $(GUDEV_LIBS) \ $(DEVKIT_POWER_LIBS) endif -devkit_power_daemon_CFLAGS = \ +upowerd_CFLAGS = \ $(WARNINGFLAGS_C) \ $(NULL) @@ -183,13 +182,16 @@ install-data-hook: mkdir -p $(DESTDIR)$(localstatedir)/lib/DeviceKit-power; \ fi +install-exec-hook: + cd $(DESTDIR)$(libexecdir) && $(LN_S) -f upowerd devkit-power-daemon + CLEANFILES = $(BUILT_SOURCES) EXTRA_DIST = \ - org.freedesktop.UPower.xml \ - org.freedesktop.UPower.Device.xml \ - org.freedesktop.UPower.QoS.xml \ - org.freedesktop.UPower.Wakeups.xml \ + org.freedesktop.UPower.xml \ + org.freedesktop.UPower.Device.xml \ + org.freedesktop.UPower.QoS.xml \ + org.freedesktop.UPower.Wakeups.xml \ up-marshal.list \ $(service_in_files) \ $(dbusconf_in_files) diff --git a/src/org.freedesktop.UPower.service.in b/src/org.freedesktop.UPower.service.in index c15d799..0c30555 100644 --- a/src/org.freedesktop.UPower.service.in +++ b/src/org.freedesktop.UPower.service.in @@ -1,5 +1,5 @@ [D-BUS Service] Name=org.freedesktop.UPower -Exec=@libexecdir@/devkit-power-daemon +Exec=@libexecdir@/upowerd User=root diff --git a/src/up-main.c b/src/up-main.c index 85f1c9a..7fdf20f 100644 --- a/src/up-main.c +++ b/src/up-main.c @@ -178,7 +178,7 @@ main (gint argc, gchar **argv) /* do stuff on ctrl-c */ signal (SIGINT, up_main_sigint_handler); - egg_debug ("Starting devkit-power-daemon version %s", PACKAGE_VERSION); + egg_debug ("Starting upowerd version %s", PACKAGE_VERSION); qos = up_qos_new (); wakeups = up_wakeups_new (); diff --git a/tools/Makefile.am b/tools/Makefile.am index 4eb26e8..58fcc0a 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -31,7 +31,7 @@ upower_LDADD = \ $(POLKIT_DBUS_LIBS) install-exec-hook: - cd $(DESTDIR)$(bindir) && $(LN_S) upower devkit-power + cd $(DESTDIR)$(bindir) && $(LN_S) -f upower devkit-power CLEANFILES = $(BUILT_SOURCES) |