aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--data/com.canonical.indicator.power2
-rw-r--r--data/com.canonical.indicator.power.Testing.xml4
-rw-r--r--debian/changelog12
3 files changed, 14 insertions, 4 deletions
diff --git a/data/com.canonical.indicator.power b/data/com.canonical.indicator.power
index 8b862a2..f94ed0f 100644
--- a/data/com.canonical.indicator.power
+++ b/data/com.canonical.indicator.power
@@ -17,7 +17,7 @@ ObjectPath=/com/canonical/indicator/power/desktop_greeter
ObjectPath=/com/canonical/indicator/power/desktop_greeter
[phone_greeter]
-ObjectPath=/com/canonical/indicator/power/desktop_greeter
+ObjectPath=/com/canonical/indicator/power/phone
Position=25
[ubiquity]
diff --git a/data/com.canonical.indicator.power.Testing.xml b/data/com.canonical.indicator.power.Testing.xml
index 25cd059..72cf6cf 100644
--- a/data/com.canonical.indicator.power.Testing.xml
+++ b/data/com.canonical.indicator.power.Testing.xml
@@ -22,7 +22,7 @@
<property name="MockBatteryState" type="s" access="readwrite">
<doc:doc>
<doc:description>
- <doc:para>The mock battery's state. Possible values: 'charging', 'discharging' (Defualt: 'discharging')</doc:para>
+ <doc:para>The mock battery's state. Possible values: 'charging', 'discharging' (Default: 'discharging')</doc:para>
</doc:description>
</doc:doc>
</property>
@@ -30,7 +30,7 @@
<property name="MockBatteryMinutesLeft" type="u" access="readwrite">
<doc:doc>
<doc:description>
- <doc:para>Muntes left until the mock battery finishes charging/dischargin (Default: 30)</doc:para>
+ <doc:para>Minutes left until the mock battery finishes charging/discharging (Default: 30)</doc:para>
</doc:description>
</doc:doc>
</property>
diff --git a/debian/changelog b/debian/changelog
index 469a614..d09beb9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,14 @@
-indicator-power (12.10.6+15.04.20141103~rtm-0ubuntu1) 14.09; urgency=low
+indicator-power (12.10.6+15.04.20141203-0ubuntu1) vivid; urgency=low
+
+ [ Charles Kerr ]
+ * Show the phone menu in the phone greeter.
+
+ [ Christopher Lee ]
+ * Fix some minor typos in power testing xml file.
+
+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Wed, 03 Dec 2014 16:26:04 +0000
+
+indicator-power (12.10.6+15.04.20141103-0ubuntu1) vivid; urgency=low
[ Sebastien Bacher ]
* List missing source for translations