Merge upstream

* usr/bin/start* :
 - Ensure the menu prefix
* etc/xdg/lubuntu/lxdm/lxdm.conf
 - Make Lubuntu the default session by using the [base] session key.
 - Remove last_*, not provided by lxdm.conf in recent lxdm version.
* usr/share/lubuntu/openbox/rc.xml
 - Add missing shortcuts for volume-up and volume-down, and launching
   various applications. Thanks Kendall Weaver for the patch.
* debian/control
* usr/share/lubuntu/openbox/menu.xml:
 - Use new command to launch desktop settings.

debian/changelog

@@ -1,19 +1,21 @@
 lubuntu-default-settings (0.7) UNRELEASED; urgency=low
 
-  * debian/control: 
+  * usr/bin/start* :
+   - Ensure the menu prefix
+  * etc/xdg/lubuntu/lxdm/lxdm.conf
+   - Make Lubuntu the default session by using the [base] session key.
+   - Remove last_*, not provided by lxdm.conf in recent lxdm version.
+  * usr/share/lubuntu/openbox/rc.xml
+   - Add missing shortcuts for volume-up and volume-down, and launching
+     various applications. Thanks Kendall Weaver for the patch.
+  * debian/control
    - Depends on the re-written pcmanfm2 (>= 0.7.0)
    - Wrap build-depends and depends.
+  * usr/share/lubuntu/openbox/menu.xml:
+   - Use new command to launch desktop settings.
   * autostart: 
    - Use new pcmanfm --desktop command to start pcmanfm with desktop management
   * Use pcmanfm2.desktop in lxpanel panel settings.
-  * usr/bin/start* : 
-   - Install a custom preferences file for Chromium.
-   - Ensure the menu prefix
-  * openbox/menu.xml : Use new command to launch desktop settings. 
-  * etc/xdg/lubuntu/lxdm/lxdm.conf
-   - Make Lubuntu the default session by using the [base] session key.
-   - Remove last_*, not provided by lxdm.conf in recent lxdm version.
-   - Put "username" in the autologin key.
 
  -- Julien Lavergne <gilir@ubuntu.com>  Sat, 20 Mar 2010 10:58:33 +0100
 

etc/xdg/lubuntu/lxdm/lxdm.conf

@@ -1,5 +1,5 @@
 [base]
-# autologin=username
+# autologin=dgod
 session=/usr/bin/startlubuntu
 # numlock=0
 greeter=/usr/lib/lxdm/lxdm-greeter-gtk

usr/bin/startlubuntu

@@ -41,12 +41,6 @@ if [ ! -f "$XDG_CONFIG_HOME/Trolltech.conf" ]; then
     cp /usr/share/lubuntu/qt/Trolltech.conf "$XDG_CONFIG_HOME/Trolltech.conf"
 fi
 
-# Install custom chromium-browser configuration
-if [ ! -f "$XDG_CONFIG_HOME/chromium/Default/Preferences" ]; then
-    mkdir -p "$XDG_CONFIG_HOME/chromium/Default/"
-    cp /etc/xdg/lubuntu/chromium-browser/Preferences "$XDG_CONFIG_HOME/chromium/Default/Preferences"
-fi
-
 # Clean up after GDM (GDM sets the number of desktops to one)
 xprop -root -remove _NET_NUMBER_OF_DESKTOPS -remove _NET_DESKTOP_NAMES -remove _NET_CURRENT_DESKTOP 2> /dev/null
 

usr/bin/startlubuntu-netbook

@@ -41,12 +41,6 @@ if [ ! -f "$XDG_CONFIG_HOME/Trolltech.conf" ]; then
     cp /usr/share/lubuntu/qt/Trolltech.conf "$XDG_CONFIG_HOME/Trolltech.conf"
 fi
 
-# Install custom chromium-browser configuration
-if [ ! -f "$XDG_CONFIG_HOME/chromium/Default/Preferences" ]; then
-    mkdir -p "$XDG_CONFIG_HOME/chromium/Default/"
-    cp /etc/xdg/lubuntu/chromium-browser/Preferences "$XDG_CONFIG_HOME/chromium/Default/Preferences"
-fi
-
 # Clean up after GDM (GDM sets the number of desktops to one)
 xprop -root -remove _NET_NUMBER_OF_DESKTOPS -remove _NET_DESKTOP_NAMES -remove _NET_CURRENT_DESKTOP 2> /dev/null
 

usr/share/lubuntu/openbox/rc.xml

@@ -329,6 +329,48 @@
       </action>
     </keybind>  
     
+    <keybind key="XF86AudioRaiseVolume">
+      <action name="Execute">
+          <command>amixer -q sset Master 3%+</command>
+      </action>
+    </keybind>
+
+    <keybind key="XF86AudioLowerVolume">
+      <action name="Execute">
+          <command>amixer -q sset Master 3%-</command>
+      </action>
+    </keybind>
+
+    <keybind key="XF86AudioMute">
+      <action name="Execute">
+          <command>amixer -q sset Master toggle</command>
+      </action>
+    </keybind>
+
+    <keybind key="XF86WWW">
+      <action name="Execute">
+          <command>x-terminal-emulator</command>
+      </action>
+    </keybind>
+
+    <keybind key="XF86Calculator">
+      <action name="Execute">
+          <command>galculator</command>
+      </action>
+    </keybind>
+
+    <keybind key="XF86MyComputer">
+      <action name="Execute">
+          <command>pcmanfm2</command>
+      </action>
+    </keybind>
+
+    <keybind key="XF86Terminal">
+      <action name="Execute">
+          <command>x-terminal-emulator</command>
+      </action>
+    </keybind>
+
    <!-- Keybindings for Multimedia Keys and LCD Backlight (alternative when not using gnome-power-manager or xfce4-volumed)
    <keybind key="XF86AudioMute">
       <action name="Execute">
@@ -361,13 +403,6 @@
       </action>
     </keybind> -->
 
-    <!-- Taking Screenshots -->
-    <keybind key="Print">
-      <action name="Execute">
-        <execute>scrot</execute>
-      </action>
-    </keybind>
-
   </keyboard>
   <mouse>
     <dragThreshold>8</dragThreshold>