SOURCES: system-config-keyboard-beenset.patch (NEW), system-config-keyboard...

[patrys]

Author: patrys                       Date: Fri Aug 29 11:52:50 2008 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- new

---- Files affected:
SOURCES:
   system-config-keyboard-beenset.patch (NONE -> 1.1)  (NEW), system-config-keyboard-fixcomments.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: SOURCES/system-config-keyboard-beenset.patch
diff -u /dev/null SOURCES/system-config-keyboard-beenset.patch:1.1
--- /dev/null	Fri Aug 29 13:52:51 2008
+++ SOURCES/system-config-keyboard-beenset.patch	Fri Aug 29 13:52:44 2008
@@ -0,0 +1,17 @@
+https://bugzilla.redhat.com/attachment.cgi?id=305465
+Patch by Tim Waugh. Already commited upstream.
+
+diff -up system-config-keyboard-1.2.15/src/keyboard_gui.py.traceback system-config-keyboard-1.2.15/src/keyboard_gui.py
+--- system-config-keyboard-1.2.15/src/keyboard_gui.py.traceback	2008-05-15 11:41:30.000000000 +0100
++++ system-config-keyboard-1.2.15/src/keyboard_gui.py	2008-05-15 11:43:11.000000000 +0100
+@@ -133,8 +133,8 @@ class moduleClass(Module):
+     def createScreen(self, defaultByLang=None, kbd=None):
+         if kbd is None:
+             kbd = keyboard.Keyboard()
+-        else:
+-            self.kbd = kbd
++
++        self.kbd = kbd
+ 
+         self.vbox = gtk.VBox()
+         self.vbox.set_spacing(10)

================================================================
Index: SOURCES/system-config-keyboard-fixcomments.patch
diff -u /dev/null SOURCES/system-config-keyboard-fixcomments.patch:1.1
--- /dev/null	Fri Aug 29 13:52:51 2008
+++ SOURCES/system-config-keyboard-fixcomments.patch	Fri Aug 29 13:52:45 2008
@@ -0,0 +1,16 @@
+Index: src/keyboard_backend.py
+===================================================================
+--- src/keyboard_backend.py	(revision 562)
++++ src/keyboard_backend.py	(working copy)
+@@ -36,9 +36,9 @@
+             try:
+                 keyboard = xf86config.getCoreKeyboard(xconfig)
+             except:
+-                xconfig.comment = '# This configuration file was broken by system-config-keyboard'
++                xconfig.comment = "\n# This configuration file was broken by system-config-keyboard\n"
+                 keyboard = xf86config.XF86ConfInput ();
+-                keyboard.comment = "# Keyboard added by system-config-keyboard"
++                keyboard.comment = "\n# Keyboard added by system-config-keyboard\n"
+                 keyboard.identifier = "Keyboard0"
+                 keyboard.driver = "kbd"
+                 keyboard.options.insert (xf86config.XF86Option("XkbModel", "pc101"))
================================================================