From d31834b040eb4dcfdfad549cff7c7cbcd47eefd3 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <whot@fedoraproject.org>
Date: Thu, 9 Apr 2009 05:29:39 +0000
Subject: [PATCH] - xkeyboard-config-1.5-terminate.patch: remove
 Terminate_Server from     default pc symbols, add terminate:ctrl_alt_bksp.

---
 xkeyboard-config-1.5-terminate.patch | 96 ++++++++++++++++++++++++++++
 xkeyboard-config.spec                |  7 +-
 2 files changed, 102 insertions(+), 1 deletion(-)
 create mode 100644 xkeyboard-config-1.5-terminate.patch

diff --git a/xkeyboard-config-1.5-terminate.patch b/xkeyboard-config-1.5-terminate.patch
new file mode 100644
index 0000000..54b923b
--- /dev/null
+++ b/xkeyboard-config-1.5-terminate.patch
@@ -0,0 +1,96 @@
+From ff416cce47e29c113c706684a05ebb112c9116b3 Mon Sep 17 00:00:00 2001
+From: Julien Cristau <jcristau@debian.org>
+Date: Tue, 7 Apr 2009 04:18:32 +0200
+Subject: [PATCH] Make Terminate_Server on ctrl+alt+bksp an option
+
+This disables zapping by default, it can be reenabled with
+'setxkbmap -option terminate:ctrl_alt_bksp'.
+---
+ rules/base.o_s.part |    1 +
+ rules/base.xml.in   |   12 ++++++++++++
+ symbols/pc          |    5 +----
+ symbols/srvr_ctrl   |   13 +++++++++----
+ 4 files changed, 23 insertions(+), 8 deletions(-)
+
+diff --git a/rules/base.o_s.part b/rules/base.o_s.part
+index c401790..9843c61 100644
+--- a/rules/base.o_s.part
++++ b/rules/base.o_s.part
+@@ -97,4 +97,5 @@
+   shift:breaks_caps     =	+shift(breaks_caps)
+   esperanto:qwerty      =	+epo(qwerty)
+   esperanto:dvorak      =	+epo(dvorak)
++  terminate:ctrl_alt_bksp =	+srvr_ctrl(terminate_ctrl_alt_bksp)
+ 
+diff --git a/rules/base.xml.in b/rules/base.xml.in
+index a7616c5..fe7a26f 100644
+--- a/rules/base.xml.in
++++ b/rules/base.xml.in
+@@ -4914,5 +4914,17 @@
+        </configItem>
+       </option>
+     </group>
++    <group allowMultipleSelection="true">
++      <configItem>
++        <name>terminate</name>
++        <_description>Key sequence to kill the X server</_description>
++      </configItem>
++      <option>
++        <configItem>
++          <name>terminate:ctrl_alt_bksp</name>
++          <_description>Control + Alt + Backspace</_description>
++        </configItem>
++      </option>
++    </group>
+   </optionList>
+ </xkbConfigRegistry>
+diff --git a/symbols/pc b/symbols/pc
+index 07472b8..9474df5 100644
+--- a/symbols/pc
++++ b/symbols/pc
+@@ -19,10 +19,7 @@ xkb_symbols "pc105" {
+     include "pc(editing)"
+     include "keypad(x11)"
+ 
+-    key <BKSP> {
+-        type="CTRL+ALT",
+-        symbols[Group1]= [ BackSpace,   Terminate_Server ]
+-    };
++    key <BKSP> {	[ BackSpace 	]	};
+ 
+     key  <TAB> {	[ Tab,	ISO_Left_Tab	]	};
+     key <RTRN> {	[ Return	]	};
+diff --git a/symbols/srvr_ctrl b/symbols/srvr_ctrl
+index 712f763..9b333e3 100644
+--- a/symbols/srvr_ctrl
++++ b/symbols/srvr_ctrl
+@@ -13,10 +13,7 @@ xkb_symbols "xfree86" {
+ partial keypad_keys 
+ xkb_symbols "stdkeypad" {
+ 
+-    key <BKSP> {
+-	type="CTRL+ALT",
+-	symbols[Group1]= [ BackSpace,   Terminate_Server ]
+-    };
++    include "srvr_ctrl(terminate_ctrl_alt_bksp)"
+ 
+ // Ungrab cancels server/keyboard/pointer grabs
+     key <KPDV> {
+@@ -44,6 +41,14 @@ xkb_symbols "stdkeypad" {
+ 
+ };
+ 
++partial modifier_keys
++xkb_symbols "terminate_ctrl_alt_bksp" {
++    key <BKSP> {
++	type="CTRL+ALT",
++	symbols[Group1]= [ NoSymbol,   Terminate_Server ]
++    };
++};
++
+ partial function_keys 
+ xkb_symbols "fkey2vt" {
+ 
+-- 
+1.5.6.3
+
diff --git a/xkeyboard-config.spec b/xkeyboard-config.spec
index 5ec7d98..f327da0 100644
--- a/xkeyboard-config.spec
+++ b/xkeyboard-config.spec
@@ -4,7 +4,7 @@
 Summary: X Keyboard Extension configuration data
 Name: xkeyboard-config
 Version: 1.5
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: MIT
 Group: User Interface/X
 URL: http://www.freedesktop.org/wiki/Software/XKeyboardConfig
@@ -19,6 +19,7 @@ Patch5: xkeyboard-config-1.4-jp-tilde.patch
 # Taken from upstream, remove with 1.6
 Patch6: xkeyboard-config-1.5-evdevkbds.patch
 Patch7: xkeyboard-config-1.5-suspend-hibernate.patch
+Patch8: xkeyboard-config-1.5-terminate.patch
 
 BuildArch: noarch
 
@@ -100,6 +101,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/X11/xkb/rules/xorg.xml
 
 %changelog
+* Tue Apr 07 2009 Peter Hutterer <peter.hutterer@redhat.com> - 1.5-5
+- xkeyboard-config-1.5-terminate.patch: remove Terminate_Server from default
+  pc symbols, add terminate:ctrl_alt_bksp.
+
 * Thu Mar 05 2009 Peter Hutterer <peter.hutterer@redhat.com> - 1.5-4
 - xkeyboard-config-1.5-suspend-hibernate.patch: Map I213 to XF86Suspend, and
   I255 to XF86Hibernate.