summaryrefslogtreecommitdiffstats
path: root/source/l/hal/patches/10-keymap.fdi-restore_zap.diff
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2012-09-26 01:10:42 +0000
committer Eric Hameleers <alien@slackware.com>2018-05-31 22:51:55 +0200
commit9664bee729d487bcc0a0bc35859f8e13d5421c75 (patch)
treeb428a16618e36ed864a8d76ea3435e19a452bf90 /source/l/hal/patches/10-keymap.fdi-restore_zap.diff
parent75a4a592e5ccda30715f93563d741b83e0dcf39e (diff)
downloadcurrent-9664bee729d487bcc0a0bc35859f8e13d5421c75.tar.gz
current-9664bee729d487bcc0a0bc35859f8e13d5421c75.tar.xz
Slackware 14.0slackware-14.0
Wed Sep 26 01:10:42 UTC 2012 Slackware 14.0 x86_64 stable is released! We're perfectionists here at Slackware, so this release has been a long time a-brewing. But we think you'll agree that it was worth the wait. Slackware 14.0 combines modern components, ease of use, and flexible configuration... our "KISS" philosophy demands it. The ISOs are off to be replicated, a 6 CD-ROM 32-bit set and a dual-sided 32-bit/64-bit x86/x86_64 DVD. Please consider supporting the Slackware project by picking up a copy from store.slackware.com. We're taking pre-orders now, and offer a discount if you sign up for a subscription. Thanks to everyone who helped make this happen. The Slackware team, the upstream developers, and (of course) the awesome Slackware user community. Have fun! :-)
Diffstat (limited to 'source/l/hal/patches/10-keymap.fdi-restore_zap.diff')
-rw-r--r--source/l/hal/patches/10-keymap.fdi-restore_zap.diff67
1 files changed, 0 insertions, 67 deletions
diff --git a/source/l/hal/patches/10-keymap.fdi-restore_zap.diff b/source/l/hal/patches/10-keymap.fdi-restore_zap.diff
deleted file mode 100644
index 12e21ba79..000000000
--- a/source/l/hal/patches/10-keymap.fdi-restore_zap.diff
+++ /dev/null
@@ -1,67 +0,0 @@
-We're going to make it clearer to users that they should NOT edit
- this file (as installed to /usr/share/hal/fdi/... and also let
- them know where to copy it and how to edit that copy for an
- alternate keymap and such... --rworkman @ 20091211
-
-diff -Nur hal-0.5.11.orig/fdi/policy/10osvendor/10-keymap.fdi hal-0.5.11/fdi/policy/10osvendor/10-keymap.fdi
---- hal-0.5.11.orig/fdi/policy/10osvendor/10-keymap.fdi 2008-05-07 18:21:16.000000000 -0500
-+++ hal-0.5.11/fdi/policy/10osvendor/10-keymap.fdi 2009-07-21 00:06:11.779152226 -0500
-@@ -1,4 +1,8 @@
- <?xml version="1.0" encoding="ISO-8859-1"?> <!-- -*- SGML -*- -->
-+
-+<!-- DO NOT EDIT THIS FILE - IT WILL BE OVERWRITTEN ON UPGRADES.
-+ SEE THE "READ THIS" NOTE BELOW FOR INSTRUCTIONS -->
-+
- <deviceinfo version="0.2">
- <device>
- <match key="info.capabilities" contains="input.keymap">
-@@ -6,18 +10,41 @@
- </match>
-
- <match key="info.capabilities" contains="input.keys">
-- <merge key="input.xkb.rules" type="string">base</merge>
-
-- <!-- If we're using Linux, we use evdev by default (falling back to
-- keyboard otherwise). -->
-- <merge key="input.xkb.model" type="string">keyboard</merge>
-- <match key="/org/freedesktop/Hal/devices/computer:system.kernel.name"
-- string="Linux">
-- <merge key="input.xkb.model" type="string">evdev</merge>
-- </match>
-+ <!-- Restore Ctrl-Alt-Bksp Xserver Zapping -->
-+ <merge key="input.xkb.options" type="string">terminate:ctrl_alt_bksp</merge>
-
-+ <!-- Edit (as needed) these four lines in the copied fdi file -->
-+ <merge key="input.xkb.rules" type="string">base</merge>
-+ <merge key="input.xkb.model" type="string">evdev</merge>
- <merge key="input.xkb.layout" type="string">us</merge>
- <merge key="input.xkb.variant" type="string" />
-+
- </match>
- </device>
- </deviceinfo>
-+
-+<!-- READ THIS FOR CUSTOM KEYBOARD INFORMATION
-+
-+ If you want to add a custom model/layout/variant to X, you will need to COPY
-+ this file to /etc/hal/fdi/policy/ and edit that copy. After editing it to
-+ suit, you will need to leave X, restart the HAL daemon, and start X again.
-+
-+ Here's an example of the four lines from above:
-+ <merge key="input.xkb.rules" type="string">base</merge>
-+ <merge key="input.xkb.model" type="string">evdev</merge>
-+ <merge key="input.xkb.layout" type="string">us</merge>
-+ <merge key="input.xkb.variant" type="string">intl</merge>
-+
-+ Many desktop environments, including KDE and Xfce, have their own methods to
-+ configure keyboard layouts and such if you'd like to use them.
-+
-+ If you prefer to use the "old" way of configuring keyboards (without HAL's
-+ input device hotplugging), then you'll need to add the following lines to
-+ the ServerFlags section of /etc/X11/xorg.conf:
-+ Option "AllowEmptyInput" "false"
-+ Option "AutoAddDevices" "false"
-+ Option "AutoEnableDevices" "false"
-+ You can now edit the Keyboard section of xorg.conf as usual.
-+-->
-+