diff -Nru lxinput-0.3.1/debian/changelog lxinput-0.3.1/debian/changelog --- lxinput-0.3.1/debian/changelog 2012-03-27 23:34:11.000000000 +0000 +++ lxinput-0.3.1/debian/changelog 2011-08-20 12:10:35.000000000 +0000 @@ -1,8 +1,8 @@ -lxinput (0.3.1-1ubuntu1~ppa2) precise; urgency=low +lxinput (0.3.1-1~ppa1) oneiric; urgency=low - * + * Test sync with debian. - -- Julien Lavergne Wed, 28 Mar 2012 01:34:07 +0200 + -- Julien Lavergne Sat, 20 Aug 2011 14:10:14 +0200 lxinput (0.3.1-1) unstable; urgency=low diff -Nru lxinput-0.3.1/debian/control lxinput-0.3.1/debian/control --- lxinput-0.3.1/debian/control 2012-03-23 22:36:17.000000000 +0000 +++ lxinput-0.3.1/debian/control 2011-07-30 14:12:41.000000000 +0000 @@ -1,8 +1,7 @@ Source: lxinput Section: x11 Priority: optional -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Debian LXDE Packaging Team +Maintainer: Debian LXDE Packaging Team Uploaders: Andrew Lee (李健秋) Build-Depends: debhelper (>= 8), autotools-dev, docbook-xsl, intltool, diff -Nru lxinput-0.3.1/debian/patches/01_fix_load_save_settings.patch lxinput-0.3.1/debian/patches/01_fix_load_save_settings.patch --- lxinput-0.3.1/debian/patches/01_fix_load_save_settings.patch 2012-03-27 23:34:25.000000000 +0000 +++ lxinput-0.3.1/debian/patches/01_fix_load_save_settings.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,232 +0,0 @@ -Description: - TODO: Put a short summary on the line above and replace this paragraph - with a longer explanation of this change. Complete the meta-information - with other relevant fields (see below for details). To make it easier, the - information below has been extracted from the changelog. Adjust it or drop - it. - . - lxinput (0.3.1-1) unstable; urgency=low - . - [ Daniel Baumann ] - * Removing useless whitespaces at EOL and EOF. - * Updating to debhelper version 8. - * Sorting build-depends. - * Wrapping build-depends. - * Updating to standards version 3.9.2. - * Updating vcs fields. - * Sorting depends. - * Making versioned depends on lxsession unversioned as it's - already fulfiled in stable. - * Completing and rewriting copyright file in machine - interpretable format. - * Removing debhelper docs file. - * Compacting watch file. - * Compacting rules file. - * Merging upstream version 0.3.0. - * Removing patch and autoreconf, not needed for upstream - version 0.3.0 anymore. - * Removing unused debhelper dirs file. - * Sorting overrides in rules chronologically. - * Adding comment why dh_auto_test is disabled due to missing - lxinput.glade from upstream tarball. - * Adding apport hook for Ubuntu and Ubuntu derivatives from - Julien Lavergne . - * Avoid article in the beginning of the package short-description - to make lintian happy. - . - [ Andrew Lee (李健秋) ] - * Corrected reference to /usr/share/common-licenses/LGPL-3 file. - * Merging upstream version 0.3.1: (Cloese: #555573) - - Correct ids in .ui file - - Add an option to compile with gtk3 - - Add silent rules - - Add INSTALL file - - Use directly the .ui file - - Add optional entry when a program which change keymap is - installed (support only lxkeymap for now) - * Removing useless override_dh_auto_clean in rules file. -Author: Andrew Lee (李健秋) - ---- -The information above should follow the Patch Tagging Guidelines, please -checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here -are templates for supplementary fields that you might want to add: - -Origin: , -Bug: -Bug-Debian: http://bugs.debian.org/ -Bug-Ubuntu: https://launchpad.net/bugs/ -Forwarded: -Reviewed-By: -Last-Update: - -Index: lxinput-0.3.1/src/lxinput.c -=================================================================== ---- lxinput-0.3.1.orig/src/lxinput.c 2012-03-23 23:35:31.000000000 +0100 -+++ lxinput-0.3.1/src/lxinput.c 2012-03-28 01:34:20.000000000 +0200 -@@ -33,7 +33,7 @@ - #include - - static char* file = NULL; --static GKeyFile* kf; -+//static GKeyFile* kf; - - static GtkWidget *dlg; - static GtkRange *mouse_accel; -@@ -174,37 +174,48 @@ - - static void load_settings() - { -- gboolean ret; - const char* session_name = g_getenv("DESKTOP_SESSION"); - /* load settings from current session config files */ - if(!session_name) - session_name = "LXDE"; -- file = g_build_filename( g_get_user_config_dir(), "lxsession", session_name, "desktop.conf", NULL ); -- ret = g_key_file_load_from_file( kf, file, 0, NULL ); - -- if( ret ) -- { -- int val; -- val = g_key_file_get_integer(kf, "Mouse", "AccFactor", NULL); -- if( val > 0) -- old_accel = accel = val; -- -- val = g_key_file_get_integer(kf, "Mouse", "AccThreshold", NULL); -- if( val > 0) -- old_threshold = threshold = val; -- -- old_left_handed = left_handed = g_key_file_get_boolean(kf, "Mouse", "LeftHanded", NULL); -- -- val = g_key_file_get_integer(kf, "Keyboard", "Delay", NULL); -- if(val > 0) -- old_delay = delay = val; -- val = g_key_file_get_integer(kf, "Keyboard", "Interval", NULL); -- if(val > 0) -- old_interval = interval = val; -+ char* rel_path = g_strconcat("lxsession/", session_name, "/desktop.conf", NULL); -+ char* user_config_file = g_build_filename(g_get_user_config_dir(), rel_path, NULL); -+ GKeyFile* kf = g_key_file_new(); - -- if( g_key_file_has_key(kf, "Keyboard", "Beep", NULL ) ) -- old_beep = beep = g_key_file_get_boolean(kf, "Keyboard", "Beep", NULL); -+ if(!g_key_file_load_from_file(kf, user_config_file, G_KEY_FILE_KEEP_COMMENTS|G_KEY_FILE_KEEP_TRANSLATIONS, NULL)) -+ { -+ g_key_file_load_from_dirs(kf, rel_path, (const char**)g_get_system_config_dirs(), NULL, -+ G_KEY_FILE_KEEP_COMMENTS|G_KEY_FILE_KEEP_TRANSLATIONS, NULL); - } -+ -+ g_free(rel_path); -+ -+ int val; -+ val = g_key_file_get_integer(kf, "Mouse", "AccFactor", NULL); -+ if( val > 0) -+ old_accel = accel = val; -+ -+ val = g_key_file_get_integer(kf, "Mouse", "AccThreshold", NULL); -+ if( val > 0) -+ old_threshold = threshold = val; -+ -+ old_left_handed = left_handed = g_key_file_get_boolean(kf, "Mouse", "LeftHanded", NULL); -+ -+ val = g_key_file_get_integer(kf, "Keyboard", "Delay", NULL); -+ if(val > 0) -+ old_delay = delay = val; -+ val = g_key_file_get_integer(kf, "Keyboard", "Interval", NULL); -+ if(val > 0) -+ old_interval = interval = val; -+ -+ if( g_key_file_has_key(kf, "Keyboard", "Beep", NULL ) ) -+ old_beep = beep = g_key_file_get_boolean(kf, "Keyboard", "Beep", NULL); -+ -+ g_key_file_free(kf); -+ -+ g_free(user_config_file); -+ - } - - int main(int argc, char** argv) -@@ -213,6 +224,15 @@ - GError* err = NULL; - char* str = NULL; - -+ GKeyFile* kf = g_key_file_new(); -+ const char* session_name = g_getenv("DESKTOP_SESSION"); -+ /* load settings from current session config files */ -+ if(!session_name) -+ session_name = "LXDE"; -+ -+ char* rel_path = g_strconcat("lxsession/", session_name, "/desktop.conf", NULL); -+ char* user_config_file = g_build_filename(g_get_user_config_dir(), rel_path, NULL); -+ - #ifdef ENABLE_NLS - bindtextdomain ( GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR ); - bind_textdomain_codeset ( GETTEXT_PACKAGE, "UTF-8" ); -@@ -256,7 +276,6 @@ - - - /* read the config flie */ -- kf = g_key_file_new(); - load_settings(); - - /* init the UI */ -@@ -284,6 +303,22 @@ - if( gtk_dialog_run( (GtkDialog*)dlg ) == GTK_RESPONSE_OK ) - { - gsize len; -+ char* buf; -+ -+ if(!g_key_file_load_from_file(kf, user_config_file, G_KEY_FILE_KEEP_COMMENTS|G_KEY_FILE_KEEP_TRANSLATIONS, NULL)) -+ { -+ /* the user config file doesn't exist, create its parent dir */ -+ len = strlen(user_config_file) - strlen("/desktop.conf"); -+ user_config_file[len] = '\0'; -+ g_debug("user_config_file = %s", user_config_file); -+ g_mkdir_with_parents(user_config_file, 0700); -+ user_config_file[len] = '/'; -+ -+ g_key_file_load_from_dirs(kf, rel_path, (const char**)g_get_system_config_dirs(), NULL, -+ G_KEY_FILE_KEEP_COMMENTS|G_KEY_FILE_KEEP_TRANSLATIONS, NULL); -+ } -+ -+ g_free(rel_path); - - g_key_file_set_integer(kf, "Mouse", "AccFactor", accel); - g_key_file_set_integer(kf, "Mouse", "AccThreshold", threshold); -@@ -293,20 +328,14 @@ - g_key_file_set_integer(kf, "Keyboard", "Interval", interval); - g_key_file_set_integer(kf, "Keyboard", "Beep", !!beep); - -- if( str = g_key_file_to_data( kf, &len, NULL ) ) -- { -- if( g_file_set_contents( file, str, len, &err ) ) -- { -- /* ask the settigns daemon to reload */ -- /* FIXME: is this needed? */ -- /* g_spawn_command_line_sync("lxde-settings-daemon reload", NULL, NULL, NULL, NULL); */ -- } -- else -- { -- g_error_free( err ); -- } -- g_free(str); -- } -+ str = g_key_file_to_data(kf, &len, NULL); -+ g_file_set_contents(user_config_file, str, len, NULL); -+ g_free(str); -+ -+ /* ask the settigns daemon to reload */ -+ /* FIXME: is this needed? */ -+ /* g_spawn_command_line_sync("lxde-settings-daemon reload", NULL, NULL, NULL, NULL); */ -+ - } - else - { -@@ -332,6 +361,7 @@ - - g_free( file ); - g_key_file_free( kf ); -+ g_free(user_config_file); - - return 0; - } diff -Nru lxinput-0.3.1/debian/patches/series lxinput-0.3.1/debian/patches/series --- lxinput-0.3.1/debian/patches/series 2012-03-23 22:35:31.000000000 +0000 +++ lxinput-0.3.1/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -01_fix_load_save_settings.patch