diff -Nru lubuntu-default-settings-0.23/debian/changelog lubuntu-default-settings-0.24/debian/changelog
--- lubuntu-default-settings-0.23/debian/changelog	2012-01-25 23:48:18.000000000 +0000
+++ lubuntu-default-settings-0.24/debian/changelog	2012-02-19 13:49:12.000000000 +0000
@@ -1,3 +1,27 @@
+lubuntu-default-settings (0.24) precise; urgency=low
+
+  [ Julien Lavergne ]
+  * usr/share/lubuntu/openbox/rc.xml
+   - Remove workaround for lxpanel run dialog, now it's fixed in lxpanel.
+   - Revert maximised windows by default, need more integration (LP: #926788)
+  * debian/control:
+   - Add a recommend for xscreensaver, for the locking shortcut (LP: #923001)
+  * usr/share/lxpanel/profile/Lubuntu/panels/panel:
+   - Set the color font of the panel to white to match the new theme.
+
+  [ Colin Watson ]
+  * Use maintscript support in dh_installdeb rather than writing out
+    dpkg-maintscript-helper commands by hand.  We now simply Pre-Depend on a
+    new enough version of dpkg rather than using 'dpkg-maintscript-helper
+    supports' guards, leading to more predictable behaviour on upgrades.
+    (LP: #932209)
+
+  [ Alexander Andjelkovic ]
+  * Fixed super-keys were conflicting with other keybinds making them useless.
+    (LP: #890394)
+
+ -- Julien Lavergne <gilir@ubuntu.com>  Sun, 19 Feb 2012 14:49:00 +0100
+
 lubuntu-default-settings (0.23) precise; urgency=low
 
   * usr/share/lubuntu/openbox/menu.xml & rc.xml
diff -Nru lubuntu-default-settings-0.23/debian/control lubuntu-default-settings-0.24/debian/control
--- lubuntu-default-settings-0.23/debian/control	2011-11-08 18:29:50.000000000 +0000
+++ lubuntu-default-settings-0.24/debian/control	2012-02-18 11:18:39.000000000 +0000
@@ -2,7 +2,7 @@
 Section: x11
 Priority: optional
 Maintainer: Julien Lavergne <gilir@ubuntu.com>
-Build-Depends: debhelper (>= 7.0.50~), 
+Build-Depends: debhelper (>= 8.1.0~),
                intltool
 Standards-Version: 3.8.3
 Homepage: https://launchpad.net/~lubuntu-desktop
@@ -11,6 +11,7 @@
 
 Package: lubuntu-default-settings
 Architecture: all
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends}, 
          lxsession (>= 0.4.1), 
          lubuntu-artwork (>= 0.4), 
@@ -20,7 +21,8 @@
          lightdm-gtk-greeter (>= 1.0.0-0ubuntu2)
 Recommends: amixer,
             scrot,
-            galculator
+            galculator,
+            xscreensaver
 Provides: lightdm-gtk-greeter-config
 Description: default settings for Lubuntu
  Various system settings tailored for Lubuntu.
diff -Nru lubuntu-default-settings-0.23/debian/postinst lubuntu-default-settings-0.24/debian/postinst
--- lubuntu-default-settings-0.23/debian/postinst	2011-11-07 10:22:15.000000000 +0000
+++ lubuntu-default-settings-0.24/debian/postinst	2012-02-18 11:11:57.000000000 +0000
@@ -10,10 +10,6 @@
   fi
 fi
 
-if dpkg-maintscript-helper supports mv_conffile 2>/dev/null; then
-    dpkg-maintscript-helper mv_conffile /etc/xdg/pcmanfm/lubuntu.conf /etc/xdg/pcmanfm/lubuntu/pcmanfm.conf 0.15 -- "$@"
-fi
-
 if [ "$1" = "configure" ] ; then
   update-alternatives --install /etc/lxdm/default.conf \
     lxdm.conf /etc/xdg/lubuntu/lxdm/lxdm.conf 60 
diff -Nru lubuntu-default-settings-0.23/debian/postrm lubuntu-default-settings-0.24/debian/postrm
--- lubuntu-default-settings-0.23/debian/postrm	2011-11-07 10:12:49.000000000 +0000
+++ lubuntu-default-settings-0.24/debian/postrm	2012-02-18 11:11:57.000000000 +0000
@@ -2,10 +2,6 @@
 
 set -e
 
-if dpkg-maintscript-helper supports mv_conffile 2>/dev/null; then
-    dpkg-maintscript-helper mv_conffile /etc/xdg/pcmanfm/lubuntu.conf /etc/xdg/pcmanfm/lubuntu/pcmanfm.conf 0.15 -- "$@"
-fi
-
 case "$1" in
   remove|purge)
     if [ -x /usr/lib/lightdm/lightdm-set-defaults ] ; then
diff -Nru lubuntu-default-settings-0.23/debian/preinst lubuntu-default-settings-0.24/debian/preinst
--- lubuntu-default-settings-0.23/debian/preinst	2011-11-07 10:12:49.000000000 +0000
+++ lubuntu-default-settings-0.24/debian/preinst	1970-01-01 00:00:00.000000000 +0000
@@ -1,10 +0,0 @@
-#!/bin/sh -e
-
-set -e
-
-if dpkg-maintscript-helper supports mv_conffile 2>/dev/null; then
-    dpkg-maintscript-helper mv_conffile /etc/xdg/pcmanfm/lubuntu.conf /etc/xdg/pcmanfm/lubuntu/pcmanfm.conf 0.15 -- "$@"
-fi
-
-#DEBHELPER#
-exit 0
diff -Nru lubuntu-default-settings-0.23/usr/share/lubuntu/openbox/rc.xml lubuntu-default-settings-0.24/usr/share/lubuntu/openbox/rc.xml
--- lubuntu-default-settings-0.23/usr/share/lubuntu/openbox/rc.xml	2012-01-07 21:56:12.000000000 +0000
+++ lubuntu-default-settings-0.24/usr/share/lubuntu/openbox/rc.xml	2012-02-19 13:47:06.000000000 +0000
@@ -354,16 +354,6 @@
         <command>lxpanelctl menu</command>
       </action>
     </keybind>
-    <keybind key="Super_L">
-      <action name="Execute">
-        <command>lxpanelctl menu</command>
-      </action>
-    </keybind>
-    <keybind key="Super_R">
-      <action name="Execute">
-        <command>lxpanelctl menu</command>
-      </action>
-    </keybind>
     <!-- Keybindings to toggle fullscreen -->
     <keybind key="F11">
       <action name="ToggleFullscreen"/>
@@ -907,18 +897,12 @@
 
   # end of the example
 -->
-    <!-- Force focus on lxpanelctl, to workaround strange behavior of openbox
-         (see https://bugs.launchpad.net/bugs/889414)
-    -->
-    <application name="lxpanel"
-                 type="dialog">
-      <focus>yes</focus>
-    </application>
-
     <!-- Option to maximize all normal window when launched-->
+    <!--
     <application type="normal">
       <maximized>true</maximized>
     </application>
+    -->
 
   </applications>
 </openbox_config>
diff -Nru lubuntu-default-settings-0.23/usr/share/lxpanel/profile/Lubuntu/panels/panel lubuntu-default-settings-0.24/usr/share/lxpanel/profile/Lubuntu/panels/panel
--- lubuntu-default-settings-0.23/usr/share/lxpanel/profile/Lubuntu/panels/panel	2011-11-07 10:12:49.000000000 +0000
+++ lubuntu-default-settings-0.24/usr/share/lxpanel/profile/Lubuntu/panels/panel	2012-02-18 11:26:53.000000000 +0000
@@ -14,7 +14,7 @@
     setdocktype=1
     setpartialstrut=1
     usefontcolor=1
-    fontcolor=#ffffff
+    fontcolor=#000000
     background=1
     backgroundfile=/usr/share/lxpanel/images/lubuntu-background.png
     iconsize=22