aboutsummaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorCharles Kerr <charles.kerr@canonical.com>2014-03-25 14:48:57 -0500
committerCharles Kerr <charles.kerr@canonical.com>2014-03-25 14:48:57 -0500
commit8fcb63c1e8fed2988f811c3352efa0077c950162 (patch)
treeb821822f4100b53b803261722aa4aa4716e2ba3b /debian
parent9b33101ad8a9fc093e226c25e497fd8b1d51aee5 (diff)
parent6b9e3d4fb5e11d5d09bc376aa2a56db6a02b55ee (diff)
downloadayatana-indicator-power-8fcb63c1e8fed2988f811c3352efa0077c950162.tar.gz
ayatana-indicator-power-8fcb63c1e8fed2988f811c3352efa0077c950162.tar.bz2
ayatana-indicator-power-8fcb63c1e8fed2988f811c3352efa0077c950162.zip
sync to lp:indicator-power
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog24
-rw-r--r--debian/control2
2 files changed, 25 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index e108d70..dbb6ea0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,27 @@
+indicator-power (12.10.6+14.04.20140314-0ubuntu1) trusty; urgency=low
+
+ [ Charles Kerr ]
+ * Change the implementation of the title text / title accessible text
+ / menuitem text to follow the spec changes in
+ https://wiki.ubuntu.com/Power?action=diff&rev2=44&rev1=43#Title and
+ update the tests accordingly. (LP: #1234458)
+
+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Fri, 14 Mar 2014 14:14:07 +0000
+
+indicator-power (12.10.6+14.04.20140311-0ubuntu1) trusty; urgency=low
+
+ [ Lars Uebernickel ]
+ * Add desktop_lockscreen profile
+
+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Tue, 11 Mar 2014 18:33:10 +0000
+
+indicator-power (12.10.6+14.04.20140306-0ubuntu1) trusty; urgency=low
+
+ [ Simon Steinbeiß ]
+ * Add xfce4-powermanager as alternative recommend
+
+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Thu, 06 Mar 2014 11:51:54 +0000
+
indicator-power (12.10.6+14.04.20140207-0ubuntu1) trusty; urgency=low
[ Ted Gould ]
diff --git a/debian/control b/debian/control
index d64c903..b11fd60 100644
--- a/debian/control
+++ b/debian/control
@@ -24,7 +24,7 @@ Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends},
upower,
-Recommends: unity-control-center | gnome-control-center (>= 3.1) | ubuntu-system-settings,
+Recommends: unity-control-center | gnome-control-center (>= 3.1) | ubuntu-system-settings | xfce4-power-manager,
indicator-applet (>= 0.2) | indicator-renderer,
Description: Indicator showing power state.
This indicator displays current power management information and gives