- new

Changed files:
    system-config-keyboard-beenset.patch -> 1.1
    system-config-keyboard-fixcomments.patch -> 1.1

diff --git a/system-config-keyboard-beenset.patch b/system-config-keyboard-beenset.patch
new file mode 100644 (file)
index 0000000..7246625
--- /dev/null
+++ b/system-config-keyboard-beenset.patch
@@ -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)

diff --git a/system-config-keyboard-fixcomments.patch b/system-config-keyboard-fixcomments.patch
new file mode 100644 (file)
index 0000000..af7324a
--- /dev/null
+++ b/system-config-keyboard-fixcomments.patch
@@ -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"))