From 59498452d9b21c9c07f71693fdeae983c571e0e2 Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Wed, 14 Jun 2017 15:06:47 +0200
Subject: Really switch back to com.canonical.powerd.

---
 debian/copyright             |  2 +-
 debian/copyright.in          |  2 +-
 src/CMakeLists.txt           |  2 +-
 src/com.canonical.powerd.xml | 84 ++++++++++++++++++++++++++++++++++++++++++++
 src/org.ayatana.powerd.xml   | 84 --------------------------------------------
 5 files changed, 87 insertions(+), 87 deletions(-)
 create mode 100644 src/com.canonical.powerd.xml
 delete mode 100644 src/org.ayatana.powerd.xml

diff --git a/debian/copyright b/debian/copyright
index ae29a6e..d772c53 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -32,7 +32,7 @@ Files: CMakeLists.txt
  po/Makevars
  po/POTFILES.in
  src/CMakeLists.txt
- src/org.ayatana.powerd.xml
+ src/com.canonical.powerd.xml
  tests/CMakeLists.txt
  tests/Makefile.am.strings
  tests/manual
diff --git a/debian/copyright.in b/debian/copyright.in
index d7e1435..55950ef 100644
--- a/debian/copyright.in
+++ b/debian/copyright.in
@@ -31,7 +31,7 @@ Files: CMakeLists.txt
  debian/watch
  po/CMakeLists.txt
  po/POTFILES.in
- src/org.ayatana.powerd.xml
+ src/com.canonical.powerd.xml
  tests/Makefile.am.strings
  tests/manual
 Copyright: NONE
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index d60f637..9e21008 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -20,7 +20,7 @@ set(SERVICE_GENERATED_SOURCES)
 add_gdbus_codegen_with_namespace(SERVICE_GENERATED_SOURCES dbus-powerd
                                  org.ayatana
                                  Dbus
-                                 ${CMAKE_SOURCE_DIR}/src/org.ayatana.powerd.xml)
+                                 ${CMAKE_SOURCE_DIR}/src/com.canonical.powerd.xml)
 add_gdbus_codegen_with_namespace(SERVICE_GENERATED_SOURCES dbus-battery
                                  org.ayatana.indicator.power
                                  Dbus
diff --git a/src/com.canonical.powerd.xml b/src/com.canonical.powerd.xml
new file mode 100644
index 0000000..b5b4ac4
--- /dev/null
+++ b/src/com.canonical.powerd.xml
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<node name="/">
+  <interface name="com.canonical.powerd">
+    <!-- Properties -->
+
+    <property name="brightness" type="i" access="readwrite">
+    </property>
+
+
+    <!-- Functions -->
+    <method name="requestSysState">
+      <arg type="s" name="name" direction="in" />
+      <arg type="i" name="state" direction="in" />
+      <arg type="s" name="cookie" direction="out" />
+    </method>
+
+    <method name="clearSysState">
+      <arg type="s" name="cookie" direction="in" />
+    </method>
+
+    <method name="requestWakeup">
+      <arg type="s" name="name" direction="in" />
+      <arg type="t" name="time" direction="in" />
+      <arg type="s" name="cookie" direction="out" />
+    </method>
+
+    <method name="enableProximityHandling">
+      <arg type="s" name="name" direction="in" />
+    </method>
+
+    <method name="disableProximityHandling">
+      <arg type="s" name="name" direction="in" />
+    </method>
+
+    <method name="clearWakeup">
+      <arg type="s" name="cookie" direction="in" />
+    </method>
+
+    <method name="registerClient">
+        <arg type="s" name="name" direction="in" />
+    </method>
+
+    <method name="unregisterClient">
+        <arg type="s" name="name" direction="in" />
+    </method>
+
+    <method name="ackStateChange">
+        <arg type="i" name="state" direction="in" />
+    </method>
+
+    <!-- User settings -->
+    <method name="userAutobrightnessEnable">
+        <arg type="b" name="enable" direction="in" />
+    </method>
+
+    <method name="getBrightnessParams">
+        <!-- Returns min, max, and default brighness and whether or not
+             autobrightness is supported, in that order -->
+        <arg type="(iiiib)" name="params" direction="out" />
+    </method>
+
+    <method name="setUserBrightness">
+        <arg type="i" name="brightness" direction="in" />
+    </method>
+
+    <!-- for debug/testing -->
+    <method name="listSysRequests">
+      <arg type="a(ssi)" name="requestList" direction="out" />
+    </method>
+
+    <method name="getSysRequestStats">
+      <arg type="a(ssuttt)" name="requestStats" direction="out" />
+    </method>
+
+    <!-- Signals -->
+    <signal name="SysPowerStateChange">
+      <arg type="i" name="sysState" direction="out" />
+    </signal>
+
+    <signal name="Wakeup">
+    </signal>
+
+  </interface>
+</node>
diff --git a/src/org.ayatana.powerd.xml b/src/org.ayatana.powerd.xml
deleted file mode 100644
index 1d18ca9..0000000
--- a/src/org.ayatana.powerd.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<node name="/">
-  <interface name="org.ayatana.powerd">
-    <!-- Properties -->
-
-    <property name="brightness" type="i" access="readwrite">
-    </property>
-
-
-    <!-- Functions -->
-    <method name="requestSysState">
-      <arg type="s" name="name" direction="in" />
-      <arg type="i" name="state" direction="in" />
-      <arg type="s" name="cookie" direction="out" />
-    </method>
-
-    <method name="clearSysState">
-      <arg type="s" name="cookie" direction="in" />
-    </method>
-
-    <method name="requestWakeup">
-      <arg type="s" name="name" direction="in" />
-      <arg type="t" name="time" direction="in" />
-      <arg type="s" name="cookie" direction="out" />
-    </method>
-
-    <method name="enableProximityHandling">
-      <arg type="s" name="name" direction="in" />
-    </method>
-
-    <method name="disableProximityHandling">
-      <arg type="s" name="name" direction="in" />
-    </method>
-
-    <method name="clearWakeup">
-      <arg type="s" name="cookie" direction="in" />
-    </method>
-
-    <method name="registerClient">
-        <arg type="s" name="name" direction="in" />
-    </method>
-
-    <method name="unregisterClient">
-        <arg type="s" name="name" direction="in" />
-    </method>
-
-    <method name="ackStateChange">
-        <arg type="i" name="state" direction="in" />
-    </method>
-
-    <!-- User settings -->
-    <method name="userAutobrightnessEnable">
-        <arg type="b" name="enable" direction="in" />
-    </method>
-
-    <method name="getBrightnessParams">
-        <!-- Returns min, max, and default brighness and whether or not
-             autobrightness is supported, in that order -->
-        <arg type="(iiiib)" name="params" direction="out" />
-    </method>
-
-    <method name="setUserBrightness">
-        <arg type="i" name="brightness" direction="in" />
-    </method>
-
-    <!-- for debug/testing -->
-    <method name="listSysRequests">
-      <arg type="a(ssi)" name="requestList" direction="out" />
-    </method>
-
-    <method name="getSysRequestStats">
-      <arg type="a(ssuttt)" name="requestStats" direction="out" />
-    </method>
-
-    <!-- Signals -->
-    <signal name="SysPowerStateChange">
-      <arg type="i" name="sysState" direction="out" />
-    </signal>
-
-    <signal name="Wakeup">
-    </signal>
-
-  </interface>
-</node>
-- 
cgit v1.2.3