# HG changeset patch
# User Aleksej Bobylev <al.bobylev@gmail.com>
# Date 1351908927 0
# Node ID 07ebf34f05f9124ebae0632d4067f27dd0b077c5
# Parent  49a0fd9e6d090446e900a2d7c6dedf89c26a6d85
xorg-xf86-input-evdev: move XkbOptions from 40-evdev.conf to 40-Keyboard.conf (slitaz-tools/tinyutils/tazx)

diff -r 49a0fd9e6d09 -r 07ebf34f05f9 sudo-pam/stuff/etc/pam.d/sudo
--- a/sudo-pam/stuff/etc/pam.d/sudo	Fri Nov 02 19:32:40 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-#%PAM-1.0
-# specify the PAM fallback behaviour
-
-auth	required	pam_unix.so
-account	required	pam_unix.so
-password	required	pam_unix.so md5
-session	required	pam_limits.so
diff -r 49a0fd9e6d09 -r 07ebf34f05f9 sudo-pam/stuff/etc/security/limits.conf
--- a/sudo-pam/stuff/etc/security/limits.conf	Fri Nov 02 19:32:40 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,53 +0,0 @@
-# /etc/security/limits.conf
-#
-#Each line describes a limit for a user in the form:
-#
-#<domain>        <type>  <item>  <value>
-#
-#Where:
-#<domain> can be:
-#        - an user name
-#        - a group name, with @group syntax
-#        - the wildcard *, for default entry
-#        - the wildcard %, can be also used with %group syntax,
-#                 for maxlogin limit
-#
-#<type> can have the two values:
-#        - "soft" for enforcing the soft limits
-#        - "hard" for enforcing hard limits
-#
-#<item> can be one of the following:
-#        - core - limits the core file size (KB)
-#        - data - max data size (KB)
-#        - fsize - maximum filesize (KB)
-#        - memlock - max locked-in-memory address space (KB)
-#        - nofile - max number of open files
-#        - rss - max resident set size (KB)
-#        - stack - max stack size (KB)
-#        - cpu - max CPU time (MIN)
-#        - nproc - max number of processes
-#        - as - address space limit (KB)
-#        - maxlogins - max number of logins for this user
-#        - maxsyslogins - max number of logins on the system
-#        - priority - the priority to run user process with
-#        - locks - max number of file locks the user can hold
-#        - sigpending - max number of pending signals
-#        - msgqueue - max memory used by POSIX message queues (bytes)
-#        - nice - max nice priority allowed to raise to values: [-20, 19]
-#        - rtprio - max realtime priority
-#
-#<domain>      <type>  <item>         <value>
-#
-
-#*               soft    core            0
-#*               hard    rss             10000
-#@student        hard    nproc           20
-#@faculty        soft    nproc           20
-#@faculty        hard    nproc           50
-#ftp             hard    nproc           0
-#@student        -       maxlogins       4
-@audio - rtprio 90
-@audio - memlock unlimited
-@audio - nice -10
-
-# End of file
diff -r 49a0fd9e6d09 -r 07ebf34f05f9 xorg-xf86-input-evdev/stuff/40-evdev.conf
--- a/xorg-xf86-input-evdev/stuff/40-evdev.conf	Fri Nov 02 19:32:40 2012 +0000
+++ b/xorg-xf86-input-evdev/stuff/40-evdev.conf	Sat Nov 03 02:15:27 2012 +0000
@@ -4,52 +4,51 @@
 # matches everything.
 
 Section "InputClass"
-        Identifier "evdev pointer catchall"
-        MatchIsPointer "on"
-        MatchDevicePath "/dev/input/event*"
-        Driver "evdev"
+	Identifier "evdev pointer catchall"
+	MatchIsPointer "on"
+	MatchDevicePath "/dev/input/event*"
+	Driver "evdev"
 EndSection
 
 Section "InputClass"
-        Identifier "evdev keyboard catchall"
-        MatchIsKeyboard "on"
-        MatchDevicePath "/dev/input/event*"
-        Driver "evdev"
-	Option "XkbOptions" "terminate:ctrl_alt_bksp"
+	Identifier "evdev keyboard catchall"
+	MatchIsKeyboard "on"
+	MatchDevicePath "/dev/input/event*"
+	Driver "evdev"
 EndSection
 
 Section "InputClass"
-        Identifier "evdev touchpad catchall"
-        MatchIsTouchpad "on"
-        MatchDevicePath "/dev/input/event*"
-        Driver "evdev"
+	Identifier "evdev touchpad catchall"
+	MatchIsTouchpad "on"
+	MatchDevicePath "/dev/input/event*"
+	Driver "evdev"
 EndSection
 
 Section "InputClass"
-        Identifier "evdev tablet catchall"
-        MatchIsTablet "on"
-        MatchDevicePath "/dev/input/event*"
-        Driver "evdev"
+	Identifier "evdev tablet catchall"
+	MatchIsTablet "on"
+	MatchDevicePath "/dev/input/event*"
+	Driver "evdev"
 EndSection
 
 Section "InputClass"
-        Identifier "evdev touchscreen catchall"
-        MatchIsTouchscreen "on"
-        MatchDevicePath "/dev/input/event*"
-        Driver "evdev"
+	Identifier "evdev touchscreen catchall"
+	MatchIsTouchscreen "on"
+	MatchDevicePath "/dev/input/event*"
+	Driver "evdev"
 EndSection
 
 Section "InputClass"
-        Identifier "evdev joystick catchall"
-        MatchIsJoystick "on"
-        MatchDevicePath "/dev/input/event*"
-        Driver "evdev"
+	Identifier "evdev joystick catchall"
+	MatchIsJoystick "on"
+	MatchDevicePath "/dev/input/event*"
+	Driver "evdev"
 EndSection
 
 # Accelerometer device, posts data through ABS_X/ABS_Y, making X unusable
 # http://bugs.freedesktop.org/show_bug.cgi?id=22442 
 Section "InputClass"
-        Identifier "ThinkPad HDAPS accelerometer blacklist"
-        MatchProduct "ThinkPad HDAPS accelerometer data"
-        Option "Ignore" "on"
+	Identifier "ThinkPad HDAPS accelerometer blacklist"
+	MatchProduct "ThinkPad HDAPS accelerometer data"
+	Option "Ignore" "on"
 EndSection