← Back to branch summary

~darkxst/ubuntu/saucy/gnome-settings-daemon/lp1184812ud

« back to all changes in this revision

Viewing changes to debian/patches/revert_new_ibus_use.patch

  • Committer: Sebastien Bacher
  • Date: 2013-04-17 15:57:00 UTC
  • Revision ID: seb128@ubuntu.com-20130417155700-09x7sqbkp6aoexxp
* debian/patches/revert_new_ibus_use.patch:
  - list gsd-keyboard-xkb.c for translation

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/revert_new_ibus_use.patch
1
1
Index: gnome-settings-daemon-3.6.4/configure.ac
2
2
===================================================================
3
 
--- gnome-settings-daemon-3.6.4.orig/configure.ac       2013-02-18 12:57:16.535698777 +0000
4
 
+++ gnome-settings-daemon-3.6.4/configure.ac    2013-02-18 12:57:16.511698776 +0000
 
3
--- gnome-settings-daemon-3.6.4.orig/configure.ac       2013-04-17 17:52:29.768040154 +0200
 
4
+++ gnome-settings-daemon-3.6.4/configure.ac    2013-04-17 17:52:29.748040153 +0200
5
5
@@ -54,7 +54,6 @@
6
6
 LIBWACOM_REQUIRED_VERSION=0.6
7
7
 UPOWER_REQUIRED_VERSION=0.9.11
44
44
         PackageKit support:       ${have_packagekit}
45
45
Index: gnome-settings-daemon-3.6.4/data/Makefile.am
46
46
===================================================================
47
 
--- gnome-settings-daemon-3.6.4.orig/data/Makefile.am   2013-02-18 12:57:16.535698777 +0000
48
 
+++ gnome-settings-daemon-3.6.4/data/Makefile.am        2013-02-18 12:57:16.511698776 +0000
 
47
--- gnome-settings-daemon-3.6.4.orig/data/Makefile.am   2013-04-17 17:52:29.768040154 +0200
 
48
+++ gnome-settings-daemon-3.6.4/data/Makefile.am        2013-04-17 17:52:29.748040153 +0200
49
49
@@ -67,12 +67,3 @@
50
50
        Makefile.in                     \
51
51
        $(gsettings_SCHEMAS:.xml=.valid)
61
61
-endif
62
62
Index: gnome-settings-daemon-3.6.4/data/org.gnome.settings-daemon.plugins.media-keys.gschema.xml.in.in
63
63
===================================================================
64
 
--- gnome-settings-daemon-3.6.4.orig/data/org.gnome.settings-daemon.plugins.media-keys.gschema.xml.in.in        2013-02-18 12:57:16.535698777 +0000
65
 
+++ gnome-settings-daemon-3.6.4/data/org.gnome.settings-daemon.plugins.media-keys.gschema.xml.in.in     2013-02-18 12:57:16.515698776 +0000
 
64
--- gnome-settings-daemon-3.6.4.orig/data/org.gnome.settings-daemon.plugins.media-keys.gschema.xml.in.in        2013-04-17 17:52:29.768040154 +0200
 
65
+++ gnome-settings-daemon-3.6.4/data/org.gnome.settings-daemon.plugins.media-keys.gschema.xml.in.in     2013-04-17 17:52:29.748040153 +0200
66
66
@@ -180,16 +180,6 @@
67
67
       <_summary>Magnifier zoom out</_summary>
68
68
       <_description>Binding for the magnifier to zoom out</_description>
83
83
Index: gnome-settings-daemon-3.6.4/plugins/keyboard/delayed-dialog.c
84
84
===================================================================
85
85
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
86
 
+++ gnome-settings-daemon-3.6.4/plugins/keyboard/delayed-dialog.c       2013-02-18 12:57:16.515698776 +0000
 
86
+++ gnome-settings-daemon-3.6.4/plugins/keyboard/delayed-dialog.c       2013-04-17 17:52:29.748040153 +0200
87
87
@@ -0,0 +1,128 @@
88
88
+/*
89
89
+ * Copyright © 2006 Novell, Inc.
216
216
Index: gnome-settings-daemon-3.6.4/plugins/keyboard/delayed-dialog.h
217
217
===================================================================
218
218
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
219
 
+++ gnome-settings-daemon-3.6.4/plugins/keyboard/delayed-dialog.h       2013-02-18 12:57:16.515698776 +0000
 
219
+++ gnome-settings-daemon-3.6.4/plugins/keyboard/delayed-dialog.h       2013-04-17 17:52:29.748040153 +0200
220
220
@@ -0,0 +1,32 @@
221
221
+/*
222
222
+ * Copyright © 2006 Novell, Inc.
253
253
Index: gnome-settings-daemon-3.6.4/plugins/keyboard/gkbd-configuration.c
254
254
===================================================================
255
255
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
256
 
+++ gnome-settings-daemon-3.6.4/plugins/keyboard/gkbd-configuration.c   2013-02-18 12:57:16.515698776 +0000
 
256
+++ gnome-settings-daemon-3.6.4/plugins/keyboard/gkbd-configuration.c   2013-04-17 17:52:29.752040153 +0200
257
257
@@ -0,0 +1,350 @@
258
258
+/*
259
259
+ * Copyright (C) 2010 Canonical Ltd.
608
608
Index: gnome-settings-daemon-3.6.4/plugins/keyboard/gkbd-configuration.h
609
609
===================================================================
610
610
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
611
 
+++ gnome-settings-daemon-3.6.4/plugins/keyboard/gkbd-configuration.h   2013-02-18 12:57:16.515698776 +0000
 
611
+++ gnome-settings-daemon-3.6.4/plugins/keyboard/gkbd-configuration.h   2013-04-17 17:52:29.752040153 +0200
612
612
@@ -0,0 +1,65 @@
613
613
+/*
614
614
+ * Copyright (C) 2010 Canonical Ltd.
677
677
+#endif
678
678
Index: gnome-settings-daemon-3.6.4/plugins/keyboard/gsd-keyboard-manager.c
679
679
===================================================================
680
 
--- gnome-settings-daemon-3.6.4.orig/plugins/keyboard/gsd-keyboard-manager.c    2013-02-18 12:57:16.535698777 +0000
681
 
+++ gnome-settings-daemon-3.6.4/plugins/keyboard/gsd-keyboard-manager.c 2013-02-18 12:57:16.519698776 +0000
 
680
--- gnome-settings-daemon-3.6.4.orig/plugins/keyboard/gsd-keyboard-manager.c    2013-04-17 17:52:29.768040154 +0200
 
681
+++ gnome-settings-daemon-3.6.4/plugins/keyboard/gsd-keyboard-manager.c 2013-04-17 17:52:29.756040153 +0200
682
682
@@ -40,22 +40,19 @@
683
683
 
684
684
 #include <X11/XKBlib.h>
2451
2451
         g_type_class_add_private (klass, sizeof (GsdKeyboardManagerPrivate));
2452
2452
Index: gnome-settings-daemon-3.6.4/plugins/keyboard/gsd-keyboard-manager.h
2453
2453
===================================================================
2454
 
--- gnome-settings-daemon-3.6.4.orig/plugins/keyboard/gsd-keyboard-manager.h    2013-02-18 12:57:16.535698777 +0000
2455
 
+++ gnome-settings-daemon-3.6.4/plugins/keyboard/gsd-keyboard-manager.h 2013-02-18 12:57:16.523698776 +0000
 
2454
--- gnome-settings-daemon-3.6.4.orig/plugins/keyboard/gsd-keyboard-manager.h    2013-04-17 17:52:29.768040154 +0200
 
2455
+++ gnome-settings-daemon-3.6.4/plugins/keyboard/gsd-keyboard-manager.h 2013-04-17 17:52:29.756040153 +0200
2456
2456
@@ -51,6 +51,7 @@
2457
2457
 gboolean                gsd_keyboard_manager_start               (GsdKeyboardManager *manager,
2458
2458
                                                                GError         **error);
2464
2464
Index: gnome-settings-daemon-3.6.4/plugins/keyboard/gsd-keyboard-xkb.c
2465
2465
===================================================================
2466
2466
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
2467
 
+++ gnome-settings-daemon-3.6.4/plugins/keyboard/gsd-keyboard-xkb.c     2013-02-18 12:57:16.523698776 +0000
 
2467
+++ gnome-settings-daemon-3.6.4/plugins/keyboard/gsd-keyboard-xkb.c     2013-04-17 17:52:29.760040153 +0200
2468
2468
@@ -0,0 +1,851 @@
2469
2469
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
2470
2470
+ *
3320
3320
Index: gnome-settings-daemon-3.6.4/plugins/keyboard/gsd-keyboard-xkb.h
3321
3321
===================================================================
3322
3322
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
3323
 
+++ gnome-settings-daemon-3.6.4/plugins/keyboard/gsd-keyboard-xkb.h     2013-02-18 12:57:16.523698776 +0000
 
3323
+++ gnome-settings-daemon-3.6.4/plugins/keyboard/gsd-keyboard-xkb.h     2013-04-17 17:52:29.760040153 +0200
3324
3324
@@ -0,0 +1,39 @@
3325
3325
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
3326
3326
+ * gnome-settings-keyboard-xkb.h
3363
3363
+#endif
3364
3364
Index: gnome-settings-daemon-3.6.4/plugins/keyboard/Makefile.am
3365
3365
===================================================================
3366
 
--- gnome-settings-daemon-3.6.4.orig/plugins/keyboard/Makefile.am       2013-02-18 12:57:16.535698777 +0000
3367
 
+++ gnome-settings-daemon-3.6.4/plugins/keyboard/Makefile.am    2013-02-18 12:57:16.523698776 +0000
 
3366
--- gnome-settings-daemon-3.6.4.orig/plugins/keyboard/Makefile.am       2013-04-17 17:52:29.768040154 +0200
 
3367
+++ gnome-settings-daemon-3.6.4/plugins/keyboard/Makefile.am    2013-04-17 17:52:29.760040153 +0200
3368
3368
@@ -20,20 +20,25 @@
3369
3369
        gsd-keyboard-plugin.c   \
3370
3370
        gsd-keyboard-manager.h  \
3464
3464
        $(plugin_in_files)      \
3465
3465
Index: gnome-settings-daemon-3.6.4/plugins/keyboard/Makefile.in
3466
3466
===================================================================
3467
 
--- gnome-settings-daemon-3.6.4.orig/plugins/keyboard/Makefile.in       2013-02-18 12:57:16.535698777 +0000
3468
 
+++ gnome-settings-daemon-3.6.4/plugins/keyboard/Makefile.in    2013-02-18 12:57:16.527698777 +0000
 
3467
--- gnome-settings-daemon-3.6.4.orig/plugins/keyboard/Makefile.in       2013-04-17 17:52:29.768040154 +0200
 
3468
+++ gnome-settings-daemon-3.6.4/plugins/keyboard/Makefile.in    2013-04-17 17:52:29.760040153 +0200
3469
3469
@@ -1,8 +1,9 @@
3470
3470
-# Makefile.in generated by automake 1.12.2 from Makefile.am.
3471
3471
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
4091
4091
 
4092
4092
Index: gnome-settings-daemon-3.6.4/plugins/keyboard/test-keyboard.c
4093
4093
===================================================================
4094
 
--- gnome-settings-daemon-3.6.4.orig/plugins/keyboard/test-keyboard.c   2013-02-18 12:57:16.535698777 +0000
 
4094
--- gnome-settings-daemon-3.6.4.orig/plugins/keyboard/test-keyboard.c   2013-04-17 17:52:29.768040154 +0200
4095
4095
+++ /dev/null   1970-01-01 00:00:00.000000000 +0000
4096
4096
@@ -1,7 +0,0 @@
4097
4097
-#define NEW gsd_keyboard_manager_new
4103
4103
-#include "test-plugin.h"
4104
4104
Index: gnome-settings-daemon-3.6.4/plugins/keyboard/test-keyboard-ibus-utils.c
4105
4105
===================================================================
4106
 
--- gnome-settings-daemon-3.6.4.orig/plugins/keyboard/test-keyboard-ibus-utils.c        2013-02-18 12:57:16.535698777 +0000
 
4106
--- gnome-settings-daemon-3.6.4.orig/plugins/keyboard/test-keyboard-ibus-utils.c        2013-04-17 17:52:29.768040154 +0200
4107
4107
+++ /dev/null   1970-01-01 00:00:00.000000000 +0000
4108
4108
@@ -1,116 +0,0 @@
4109
4109
-#include "gsd-keyboard-manager.c"
4224
4224
-}
4225
4225
Index: gnome-settings-daemon-3.6.4/plugins/media-keys/gsd-media-keys-manager.c
4226
4226
===================================================================
4227
 
--- gnome-settings-daemon-3.6.4.orig/plugins/media-keys/gsd-media-keys-manager.c        2013-02-18 12:57:16.535698777 +0000
4228
 
+++ gnome-settings-daemon-3.6.4/plugins/media-keys/gsd-media-keys-manager.c     2013-02-18 12:57:16.531698777 +0000
 
4227
--- gnome-settings-daemon-3.6.4.orig/plugins/media-keys/gsd-media-keys-manager.c        2013-04-17 17:52:29.768040154 +0200
 
4228
+++ gnome-settings-daemon-3.6.4/plugins/media-keys/gsd-media-keys-manager.c     2013-04-17 17:52:29.764040154 +0200
4229
4229
@@ -103,10 +103,6 @@
4230
4230
 #define VOLUME_STEP 6           /* percents for one volume button press */
4231
4231
 #define MAX_VOLUME 65536.0
4291
4291
                 g_assert_not_reached ();
4292
4292
Index: gnome-settings-daemon-3.6.4/plugins/media-keys/shortcuts-list.h
4293
4293
===================================================================
4294
 
--- gnome-settings-daemon-3.6.4.orig/plugins/media-keys/shortcuts-list.h        2013-02-18 12:57:16.535698777 +0000
4295
 
+++ gnome-settings-daemon-3.6.4/plugins/media-keys/shortcuts-list.h     2013-02-18 12:57:16.531698777 +0000
 
4294
--- gnome-settings-daemon-3.6.4.orig/plugins/media-keys/shortcuts-list.h        2013-04-17 17:52:29.768040154 +0200
 
4295
+++ gnome-settings-daemon-3.6.4/plugins/media-keys/shortcuts-list.h     2013-04-17 17:52:29.764040154 +0200
4296
4296
@@ -81,8 +81,6 @@
4297
4297
         KEYBOARD_BRIGHTNESS_DOWN_KEY,
4298
4298
         KEYBOARD_BRIGHTNESS_TOGGLE_KEY,
4311
4311
         { BATTERY_KEY, NULL, "XF86Battery" },
4312
4312
 };
4313
4313
 
 
4314
Index: gnome-settings-daemon-3.6.4/po/POTFILES.in
 
4315
===================================================================
 
4316
--- gnome-settings-daemon-3.6.4.orig/po/POTFILES.in     2013-01-10 14:37:58.000000000 +0100
 
4317
+++ gnome-settings-daemon-3.6.4/po/POTFILES.in  2013-04-17 17:53:04.860041210 +0200
 
4318
@@ -31,6 +31,7 @@
 
4319
 plugins/housekeeping/gsd-disk-space.c
 
4320
 plugins/housekeeping/gsd-ldsm-dialog.c
 
4321
 plugins/keyboard/gsd-keyboard-manager.c
 
4322
+plugins/keyboard/gsd-keyboard-xkb.c
 
4323
 [type: gettext/ini]plugins/keyboard/keyboard.gnome-settings-plugin.in
 
4324
 plugins/media-keys/cut-n-paste/gvc-mixer-control.c
 
4325
 plugins/media-keys/gsd-media-keys-manager.c