Codebase list gnome-control-center / 1eb0e71
* debian/patches/revert_new_ibus_keyboard_use.patch: - updated to include the correct list of files to translate (bzr r554) Sebastien Bacher 11 years ago
4 changed file(s) with 149 addition(s) and 80 deletion(s). Raw diff Collapse all Expand all
+7
-0
debian/changelog less more
0 gnome-control-center (1:3.6.3-0ubuntu19) UNRELEASED; urgency=low
1
2 * debian/patches/revert_new_ibus_keyboard_use.patch:
3 - updated to include the correct list of files to translate
4
5 -- Sebastien Bacher <seb128@ubuntu.com> Mon, 08 Apr 2013 13:17:15 +0200
6
07 gnome-control-center (1:3.6.3-0ubuntu18) raring; urgency=low
18
29 * debian/control.in: updated the gnome-settings-daemon requirement and stop
+1
-1
debian/control less more
66 Priority: optional
77 Maintainer: Ubuntu Desktop Team <ubuntu-desktop@lists.ubuntu.com>
88 XSBC-Original-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
9 Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Jeremy Bicha <jbicha@ubuntu.com>
9 Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
1010 Standards-Version: 3.9.3
1111 Build-Depends: autotools-dev,
1212 cdbs (>= 0.4.41),
+7
-4
debian/patches/62_update_translations_template.patch less more
1010 panels/screen/gnome-screen-panel.desktop.in.in
1111 [type: gettext/glade]panels/screen/screen.ui
1212 panels/sound/applet-main.c
13 @@ -135,3 +142,4 @@
14 shell/gnomecc.directory.in
15 shell/gnome-control-center.desktop.in.in
16 [type: gettext/glade]shell/shell.ui
13 @@ -138,4 +138,8 @@
14 [type: gettext/glade]panels/region/gnome-region-panel-options-dialog.ui
15 panels/region/gnome-region-panel-xkblt.c
16 panels/region/gnome-region-panel-xkbot.c
17 +panels/sound-nua/data/gnome-sound-nua-panel.desktop.in.in
18 +panels/sound-nua/gvc-balance-bar.c
19 +panels/sound-nua/gvc-mixer-dialog.c
1720 +shell/cc-shell-nav-bar.c
+134
-75
debian/patches/revert_new_ibus_keyboard_use.patch less more
0 diff -Nur --exclude Makefile.in gnome-control-center-3.6.3/panels/keyboard/01-input-sources.xml.in gnome-control-center-3.4.2/panels/keyboard/01-input-sources.xml.in
1 --- gnome-control-center-3.6.3/panels/keyboard/01-input-sources.xml.in 2012-10-01 11:38:59.000000000 +0200
2 +++ gnome-control-center-3.4.2/panels/keyboard/01-input-sources.xml.in 1970-01-01 01:00:00.000000000 +0100
0 Index: gnome-control-center-3.6.3/panels/keyboard/01-input-sources.xml.in
1 ===================================================================
2 --- gnome-control-center-3.6.3.orig/panels/keyboard/01-input-sources.xml.in 2013-04-08 12:35:20.087572740 +0200
3 +++ /dev/null 1970-01-01 00:00:00.000000000 +0000
34 @@ -1,12 +0,0 @@
45 -<?xml version="1.0" encoding="UTF-8" ?>
56 -<KeyListEntries group="system"
1314 - _description="Switch to previous source"/>
1415 -
1516 -</KeyListEntries>
16 diff -Nur --exclude Makefile.in gnome-control-center-3.6.3/panels/keyboard/01-screenshot.xml.in gnome-control-center-3.4.2/panels/keyboard/01-screenshot.xml.in
17 --- gnome-control-center-3.6.3/panels/keyboard/01-screenshot.xml.in 2012-11-14 12:42:43.000000000 +0100
18 +++ gnome-control-center-3.4.2/panels/keyboard/01-screenshot.xml.in 2012-03-05 15:04:55.000000000 +0100
17 Index: gnome-control-center-3.6.3/panels/keyboard/01-screenshot.xml.in
18 ===================================================================
19 --- gnome-control-center-3.6.3.orig/panels/keyboard/01-screenshot.xml.in 2013-04-08 12:35:20.087572740 +0200
20 +++ gnome-control-center-3.6.3/panels/keyboard/01-screenshot.xml.in 2013-04-08 12:35:19.855572732 +0200
1921 @@ -1,17 +1,14 @@
2022 <?xml version="1.0" encoding="UTF-8" ?>
2123 <KeyListEntries group="system" schema="org.gnome.settings-daemon.plugins.media-keys" _name="Screenshots">
3739
3840 <KeyListEntry name="screenshot-clip"
3941 _description="Copy a screenshot to clipboard"/>
40 diff -Nur --exclude Makefile.in gnome-control-center-3.6.3/panels/keyboard/cc-keyboard-item.h gnome-control-center-3.4.2/panels/keyboard/cc-keyboard-item.h
41 --- gnome-control-center-3.6.3/panels/keyboard/cc-keyboard-item.h 2012-10-01 11:38:59.000000000 +0200
42 +++ gnome-control-center-3.4.2/panels/keyboard/cc-keyboard-item.h 2012-03-05 15:04:55.000000000 +0100
42 Index: gnome-control-center-3.6.3/panels/keyboard/cc-keyboard-item.h
43 ===================================================================
44 --- gnome-control-center-3.6.3.orig/panels/keyboard/cc-keyboard-item.h 2013-04-08 12:35:20.087572740 +0200
45 +++ gnome-control-center-3.6.3/panels/keyboard/cc-keyboard-item.h 2013-04-08 12:35:19.931572735 +0200
4346 @@ -36,7 +36,6 @@
4447 {
4548 BINDING_GROUP_SYSTEM,
4851 BINDING_GROUP_USER,
4952 } BindingGroupType;
5053
51 diff -Nur --exclude Makefile.in gnome-control-center-3.6.3/panels/keyboard/cc-keyboard-option.c gnome-control-center-3.4.2/panels/keyboard/cc-keyboard-option.c
52 --- gnome-control-center-3.6.3/panels/keyboard/cc-keyboard-option.c 2012-10-01 11:38:59.000000000 +0200
53 +++ gnome-control-center-3.4.2/panels/keyboard/cc-keyboard-option.c 1970-01-01 01:00:00.000000000 +0100
54 Index: gnome-control-center-3.6.3/panels/keyboard/cc-keyboard-option.c
55 ===================================================================
56 --- gnome-control-center-3.6.3.orig/panels/keyboard/cc-keyboard-option.c 2013-04-08 12:35:20.087572740 +0200
57 +++ /dev/null 1970-01-01 00:00:00.000000000 +0000
5458 @@ -1,449 +0,0 @@
5559 -/*
5660 - * Copyright (C) 2012 Red Hat, Inc.
501505 - g_clear_object (&input_sources_settings);
502506 - g_clear_object (&xkb_info);
503507 -}
504 diff -Nur --exclude Makefile.in gnome-control-center-3.6.3/panels/keyboard/cc-keyboard-option.h gnome-control-center-3.4.2/panels/keyboard/cc-keyboard-option.h
505 --- gnome-control-center-3.6.3/panels/keyboard/cc-keyboard-option.h 2012-10-01 11:38:59.000000000 +0200
506 +++ gnome-control-center-3.4.2/panels/keyboard/cc-keyboard-option.h 1970-01-01 01:00:00.000000000 +0100
508 Index: gnome-control-center-3.6.3/panels/keyboard/cc-keyboard-option.h
509 ===================================================================
510 --- gnome-control-center-3.6.3.orig/panels/keyboard/cc-keyboard-option.h 2013-04-08 12:35:20.087572740 +0200
511 +++ /dev/null 1970-01-01 00:00:00.000000000 +0000
507512 @@ -1,48 +0,0 @@
508513 -/*
509514 - * Copyright (C) 2012 Red Hat, Inc.
553558 -G_END_DECLS
554559 -
555560 -#endif /* __CC_KEYBOARD_OPTION_H__ */
556 diff -Nur --exclude Makefile.in gnome-control-center-3.6.3/panels/keyboard/cc-keyboard-panel.c gnome-control-center-3.4.2/panels/keyboard/cc-keyboard-panel.c
557 --- gnome-control-center-3.6.3/panels/keyboard/cc-keyboard-panel.c 2012-11-05 09:38:42.000000000 +0100
558 +++ gnome-control-center-3.4.2/panels/keyboard/cc-keyboard-panel.c 2011-08-25 17:09:31.000000000 +0200
561 Index: gnome-control-center-3.6.3/panels/keyboard/cc-keyboard-panel.c
562 ===================================================================
563 --- gnome-control-center-3.6.3.orig/panels/keyboard/cc-keyboard-panel.c 2013-04-08 12:35:20.087572740 +0200
564 +++ gnome-control-center-3.6.3/panels/keyboard/cc-keyboard-panel.c 2013-04-08 12:35:20.031572738 +0200
559565 @@ -23,7 +23,7 @@
560566 #include "keyboard-general.h"
561567 #include "keyboard-shortcuts.h"
754760 }
755761
756762 void
757 diff -Nur --exclude Makefile.in gnome-control-center-3.6.3/panels/keyboard/keyboard-shortcuts.c gnome-control-center-3.4.2/panels/keyboard/keyboard-shortcuts.c
758 --- gnome-control-center-3.6.3/panels/keyboard/keyboard-shortcuts.c 2012-11-14 12:42:43.000000000 +0100
759 +++ gnome-control-center-3.4.2/panels/keyboard/keyboard-shortcuts.c 2012-03-05 15:04:55.000000000 +0100
763 Index: gnome-control-center-3.6.3/panels/keyboard/keyboard-shortcuts.c
764 ===================================================================
765 --- gnome-control-center-3.6.3.orig/panels/keyboard/keyboard-shortcuts.c 2013-04-08 12:35:20.087572740 +0200
766 +++ gnome-control-center-3.6.3/panels/keyboard/keyboard-shortcuts.c 2013-04-08 12:43:46.000000000 +0200
760767 @@ -22,19 +22,15 @@
761768 #include <config.h>
762769
17041711 -
17051712 - cc_keyboard_option_clear_all ();
17061713 }
1707 diff -Nur --exclude Makefile.in gnome-control-center-3.6.3/panels/keyboard/keyboard-shortcuts.h gnome-control-center-3.4.2/panels/keyboard/keyboard-shortcuts.h
1708 --- gnome-control-center-3.6.3/panels/keyboard/keyboard-shortcuts.h 2012-10-01 11:38:59.000000000 +0200
1709 +++ gnome-control-center-3.4.2/panels/keyboard/keyboard-shortcuts.h 2012-03-05 15:04:55.000000000 +0100
1714 Index: gnome-control-center-3.6.3/panels/keyboard/keyboard-shortcuts.h
1715 ===================================================================
1716 --- gnome-control-center-3.6.3.orig/panels/keyboard/keyboard-shortcuts.h 2013-04-08 12:35:20.087572740 +0200
1717 +++ gnome-control-center-3.6.3/panels/keyboard/keyboard-shortcuts.h 2013-04-08 12:35:20.039572738 +0200
17101718 @@ -23,5 +23,4 @@
17111719 #include <shell/cc-panel.h>
17121720
17131721 void keyboard_shortcuts_init (CcPanel *panel, GtkBuilder *builder);
17141722 -gboolean keyboard_shortcuts_set_section (CcPanel *panel, const char *section);
17151723 void keyboard_shortcuts_dispose (CcPanel *panel);
1716 diff -Nur --exclude Makefile.in gnome-control-center-3.6.3/panels/keyboard/Makefile.am gnome-control-center-3.4.2/panels/keyboard/Makefile.am
1717 --- gnome-control-center-3.6.3/panels/keyboard/Makefile.am 2012-10-01 11:38:59.000000000 +0200
1718 +++ gnome-control-center-3.4.2/panels/keyboard/Makefile.am 2012-03-05 15:04:55.000000000 +0100
1724 Index: gnome-control-center-3.6.3/panels/keyboard/Makefile.am
1725 ===================================================================
1726 --- gnome-control-center-3.6.3.orig/panels/keyboard/Makefile.am 2013-04-08 12:35:20.087572740 +0200
1727 +++ gnome-control-center-3.6.3/panels/keyboard/Makefile.am 2013-04-08 12:35:20.039572738 +0200
17191728 @@ -10,8 +10,6 @@
17201729 cc-keyboard-panel.h \
17211730 cc-keyboard-item.c \
17401749 xml_DATA = $(xml_in_files:.xml.in=.xml)
17411750
17421751 pkgconfigdir = $(datadir)/pkgconfig
1743 diff -Nur --exclude Makefile.in gnome-control-center-3.6.3/panels/region/cc-region-panel.c gnome-control-center-3.4.2/panels/region/cc-region-panel.c
1744 --- gnome-control-center-3.6.3/panels/region/cc-region-panel.c 2012-10-01 11:38:59.000000000 +0200
1745 +++ gnome-control-center-3.4.2/panels/region/cc-region-panel.c 2011-09-08 18:24:08.000000000 +0200
1752 Index: gnome-control-center-3.6.3/panels/region/cc-region-panel.c
1753 ===================================================================
1754 --- gnome-control-center-3.6.3.orig/panels/region/cc-region-panel.c 2013-04-08 12:35:20.087572740 +0200
1755 +++ gnome-control-center-3.6.3/panels/region/cc-region-panel.c 2013-04-08 12:43:46.000000000 +0200
17461756 @@ -22,12 +22,12 @@
17471757 #include "cc-region-panel.h"
17481758 #include <gtk/gtk.h>
18021812 setup_language (priv->builder);
18031813 setup_formats (priv->builder);
18041814 setup_system (priv->builder);
1805 diff -Nur --exclude Makefile.in gnome-control-center-3.6.3/panels/region/gnome-region-panel-input.c gnome-control-center-3.4.2/panels/region/gnome-region-panel-input.c
1806 --- gnome-control-center-3.6.3/panels/region/gnome-region-panel-input.c 2012-11-14 12:42:44.000000000 +0100
1807 +++ gnome-control-center-3.4.2/panels/region/gnome-region-panel-input.c 1970-01-01 01:00:00.000000000 +0100
1815 Index: gnome-control-center-3.6.3/panels/region/gnome-region-panel-input.c
1816 ===================================================================
1817 --- gnome-control-center-3.6.3.orig/panels/region/gnome-region-panel-input.c 2013-04-08 12:35:20.087572740 +0200
1818 +++ /dev/null 1970-01-01 00:00:00.000000000 +0000
18081819 @@ -1,1568 +0,0 @@
18091820 -/*
18101821 - * Copyright (C) 2011 Red Hat, Inc.
33743385 -
33753386 - return gtk_tree_selection_get_selected (selection, model, iter);
33763387 -}
3377 diff -Nur --exclude Makefile.in gnome-control-center-3.6.3/panels/region/gnome-region-panel-input-chooser.ui gnome-control-center-3.4.2/panels/region/gnome-region-panel-input-chooser.ui
3378 --- gnome-control-center-3.6.3/panels/region/gnome-region-panel-input-chooser.ui 2012-10-01 11:38:59.000000000 +0200
3379 +++ gnome-control-center-3.4.2/panels/region/gnome-region-panel-input-chooser.ui 1970-01-01 01:00:00.000000000 +0100
3388 Index: gnome-control-center-3.6.3/panels/region/gnome-region-panel-input-chooser.ui
3389 ===================================================================
3390 --- gnome-control-center-3.6.3.orig/panels/region/gnome-region-panel-input-chooser.ui 2013-04-08 12:35:20.087572740 +0200
3391 +++ /dev/null 1970-01-01 00:00:00.000000000 +0000
33803392 @@ -1,157 +0,0 @@
33813393 -<?xml version="1.0" encoding="UTF-8"?>
33823394 -<interface>
35353547 - </action-widgets>
35363548 - </object>
35373549 -</interface>
3538 diff -Nur --exclude Makefile.in gnome-control-center-3.6.3/panels/region/gnome-region-panel-input.h gnome-control-center-3.4.2/panels/region/gnome-region-panel-input.h
3539 --- gnome-control-center-3.6.3/panels/region/gnome-region-panel-input.h 2012-10-01 11:38:59.000000000 +0200
3540 +++ gnome-control-center-3.4.2/panels/region/gnome-region-panel-input.h 1970-01-01 01:00:00.000000000 +0100
3550 Index: gnome-control-center-3.6.3/panels/region/gnome-region-panel-input.h
3551 ===================================================================
3552 --- gnome-control-center-3.6.3.orig/panels/region/gnome-region-panel-input.h 2013-04-08 12:35:20.087572740 +0200
3553 +++ /dev/null 1970-01-01 00:00:00.000000000 +0000
35413554 @@ -1,36 +0,0 @@
35423555 -/* gnome-region-panel-input.h
35433556 - * Copyright (C) 2011 Red Hat, Inc.
35753588 -G_END_DECLS
35763589 -
35773590 -#endif /* __GNOME_KEYBOARD_PROPERTY_INPUT_H */
3578 diff -Nur --exclude Makefile.in gnome-control-center-3.6.3/panels/region/gnome-region-panel-layout-chooser.ui gnome-control-center-3.4.2/panels/region/gnome-region-panel-layout-chooser.ui
3579 --- gnome-control-center-3.6.3/panels/region/gnome-region-panel-layout-chooser.ui 1970-01-01 01:00:00.000000000 +0100
3580 +++ gnome-control-center-3.4.2/panels/region/gnome-region-panel-layout-chooser.ui 2011-08-25 17:09:31.000000000 +0200
3591 Index: gnome-control-center-3.6.3/panels/region/gnome-region-panel-layout-chooser.ui
3592 ===================================================================
3593 --- /dev/null 1970-01-01 00:00:00.000000000 +0000
3594 +++ gnome-control-center-3.6.3/panels/region/gnome-region-panel-layout-chooser.ui 2013-04-08 12:35:20.047572739 +0200
35813595 @@ -0,0 +1,180 @@
35823596 +<?xml version="1.0" encoding="UTF-8"?>
35833597 +<interface>
37593773 + </action-widgets>
37603774 + </object>
37613775 +</interface>
3762 diff -Nur --exclude Makefile.in gnome-control-center-3.6.3/panels/region/gnome-region-panel-options-dialog.ui gnome-control-center-3.4.2/panels/region/gnome-region-panel-options-dialog.ui
3763 --- gnome-control-center-3.6.3/panels/region/gnome-region-panel-options-dialog.ui 1970-01-01 01:00:00.000000000 +0100
3764 +++ gnome-control-center-3.4.2/panels/region/gnome-region-panel-options-dialog.ui 2011-08-25 17:09:31.000000000 +0200
3776 Index: gnome-control-center-3.6.3/panels/region/gnome-region-panel-options-dialog.ui
3777 ===================================================================
3778 --- /dev/null 1970-01-01 00:00:00.000000000 +0000
3779 +++ gnome-control-center-3.6.3/panels/region/gnome-region-panel-options-dialog.ui 2013-04-08 12:35:20.047572739 +0200
37653780 @@ -0,0 +1,79 @@
37663781 +<?xml version="1.0" encoding="UTF-8"?>
37673782 +<interface>
38423857 + </action-widgets>
38433858 + </object>
38443859 +</interface>
3845 diff -Nur --exclude Makefile.in gnome-control-center-3.6.3/panels/region/gnome-region-panel-system.c gnome-control-center-3.4.2/panels/region/gnome-region-panel-system.c
3846 --- gnome-control-center-3.6.3/panels/region/gnome-region-panel-system.c 2012-11-05 09:38:42.000000000 +0100
3847 +++ gnome-control-center-3.4.2/panels/region/gnome-region-panel-system.c 2012-04-10 17:01:29.000000000 +0200
3860 Index: gnome-control-center-3.6.3/panels/region/gnome-region-panel-system.c
3861 ===================================================================
3862 --- gnome-control-center-3.6.3.orig/panels/region/gnome-region-panel-system.c 2013-04-08 12:35:20.087572740 +0200
3863 +++ gnome-control-center-3.6.3/panels/region/gnome-region-panel-system.c 2013-04-08 12:43:46.000000000 +0200
38483864 @@ -29,16 +29,13 @@
38493865
38503866 #include <glib/gi18n.h>
41394155
41404156 bus = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, NULL);
41414157 g_dbus_proxy_new (bus,
4142 diff -Nur --exclude Makefile.in gnome-control-center-3.6.3/panels/region/gnome-region-panel.ui gnome-control-center-3.4.2/panels/region/gnome-region-panel.ui
4143 --- gnome-control-center-3.6.3/panels/region/gnome-region-panel.ui 2012-10-01 11:39:03.000000000 +0200
4144 +++ gnome-control-center-3.4.2/panels/region/gnome-region-panel.ui 2012-04-10 17:01:29.000000000 +0200
4158 Index: gnome-control-center-3.6.3/panels/region/gnome-region-panel.ui
4159 ===================================================================
4160 --- gnome-control-center-3.6.3.orig/panels/region/gnome-region-panel.ui 2013-04-08 12:35:20.087572740 +0200
4161 +++ gnome-control-center-3.6.3/panels/region/gnome-region-panel.ui 2013-04-08 12:43:46.000000000 +0200
41454162 @@ -1,6 +1,6 @@
41464163 <?xml version="1.0" encoding="UTF-8"?>
41474164 <interface>
51275144 - </widgets>
51285145 - </object>
51295146 </interface>
5130 diff -Nur --exclude Makefile.in gnome-control-center-3.6.3/panels/region/gnome-region-panel-xkb.c gnome-control-center-3.4.2/panels/region/gnome-region-panel-xkb.c
5131 --- gnome-control-center-3.6.3/panels/region/gnome-region-panel-xkb.c 1970-01-01 01:00:00.000000000 +0100
5132 +++ gnome-control-center-3.4.2/panels/region/gnome-region-panel-xkb.c 2011-09-01 12:01:00.000000000 +0200
5147 Index: gnome-control-center-3.6.3/panels/region/gnome-region-panel-xkb.c
5148 ===================================================================
5149 --- /dev/null 1970-01-01 00:00:00.000000000 +0000
5150 +++ gnome-control-center-3.6.3/panels/region/gnome-region-panel-xkb.c 2013-04-08 12:35:20.063572739 +0200
51335151 @@ -0,0 +1,190 @@
51345152 +/* gnome-region-panel-xkb.c
51355153 + * Copyright (C) 2003-2007 Sergey V. Udaltsov
53215339 + gkbd_keyboard_config_term (&gswic);
53225340 + gtk_widget_set_sensitive (WID ("xkb_reset_to_defaults"), enable);
53235341 +}
5324 diff -Nur --exclude Makefile.in gnome-control-center-3.6.3/panels/region/gnome-region-panel-xkb.h gnome-control-center-3.4.2/panels/region/gnome-region-panel-xkb.h
5325 --- gnome-control-center-3.6.3/panels/region/gnome-region-panel-xkb.h 1970-01-01 01:00:00.000000000 +0100
5326 +++ gnome-control-center-3.4.2/panels/region/gnome-region-panel-xkb.h 2011-08-25 17:09:31.000000000 +0200
5342 Index: gnome-control-center-3.6.3/panels/region/gnome-region-panel-xkb.h
5343 ===================================================================
5344 --- /dev/null 1970-01-01 00:00:00.000000000 +0000
5345 +++ gnome-control-center-3.6.3/panels/region/gnome-region-panel-xkb.h 2013-04-08 12:35:20.063572739 +0200
53275346 @@ -0,0 +1,96 @@
53285347 +/* gnome-region-panel-xkb.h
53295348 + * Copyright (C) 2003-2007 Sergey V Udaltsov
54215440 +
54225441 +G_END_DECLS
54235442 +#endif /* __GNOME_KEYBOARD_PROPERTY_XKB_H */
5424 diff -Nur --exclude Makefile.in gnome-control-center-3.6.3/panels/region/gnome-region-panel-xkbltadd.c gnome-control-center-3.4.2/panels/region/gnome-region-panel-xkbltadd.c
5425 --- gnome-control-center-3.6.3/panels/region/gnome-region-panel-xkbltadd.c 1970-01-01 01:00:00.000000000 +0100
5426 +++ gnome-control-center-3.4.2/panels/region/gnome-region-panel-xkbltadd.c 2012-03-05 15:04:55.000000000 +0100
5443 Index: gnome-control-center-3.6.3/panels/region/gnome-region-panel-xkbltadd.c
5444 ===================================================================
5445 --- /dev/null 1970-01-01 00:00:00.000000000 +0000
5446 +++ gnome-control-center-3.6.3/panels/region/gnome-region-panel-xkbltadd.c 2013-04-08 12:35:20.071572739 +0200
54275447 @@ -0,0 +1,495 @@
54285448 +/* gnome-region-panel-xkbltadd.c
54295449 + * Copyright (C) 2007 Sergey V. Udaltsov
59205940 +
59215941 + return v_id;
59225942 +}
5923 diff -Nur --exclude Makefile.in gnome-control-center-3.6.3/panels/region/gnome-region-panel-xkblt.c gnome-control-center-3.4.2/panels/region/gnome-region-panel-xkblt.c
5924 --- gnome-control-center-3.6.3/panels/region/gnome-region-panel-xkblt.c 1970-01-01 01:00:00.000000000 +0100
5925 +++ gnome-control-center-3.4.2/panels/region/gnome-region-panel-xkblt.c 2011-09-01 12:01:00.000000000 +0200
5943 Index: gnome-control-center-3.6.3/panels/region/gnome-region-panel-xkblt.c
5944 ===================================================================
5945 --- /dev/null 1970-01-01 00:00:00.000000000 +0000
5946 +++ gnome-control-center-3.6.3/panels/region/gnome-region-panel-xkblt.c 2013-04-08 12:35:20.071572739 +0200
59265947 @@ -0,0 +1,470 @@
59275948 +/* gnome-region-panel-xkblt.c
59285949 + * Copyright (C) 2003-2007 Sergey V. Udaltsov
63946415 + g_signal_connect (xkb_keyboard_settings, "changed",
63956416 + G_CALLBACK (xkb_layouts_update_list), dialog);
63966417 +}
6397 diff -Nur --exclude Makefile.in gnome-control-center-3.6.3/panels/region/gnome-region-panel-xkbot.c gnome-control-center-3.4.2/panels/region/gnome-region-panel-xkbot.c
6398 --- gnome-control-center-3.6.3/panels/region/gnome-region-panel-xkbot.c 1970-01-01 01:00:00.000000000 +0100
6399 +++ gnome-control-center-3.4.2/panels/region/gnome-region-panel-xkbot.c 2012-03-05 15:04:55.000000000 +0100
6418 Index: gnome-control-center-3.6.3/panels/region/gnome-region-panel-xkbot.c
6419 ===================================================================
6420 --- /dev/null 1970-01-01 00:00:00.000000000 +0000
6421 +++ gnome-control-center-3.6.3/panels/region/gnome-region-panel-xkbot.c 2013-04-08 12:35:20.079572740 +0200
64006422 @@ -0,0 +1,515 @@
64016423 +/* gnome-region-panel-xkbot.c
64026424 + * Copyright (C) 2003-2007 Sergey V. Udaltsov
69136935 + g_signal_connect (xkb_keyboard_settings, "changed",
69146936 + G_CALLBACK (xkb_options_update), dialog);
69156937 +}
6916 diff -Nur --exclude Makefile.in gnome-control-center-3.6.3/panels/region/gnome-region-panel-xkbpv.c gnome-control-center-3.4.2/panels/region/gnome-region-panel-xkbpv.c
6917 --- gnome-control-center-3.6.3/panels/region/gnome-region-panel-xkbpv.c 1970-01-01 01:00:00.000000000 +0100
6918 +++ gnome-control-center-3.4.2/panels/region/gnome-region-panel-xkbpv.c 2011-08-25 17:09:31.000000000 +0200
6938 Index: gnome-control-center-3.6.3/panels/region/gnome-region-panel-xkbpv.c
6939 ===================================================================
6940 --- /dev/null 1970-01-01 00:00:00.000000000 +0000
6941 +++ gnome-control-center-3.6.3/panels/region/gnome-region-panel-xkbpv.c 2013-04-08 12:35:20.079572740 +0200
69196942 @@ -0,0 +1,120 @@
69206943 +/* gnome-region-panel-xkbpv.c
69216944 + * Copyright (C) 2003-2007 Sergey V. Udaltsov
70377060 + }
70387061 +#endif
70397062 +}
7040 diff -Nur --exclude Makefile.in gnome-control-center-3.6.3/panels/region/Makefile.am gnome-control-center-3.4.2/panels/region/Makefile.am
7041 --- gnome-control-center-3.6.3/panels/region/Makefile.am 2012-10-01 11:38:59.000000000 +0200
7042 +++ gnome-control-center-3.4.2/panels/region/Makefile.am 2012-03-05 15:04:55.000000000 +0100
7063 Index: gnome-control-center-3.6.3/panels/region/Makefile.am
7064 ===================================================================
7065 --- gnome-control-center-3.6.3.orig/panels/region/Makefile.am 2013-04-08 12:35:20.087572740 +0200
7066 +++ gnome-control-center-3.6.3/panels/region/Makefile.am 2013-04-08 12:43:46.000000000 +0200
70437067 @@ -23,9 +23,12 @@
70447068 gnome-region-panel-lang.h \
70457069 gnome-region-panel-system.c \
70677091
70687092 desktopdir = $(datadir)/applications
70697093 Desktop_in_files = gnome-region-panel.desktop.in
7070
7071 --- gnome-control-center-3.4.2/configure.ac 2012-05-15 12:19:58.000000000 +0200
7072 +++ gnome-control-center-3.6.3/configure.ac 2012-11-14 13:08:00.000000000 +0100
7094 Index: gnome-control-center-3.6.3/configure.ac
7095 ===================================================================
7096 --- gnome-control-center-3.6.3.orig/configure.ac 2013-04-08 12:35:20.087572740 +0200
7097 +++ gnome-control-center-3.6.3/configure.ac 2013-04-08 12:43:46.000000000 +0200
70737098 @@ -74,22 +74,6 @@
70747099 SYSTEMD=
70757100 fi
71177142 PKG_CHECK_MODULES(SCREEN_PANEL, $COMMON_MODULES)
71187143 PKG_CHECK_MODULES(SOUND_PANEL, $COMMON_MODULES libxml-2.0
71197144 libcanberra-gtk3 >= $CANBERRA_REQUIRED_VERSION
7145 Index: gnome-control-center-3.6.3/po/POTFILES.in
7146 ===================================================================
7147 --- gnome-control-center-3.6.3.orig/po/POTFILES.in 2013-04-08 12:43:45.000000000 +0200
7148 +++ gnome-control-center-3.6.3/po/POTFILES.in 2013-04-08 12:45:03.647592174 +0200
7149 @@ -27,12 +27,10 @@
7150 panels/info/gnome-info-panel.desktop.in.in
7151 [type: gettext/glade]panels/info/info.ui
7152 panels/keyboard/00-multimedia.xml.in
7153 -panels/keyboard/01-input-sources.xml.in
7154 panels/keyboard/01-launchers.xml.in
7155 panels/keyboard/01-screenshot.xml.in
7156 panels/keyboard/01-system.xml.in
7157 panels/keyboard/50-accessibility.xml.in
7158 -panels/keyboard/cc-keyboard-option.c
7159 panels/keyboard/gnome-keyboard-panel.desktop.in.in
7160 [type: gettext/glade]panels/keyboard/gnome-keyboard-panel.ui
7161 panels/keyboard/keyboard-shortcuts.c
7162 @@ -78,7 +76,6 @@
7163 [type: gettext/glade]panels/printers/printers.ui
7164 panels/region/gnome-region-panel.desktop.in.in
7165 panels/region/gnome-region-panel-formats.c
7166 -[type: gettext/glade]panels/region/gnome-region-panel-input-chooser.ui
7167 panels/region/gnome-region-panel-system.c
7168 [type: gettext/glade]panels/region/gnome-region-panel.ui
7169 panels/screen/gnome-screen-panel.desktop.in.in
7170 @@ -135,3 +132,8 @@
7171 shell/gnomecc.directory.in
7172 shell/gnome-control-center.desktop.in.in
7173 [type: gettext/glade]shell/shell.ui
7174 +[type: gettext/glade]panels/region/gnome-region-panel-layout-chooser.ui
7175 +[type: gettext/glade]panels/region/gnome-region-panel-options-dialog.ui
7176 +panels/region/gnome-region-panel-xkblt.c
7177 +panels/region/gnome-region-panel-xkbot.c
7178 +