diff -Nru lxinput-0.1.1/debian/changelog lxinput-0.1.1/debian/changelog
--- lxinput-0.1.1/debian/changelog	2010-05-26 00:05:25.000000000 +0200
+++ lxinput-0.1.1/debian/changelog	2010-05-21 18:21:46.000000000 +0200
@@ -1,3 +1,11 @@
+lxinput (0.1.1-2ubuntu0.1) lucid-proposed; urgency=low
+
+  * Switch to dpkg-source 3.0 (quilt) format
+  * debian/patches/01-update-config-file.patch
+   - Update configuration file location (LP: #563530)
+
+ -- Julien Lavergne <gilir@ubuntu.com>  Fri, 21 May 2010 18:21:32 +0200
+
 lxinput (0.1.1-2) unstable; urgency=low
 
   * Update depends on lxde-settings-daemon | lxsession (>=0.4.0)
diff -Nru lxinput-0.1.1/debian/control lxinput-0.1.1/debian/control
--- lxinput-0.1.1/debian/control	2010-05-26 00:05:25.000000000 +0200
+++ lxinput-0.1.1/debian/control	2010-05-19 22:18:18.000000000 +0200
@@ -1,7 +1,8 @@
 Source: lxinput
 Section: x11
 Priority: optional
-Maintainer: Andrew Lee (李健秋) <ajqlee@debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Andrew Lee (李健秋) <ajqlee@debian.org>
 Build-Depends: debhelper (>= 7), autotools-dev, libgtk2.0-dev (>=2.12), intltool, docbook-xsl
 Standards-Version: 3.8.3
 Homepage: http://lxde.org
diff -Nru lxinput-0.1.1/debian/patches/01-update-config-file.patch lxinput-0.1.1/debian/patches/01-update-config-file.patch
--- lxinput-0.1.1/debian/patches/01-update-config-file.patch	1970-01-01 01:00:00.000000000 +0100
+++ lxinput-0.1.1/debian/patches/01-update-config-file.patch	2010-05-19 22:27:54.000000000 +0200
@@ -0,0 +1,15 @@
+Index: lxinput/src/lxinput.c
+===================================================================
+--- lxinput.orig/src/lxinput.c	2010-05-19 22:27:39.000000000 +0200
++++ lxinput/src/lxinput.c	2010-05-19 22:27:49.000000000 +0200
+@@ -138,8 +138,8 @@
+ 
+ static void load_settings()
+ {
+-    /* load settings form LXDE config files */
+-	file = g_build_filename( g_get_user_config_dir(), "lxde/config", NULL );
++	/* load settings from current session config files */
++	file = g_build_filename( g_get_user_config_dir(), "lxsession/", g_getenv("DESKTOP_SESSION"), "/desktop.conf", NULL );
+ 	gboolean ret = g_key_file_load_from_file( kf, file, 0, NULL );
+ 
+     if( ret )
diff -Nru lxinput-0.1.1/debian/patches/series lxinput-0.1.1/debian/patches/series
--- lxinput-0.1.1/debian/patches/series	1970-01-01 01:00:00.000000000 +0100
+++ lxinput-0.1.1/debian/patches/series	2010-05-19 22:27:36.000000000 +0200
@@ -0,0 +1 @@
+01-update-config-file.patch
diff -Nru lxinput-0.1.1/debian/source/format lxinput-0.1.1/debian/source/format
--- lxinput-0.1.1/debian/source/format	1970-01-01 01:00:00.000000000 +0100
+++ lxinput-0.1.1/debian/source/format	2010-05-26 00:05:26.013315040 +0200
@@ -0,0 +1 @@
+3.0 (quilt)