Merge lp:~mar-kolya/ubuntu/raring/acpid/fix-for-1184831 into lp:ubuntu/saucy/acpid

[David Tagatac]

Fixes Bug #1184831

[David Tagatac (tagatac)]

review: Approve

[Marc Deslauriers (mdeslaur)]

As stated in bug #1184831, I've uploaded this to saucy.

review: Approve

Unmerged revisions

46. By kolya on 2013-05-30

debian/powerbtn.sh: add support for mate-settings-daemon. LP: #1184831

=== modified file 'debian/changelog'
--- debian/changelog	2013-02-26 09:01:13 +0000
+++ debian/changelog	2013-07-30 22:08:26 +0000
@@ -1,3 +1,9 @@
+acpid (1:2.0.18-1ubuntu1ppa1) raring; urgency=low
+
+  * debian/powerbtn.sh: add support for mate-settings-daemon. LP: #1184831
+
+ -- Nikolay Martynov <[e-mail]>  Wed, 29 May 2013 22:50:46 -0400
+
 acpid (1:2.0.18-1ubuntu1) raring; urgency=low
 
   * Merge with Debian; remaining changes:

=== modified file 'debian/powerbtn.sh'
--- debian/powerbtn.sh	2012-05-30 17:45:36 +0000
+++ debian/powerbtn.sh	2013-07-30 22:08:26 +0000
@@ -34,6 +34,7 @@
 [ -r /usr/share/acpi-support/power-funcs ] && getXconsole
 PMS="gnome-settings-daemon kpowersave xfce4-power-manager"
 PMS="$PMS guidance-power-manager.py dalston-power-applet"
+PMS="$PMS mate-settings-daemon"
 
 if pidof x $PMS > /dev/null; then
         exit