From fb0bacdc9db3b86bb8a12f88fd7ca5a7685d2b97 Mon Sep 17 00:00:00 2001
From: Julien Lavergne <gilir@ubuntu.com>
Date: Thu, 25 Jul 2013 23:56:07 +0200
Subject: [PATCH] * usr/share/lxpanel/Lubuntu  - Enable xkb plugin by default
 for switching keyboard layout. * usr/share/lubuntu/openbox  - Fix
 transmission menu item (LP: #1193055) *
 etc/xdg/lxsession/QLubuntu/desktop.conf  - Fix launch of razor-panel *
 etc/xdg/lubuntu/lightdm/lightdm-gtk-greeter.conf  - Update with new upstream
 version.

---
 debian/changelog                                 | 13 +++++++++++++
 etc/xdg/lubuntu/lightdm/lightdm-gtk-greeter.conf | 11 +++++++++--
 etc/xdg/lxsession/QLubuntu/desktop.conf          |  2 +-
 usr/share/lubuntu/openbox/menu.xml               |  2 +-
 usr/share/lxpanel/profile/Lubuntu/panels/panel   | 12 ++++++++++++
 5 files changed, 36 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 550949c..e90f456 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+lubuntu-default-settings (0.33) UNRELEASED; urgency=low
+
+  * usr/share/lxpanel/Lubuntu
+   - Enable xkb plugin by default for switching keyboard layout.
+  * usr/share/lubuntu/openbox
+   - Fix transmission menu item (LP: #1193055)  
+  * etc/xdg/lxsession/QLubuntu/desktop.conf
+   - Fix launch of razor-panel
+  * etc/xdg/lubuntu/lightdm/lightdm-gtk-greeter.conf
+   - Update with new upstream version. 
+
+ -- Julien Lavergne <gilir@ubuntu.com>  Thu, 25 Jul 2013 23:55:16 +0200
+
 lubuntu-default-settings (0.32) saucy; urgency=low
 
   [ Julien Lavergne ]
diff --git a/etc/xdg/lubuntu/lightdm/lightdm-gtk-greeter.conf b/etc/xdg/lubuntu/lightdm/lightdm-gtk-greeter.conf
index df705b8..3c0d6cb 100644
--- a/etc/xdg/lubuntu/lightdm/lightdm-gtk-greeter.conf
+++ b/etc/xdg/lubuntu/lightdm/lightdm-gtk-greeter.conf
@@ -6,9 +6,13 @@
 # font-name = Font to use
 # xft-antialias = Whether to antialias Xft fonts (true or false)
 # xft-dpi = Resolution for Xft in dots per inch (e.g. 96)
-# xft-hintstyle = What degree of hinting to use (hintnone, hintslight, hintmedium, or hintfull)
+# xft-hintstyle = What degree of hinting to use (none, slight, medium, or full)
 # xft-rgba = Type of subpixel antialiasing (none, rgb, bgr, vrgb or vbgr)
 # show-language-selector (true or false)
+# show-indicators = semi-colon ";" separated list of allowed indicator modules (e.g. libsoundmenu.so)
+# show-clock (true or false)
+# clock-format = strftime-format string, e.g. %H:%M
+# keyboard = command to launch on-screen keyboard
 #
 [greeter]
 logo=/usr/share/icons/lubuntu/places/64/start-here.svg
@@ -18,6 +22,9 @@ icon-theme-name=lubuntu
 font-name=Ubuntu
 xft-antialias=true
 #xft-dpi=
-xft-hintstyle=hintfull
+xft-hintstyle=full
 xft-rgba=rgb
 show-language-selector=true
+#show-clock=
+#clock-format=
+#keyboard=
diff --git a/etc/xdg/lxsession/QLubuntu/desktop.conf b/etc/xdg/lxsession/QLubuntu/desktop.conf
index b563da6..a6ebc68 100644
--- a/etc/xdg/lxsession/QLubuntu/desktop.conf
+++ b/etc/xdg/lxsession/QLubuntu/desktop.conf
@@ -3,7 +3,7 @@ windows_manager/command=openbox
 windows_manager/session=Lubuntu
 windows_manager/extras=
 
-panel/command=razorqt-panel
+panel/command=razor-panel
 panel/session=
 
 screensaver/command=
diff --git a/usr/share/lubuntu/openbox/menu.xml b/usr/share/lubuntu/openbox/menu.xml
index 886d8c7..2da9dac 100644
--- a/usr/share/lubuntu/openbox/menu.xml
+++ b/usr/share/lubuntu/openbox/menu.xml
@@ -80,7 +80,7 @@
   </item>
   <item label="Transmission torrent client">
     <action name="Execute">
-      <command>transmission</command>
+      <command>transmission-gtk</command>
       <startupnotify>
         <enabled>yes</enabled>
       </startupnotify>
diff --git a/usr/share/lxpanel/profile/Lubuntu/panels/panel b/usr/share/lxpanel/profile/Lubuntu/panels/panel
index 011121c..433ca1e 100644
--- a/usr/share/lxpanel/profile/Lubuntu/panels/panel
+++ b/usr/share/lxpanel/profile/Lubuntu/panels/panel
@@ -107,6 +107,18 @@ Plugin {
     type = volumealsa
 }
 
+Plugin {
+    type = xkb
+    Config {
+        DisplayType=2
+        PerWinLayout=0
+        NoResetOpt=0
+        KeepSysLayouts=1
+        ToggleOpt=shift_caps_toggle
+        FlagSize=6
+    }
+}
+
 Plugin {
     type = tray
 }