Rename the DBus service from org.freedesktop.DeviceKit.Power to org.freedesktop.UPower

5 files changed, 14 insertions, 14 deletions

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 94b5b23..5c31452 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -52,9 +52,9 @@ content_files =  			    				\
 	man/devkit-power.xml		    				\
 	man/devkit-power-daemon.xml		    			\
 	man/DeviceKit-power.xml		    				\
-	dbus/org.freedesktop.DeviceKit.Power.ref.xml			\
-	dbus/org.freedesktop.DeviceKit.Power.Device.ref.xml		\
-	dbus/org.freedesktop.DeviceKit.Power.QoS.ref.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/dbus/Makefile.am b/doc/dbus/Makefile.am
index fd9f0c7..78c9aa5 100644
--- a/doc/dbus/Makefile.am
+++ b/doc/dbus/Makefile.am
@@ -1,19 +1,19 @@
 
-all : org.freedesktop.DeviceKit.Power.ref.xml org.freedesktop.DeviceKit.Power.Device.ref.xml org.freedesktop.DeviceKit.Power.QoS.ref.xml org.freedesktop.DeviceKit.Power.Wakeups.ref.xml
+all : org.freedesktop.UPower.ref.xml org.freedesktop.UPower.Device.ref.xml org.freedesktop.UPower.QoS.ref.xml org.freedesktop.UPower.Wakeups.ref.xml
 
-org.freedesktop.DeviceKit.Power.ref.xml : $(top_srcdir)/src/org.freedesktop.DeviceKit.Power.xml $(top_srcdir)/doc/dbus/spec-to-docbook.xsl
+org.freedesktop.UPower.ref.xml : $(top_srcdir)/src/org.freedesktop.UPower.xml $(top_srcdir)/doc/dbus/spec-to-docbook.xsl
 	echo "<?xml version=\"1.0\"?>""<!DOCTYPE refentry PUBLIC \"-//OASIS//DTD DocBook XML V4.1.2//EN\" \"http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd\">" > $@
 	$(XSLTPROC) $(top_srcdir)/doc/dbus/spec-to-docbook.xsl $< | tail -n +2 >> $@
 
-org.freedesktop.DeviceKit.Power.Device.ref.xml : $(top_srcdir)/src/org.freedesktop.DeviceKit.Power.Device.xml $(top_srcdir)/doc/dbus/spec-to-docbook.xsl
+org.freedesktop.UPower.Device.ref.xml : $(top_srcdir)/src/org.freedesktop.UPower.Device.xml $(top_srcdir)/doc/dbus/spec-to-docbook.xsl
 	echo "<?xml version=\"1.0\"?>""<!DOCTYPE refentry PUBLIC \"-//OASIS//DTD DocBook XML V4.1.2//EN\" \"http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd\">" > $@
 	$(XSLTPROC) $(top_srcdir)/doc/dbus/spec-to-docbook.xsl $< | tail -n +2 >> $@
 
-org.freedesktop.DeviceKit.Power.QoS.ref.xml : $(top_srcdir)/src/org.freedesktop.DeviceKit.Power.QoS.xml $(top_srcdir)/doc/dbus/spec-to-docbook.xsl
+org.freedesktop.UPower.QoS.ref.xml : $(top_srcdir)/src/org.freedesktop.UPower.QoS.xml $(top_srcdir)/doc/dbus/spec-to-docbook.xsl
 	echo "<?xml version=\"1.0\"?>""<!DOCTYPE refentry PUBLIC \"-//OASIS//DTD DocBook XML V4.1.2//EN\" \"http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd\">" > $@
 	$(XSLTPROC) $(top_srcdir)/doc/dbus/spec-to-docbook.xsl $< | tail -n +2 >> $@
 
-org.freedesktop.DeviceKit.Power.Wakeups.ref.xml : $(top_srcdir)/src/org.freedesktop.DeviceKit.Power.Wakeups.xml $(top_srcdir)/doc/dbus/spec-to-docbook.xsl
+org.freedesktop.UPower.Wakeups.ref.xml : $(top_srcdir)/src/org.freedesktop.UPower.Wakeups.xml $(top_srcdir)/doc/dbus/spec-to-docbook.xsl
 	echo "<?xml version=\"1.0\"?>""<!DOCTYPE refentry PUBLIC \"-//OASIS//DTD DocBook XML V4.1.2//EN\" \"http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd\">" > $@
 	$(XSLTPROC) $(top_srcdir)/doc/dbus/spec-to-docbook.xsl $< | tail -n +2 >> $@
 
diff --git a/doc/devkit-power-docs.xml b/doc/devkit-power-docs.xml
index c052b6b..6a4193b 100644
--- a/doc/devkit-power-docs.xml
+++ b/doc/devkit-power-docs.xml
@@ -64,9 +64,9 @@
 	DeviceKit-power daemon.
       </para>
     </partintro>
-    <xi:include href="dbus/org.freedesktop.DeviceKit.Power.ref.xml"/>
-    <xi:include href="dbus/org.freedesktop.DeviceKit.Power.Device.ref.xml"/>
-    <xi:include href="dbus/org.freedesktop.DeviceKit.Power.QoS.ref.xml"/>
+    <xi:include href="dbus/org.freedesktop.UPower.ref.xml"/>
+    <xi:include href="dbus/org.freedesktop.UPower.Device.ref.xml"/>
+    <xi:include href="dbus/org.freedesktop.UPower.QoS.ref.xml"/>
   </reference>
 
   <reference id="tools-fileformats">
diff --git a/doc/man/DeviceKit-power.xml b/doc/man/DeviceKit-power.xml
index f402c87..808faf9 100644
--- a/doc/man/DeviceKit-power.xml
+++ b/doc/man/DeviceKit-power.xml
@@ -21,7 +21,7 @@
       DeviceKit-power provides an interface to enumerate power sources
       on the system and control system-wide power management. Any
       application can access
-      the <emphasis>org.freedesktop.DeviceKit.Power</emphasis> service
+      the <emphasis>org.freedesktop.UPower</emphasis> service
       on the system message bus. Some operations (such as suspending
       the system) is restricted using PolicyKit.
     </para>
diff --git a/doc/man/devkit-power-daemon.xml b/doc/man/devkit-power-daemon.xml
index 1077436..d672348 100644
--- a/doc/man/devkit-power-daemon.xml
+++ b/doc/man/devkit-power-daemon.xml
@@ -27,11 +27,11 @@
   <refsect1><title>DESCRIPTION</title>
     <para>
       <emphasis><refentrytitle>devkit-power-daemon</refentrytitle></emphasis> provides
-      the <emphasis>org.freedesktop.DeviceKit.Power</emphasis> service on the
+      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
       <citerefentry><refentrytitle>dbus-daemon</refentrytitle><manvolnum>1</manvolnum></citerefentry>
-      whenever an application calls into the <emphasis>org.freedesktop.DeviceKit.Power</emphasis>
+      whenever an application calls into the <emphasis>org.freedesktop.UPower</emphasis>
       service.
     </para>
   </refsect1>