Merge trusty-fixes branch:

* debian/control:
 - 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)

debian/changelog

@@ -2,6 +2,11 @@ lubuntu-default-settings (0.40) UNRELEASED; urgency=medium
 
   * usr/share/xsessions/QLubuntu.desktop
    - Use LXQt as environment for the Qt session.
+  * debian/control:
+   - 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@freedom>  Mon, 12 May 2014 22:10:53 +0200
 

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,

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 -->
@@ -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">

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 -->
@@ -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">