From 9192531030c45c2c511feb21fd96c13b637b4a62 Mon Sep 17 00:00:00 2001
From: Julien Lavergne <gilir@ubuntu.com>
Date: Fri, 16 May 2014 16:27:01 +0200
Subject: [PATCH 1/3] * debian/control:  - Depends on xbacklight to make some
 shortcuts workings (LP: #1313358)

---
 debian/changelog | 7 +++++++
 debian/control   | 3 ++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 5516313..6a15a95 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+lubuntu-default-settings (0.39.1) UNRELEASED; urgency=medium
+
+  * debian/control:
+   - Depends on xbacklight to make some shortcuts workings (LP: #1313358)
+
+ -- Julien Lavergne <gilir@ubuntu.com>  Fri, 16 May 2014 16:23:54 +0200
+
 lubuntu-default-settings (0.39) trusty; urgency=medium
 
   * etc/xdg/lxsession/*/desktop.conf
diff --git a/debian/control b/debian/control
index 25d5089..2ca5e98 100644
--- a/debian/control
+++ b/debian/control
@@ -20,7 +20,8 @@ Depends: ${misc:Depends},
          ttf-ubuntu-font-family,
          lightdm (>= 1.9.4),
          lxsession-logout,
-         policykit-desktop-privileges
+         policykit-desktop-privileges,
+         xbacklight
 Suggests: amixer,
           scrot,
           galculator,

From 5108a09675dd759919228e822ff266a55b211cd6 Mon Sep 17 00:00:00 2001
From: Julien Lavergne <gilir@ubuntu.com>
Date: Fri, 16 May 2014 16:32:19 +0200
Subject: [PATCH 2/3] * usr/share/lubuntu/openbox/*rc.xml  - Fix C-F7 shortcut
 (LP: #1313352)

---
 debian/changelog                       | 2 ++
 usr/share/lubuntu/openbox/nexus-rc.xml | 2 +-
 usr/share/lubuntu/openbox/rc.xml       | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6a15a95..ae93825 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ lubuntu-default-settings (0.39.1) UNRELEASED; urgency=medium
 
   * debian/control:
    - Depends on xbacklight to make some shortcuts workings (LP: #1313358)
+  * usr/share/lubuntu/openbox/*rc.xml
+   - Fix C-F7 shortcut (LP: #1313352)
 
  -- Julien Lavergne <gilir@ubuntu.com>  Fri, 16 May 2014 16:23:54 +0200
 
diff --git a/usr/share/lubuntu/openbox/nexus-rc.xml b/usr/share/lubuntu/openbox/nexus-rc.xml
index 1630d71..a27d3c3 100644
--- a/usr/share/lubuntu/openbox/nexus-rc.xml
+++ b/usr/share/lubuntu/openbox/nexus-rc.xml
@@ -465,7 +465,7 @@
     <!-- Keybindings for Multimedia Keys and LCD Backlight (alternative when not using gnome-power-manager or xfce4-volumed) -->
     <keybind key="C-F7">
       <action name="Execute">
-        <command>sleep 2;xset dpms force off</command>
+        <command>xset dpms force off</command>
       </action>
     </keybind>
     <keybind key="C-F10">
diff --git a/usr/share/lubuntu/openbox/rc.xml b/usr/share/lubuntu/openbox/rc.xml
index fb2dc03..6714f35 100644
--- a/usr/share/lubuntu/openbox/rc.xml
+++ b/usr/share/lubuntu/openbox/rc.xml
@@ -465,7 +465,7 @@
     <!-- Keybindings for Multimedia Keys and LCD Backlight (alternative when not using gnome-power-manager or xfce4-volumed) -->
     <keybind key="C-F7">
       <action name="Execute">
-        <command>sleep 2;xset dpms force off</command>
+        <command>xset dpms force off</command>
       </action>
     </keybind>
     <keybind key="C-F10">

From 0b9338a1f976b5226eed8f1676de536e8b265399 Mon Sep 17 00:00:00 2001
From: Julien Lavergne <gilir@ubuntu.com>
Date: Fri, 16 May 2014 16:39:53 +0200
Subject: [PATCH 3/3] Fix launcher shortcuts (LP: #1313355)

---
 debian/changelog                       | 1 +
 usr/share/lubuntu/openbox/nexus-rc.xml | 4 ++--
 usr/share/lubuntu/openbox/rc.xml       | 4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ae93825..c9c44e1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ lubuntu-default-settings (0.39.1) UNRELEASED; urgency=medium
    - Depends on xbacklight to make some shortcuts workings (LP: #1313358)
   * usr/share/lubuntu/openbox/*rc.xml
    - Fix C-F7 shortcut (LP: #1313352)
+   - Fix launcher shortcuts (LP: #1313355)
 
  -- Julien Lavergne <gilir@ubuntu.com>  Fri, 16 May 2014 16:23:54 +0200
 
diff --git a/usr/share/lubuntu/openbox/nexus-rc.xml b/usr/share/lubuntu/openbox/nexus-rc.xml
index a27d3c3..adfb517 100644
--- a/usr/share/lubuntu/openbox/nexus-rc.xml
+++ b/usr/share/lubuntu/openbox/nexus-rc.xml
@@ -372,12 +372,12 @@
     <!-- Keybindings for running Run menu from Lxpanel on Home + R-->
     <keybind key="W-r">
       <action name="Execute">
-        <command>lxsession-default launcher_manager</command>
+        <command>lxsession-default launcher</command>
       </action>
     </keybind>
     <keybind key="A-F2">
       <action name="Execute">
-        <command>lxsession-default launcher_manager</command>
+        <command>lxsession-default launcher</command>
       </action>
     </keybind>
     <!-- Keybindings for running Menu from Lxpanel -->
diff --git a/usr/share/lubuntu/openbox/rc.xml b/usr/share/lubuntu/openbox/rc.xml
index 6714f35..e11ea94 100644
--- a/usr/share/lubuntu/openbox/rc.xml
+++ b/usr/share/lubuntu/openbox/rc.xml
@@ -372,12 +372,12 @@
     <!-- Keybindings for running Run menu from Lxpanel on Home + R-->
     <keybind key="W-r">
       <action name="Execute">
-        <command>lxsession-default launcher_manager</command>
+        <command>lxsession-default launcher</command>
       </action>
     </keybind>
     <keybind key="A-F2">
       <action name="Execute">
-        <command>lxsession-default launcher_manager</command>
+        <command>lxsession-default launcher</command>
       </action>
     </keybind>
     <!-- Keybindings for running Menu from Lxpanel -->