From fb4c633a3f24843b1424bffd9584364502dc9e6a7780e9cfbcc5239247bd9303 Mon Sep 17 00:00:00 2001
From: OBS User autobuild <null@suse.de>
Date: Thu, 8 Apr 2010 10:38:24 +0000
Subject: [PATCH] Accepting request 37343 from X11:XOrg

checked in (request 37343)

OBS-URL: https://build.opensuse.org/request/show/37343
OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xorg-x11-server?expand=0&rev=246
---
 xorg-evdev-conf.diff    | 45 -----------------------------------------
 xorg-x11-server.changes |  5 -----
 xorg-x11-server.spec    |  2 --
 3 files changed, 52 deletions(-)
 delete mode 100644 xorg-evdev-conf.diff

diff --git a/xorg-evdev-conf.diff b/xorg-evdev-conf.diff
deleted file mode 100644
index c267d50..0000000
--- a/xorg-evdev-conf.diff
+++ /dev/null
@@ -1,45 +0,0 @@
---- config/10-evdev.conf	2010/04/08 09:38:26	1.1
-+++ config/10-evdev.conf	2010/04/08 09:38:31
-@@ -1,8 +1,40 @@
- #
- # Catch-all evdev loader for udev-based systems
--#
-+# We don't simply match on any device since that also adds accelerometers
-+# and other devices that we don't really want to use. The list below
-+# matches everything but joysticks.
-+
- Section "InputClass"
--        Identifier "evdev-catchall"
-+        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"
-+EndSection
-+
-+Section "InputClass"
-+        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"
-+EndSection
-+
-+Section "InputClass"
-+        Identifier "evdev touchscreen catchall"
-+        MatchIsTouchscreen "on"
-+        MatchDevicePath "/dev/input/event*"
-+        Driver "evdev"
- EndSection
diff --git a/xorg-x11-server.changes b/xorg-x11-server.changes
index 7e4f36a..10c711c 100644
--- a/xorg-x11-server.changes
+++ b/xorg-x11-server.changes
@@ -1,8 +1,3 @@
--------------------------------------------------------------------
-Thu Apr  8 11:49:46 CEST 2010 - ro@suse.de
-
-- fix evdev config file (use the one from xserver upstream)
-
 -------------------------------------------------------------------
 Tue Apr  6 20:48:21 CEST 2010 - ro@suse.de
 
diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
index dcbad5d..548770c 100644
--- a/xorg-x11-server.spec
+++ b/xorg-x11-server.spec
@@ -128,7 +128,6 @@ Patch204:       missing_font_paths.diff
 Patch205:       xorg-server-1.8.0.diff
 Patch206:       fix_fglrx_screendepth_issue.patch
 Patch207:       xorg-server-option_libxf86config.diff
-Patch208:       xorg-evdev-conf.diff
 
 %description
 This package contains the X.Org Server.
@@ -254,7 +253,6 @@ popd
 %patch205 -p0
 %patch206 -p0
 %patch207 -p0
-%patch208 -p0
 
 %build
 pushd xorg-docs-*