Bug 11301

Summary: adding "keyboard" for compatibility
Product: xorg Reporter: Julien Cristau <jcristau>
Component: Server/DDX/XorgAssignee: Xorg Project Team <xorg-team>
Status: RESOLVED FIXED QA Contact: Xorg Project Team <xorg-team>
Severity: normal    
Priority: medium    
Version: unspecified   
Hardware: Other   
OS: All   
URL: http://bugs.debian.org/428794
Whiteboard:
i915 platform: i915 features:
Attachments:
Description Flags
proposed patch
none
proposed patch
none
Patch to hw/xfree86/common/xf86Init.c (against xserver 1.2.0) none

Description Julien Cristau 2007-06-18 08:05:50 UTC
Latest versions of the kbd driver removed the old keyboard driver, which broke people's config files.  The attached patch readds "keyboard" as an alias to "kbd".
Comment 1 Julien Cristau 2007-06-18 08:06:48 UTC
Created attachment 10361 [details] [review]
proposed patch
Comment 2 Julien Cristau 2007-06-18 08:36:03 UTC
Created attachment 10362 [details] [review]
proposed patch

Michel Dänzer noticed that the previous patch missed a change to Makefile.am.
Comment 3 Alan Coopersmith 2007-06-18 09:44:57 UTC
Created attachment 10363 [details] [review]
Patch to hw/xfree86/common/xf86Init.c (against xserver 1.2.0)

We found in Solaris this wasn't enough, because xorgconfig and some other 
old tools listed the driver name as "Keyboard" - the old hardcoded matching
code in the server was case insensitive, but module loading is case sensitive.

So instead of adding another copy of the module for every possible spelling,
we instead use this patch, which does case-insensitive mapping of Keyboard -> kbd
inside the server.
Comment 4 Daniel Stone 2007-07-09 08:08:31 UTC
looks good to me, bar the irritating licence (any chance of switching to the standard form? plus, copyright for a six or so line patch ...).  want to merge?
Comment 5 Alan Coopersmith 2007-07-10 17:29:09 UTC
Okay - will merge.   (As for the copyright, it's because I just grabbed the patch
from our current source tree, and our lawyers prefer a copyright/license notice
in every source file we publish - but when merging upstream, they allow us to
follow community guidelines and not commit copyright messages when adding small
patches, so it won't go into the tree.   The form is the standard form from 
X11R6.6, which is the last time I went through legal approval for our submissions
(when X.Org Foundation was first formed and work began on 6.7) - I haven't seen
a new recommended form - if you can point me to it, I can get our standard form
updated.)
Comment 6 Alan Coopersmith 2007-07-12 16:56:18 UTC
Committed to git head.

commit 6b4231e3b5b49b731c9a00930ae465fff8539831
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date:   Thu Jul 12 16:36:27 2007 -0700

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.