Merge with current lubuntu-default-settings

debian/changelog

@@ -5,6 +5,9 @@ lubuntu-default-settings (0.7) UNRELEASED; urgency=low
    - Use new pcmanfm --desktop command to start pcmanfm with desktop management
    - Ensure configuration files for libfm and pcmanfm2.
   * Use pcmanfm2.desktop in lxpanel panel settings.
+  * usr/bin/start* : 
+   - Install a custom preferences file for Chromium.
+   - Ensure the menu prefix
 
  -- Julien Lavergne <gilir@ubuntu.com>  Mon, 01 Mar 2010 00:38:35 +0100
 

usr/bin/startlubuntu

@@ -53,9 +53,17 @@ 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
+    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
 
+#Ensure the menu prefix
+export XDG_MENU_PREFIX="lxde-"
+
 # Enable GTK+2 integration for OpenOffice.org, if available.
 export SAL_USE_VCLPLUGIN=gtk
 

usr/bin/startlubuntu-netbook

@@ -53,9 +53,17 @@ 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
+    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
 
+#Ensure the menu prefix
+export XDG_MENU_PREFIX="lxde-"
+
 # Enable GTK+2 integration for OpenOffice.org, if available.
 export SAL_USE_VCLPLUGIN=gtk