Bug 2211

Summary:

xorgconfig default keyboard model outdated

Product:

xorg

Reporter:

Alan Coopersmith <alan.coopersmith>

Component:

App/xorgconfig

Assignee:

Alan Coopersmith <alan.coopersmith>

Status:

RESOLVED FIXED

QA Contact:

Severity:

normal

Priority:

high

CC:

roland.mainz

Version:

git

Hardware:

All

OS:

All

Whiteboard:

i915 platform:

i915 features:

Attachments:

Description	Flags
[FIXED_X11R68x] Patch to xc/programs/Xserver/hw/xfree86/xf86config/xorgconfig.c	roland.mainz: 6.8-branch+

Description Alan Coopersmith 2005-01-03 16:11:23 UTC

xorgconfig suggests the 101-key PC keyboard as default and lists it as the
default in the comments in the output file, while Xorg now defaults to the 
104/105-key keyboards (101-key (us) or 102-key (europe) plus 2 Windows and 1 menu
key).   xorgconfig should be updated to match.

(It also assumed "Generic 101 key PC" would always be first in the XKB rules list,
 which it may not always be, so the patch simply specifies the name of the default
 choice and not which number it may be in the list of choices.)

Comment 1 Alan Coopersmith 2005-01-03 16:12:39 UTC

Created attachment 1627 [details] [review]
[FIXED_X11R68x] Patch to xc/programs/Xserver/hw/xfree86/xf86config/xorgconfig.c

Comment 2 Alan Coopersmith 2005-01-03 16:20:12 UTC

(BTW, this was originally reported to Sun as Sun bug id #6213545)

Fix committed to CVS head:

CVSROOT:	/cvs/xorg
Module name:	xc
Changes by:	alanc@gabe.freedesktop.org	05/01/03 16:16:20

Log message:
  2005-01-03  Alan Coopersmith  <alan.coopersmith@sun.com>
  
  	* programs/Xserver/hw/xfree86/xf86config/xorgconfig.c:
  	Bugzilla #2211 (https://bugs.freedesktop.org/show_bug.cgi?id=2211)
  	attachment #1627 [details] [review] (https://bugs.freedesktop.org/attachment.cgi?id=1627):
  	xorgconfig default keyboard model outdated (should be pc105,
  	not pc101/pc102)

Modified files:
      ./:
        ChangeLog 
      xc/programs/Xserver/hw/xfree86/xf86config/:
        xorgconfig.c 
  
  Revision      Changes    Path
  1.639         +9 -1      xc/ChangeLog
  1.10          +5 -5      xc/programs/Xserver/hw/xfree86/xf86config/xorgconfig.c

Comment 3 Roland Mainz 2005-01-12 06:11:50 UTC

Comment on attachment 1627 [details] [review]
[FIXED_X11R68x] Patch to xc/programs/Xserver/hw/xfree86/xf86config/xorgconfig.c

Approved for checkin into X11R6.8.x stable branch in the 2005-01-10 Xorg
release wranglers phone call.

Comment 4 Roland Mainz 2005-01-12 12:11:10 UTC

Comment on attachment 1627 [details] [review]
[FIXED_X11R68x] Patch to xc/programs/Xserver/hw/xfree86/xf86config/xorgconfig.c

Patch checked-in into X11R6.8.x stable branch:

/cvs/xorg/xc/ChangeLog,v  <--  ChangeLog
new revision: 1.365.2.111; previous revision: 1.365.2.110
cvs commit: Using deprecated info format strings.  Convert your scripts to use
the new argument format and remove '1's from your info file format strings.
/cvs/xorg/xc/programs/Xserver/hw/xfree86/xf86config/xorgconfig.c,v  <-- 
xorgconfig.c
new revision: 1.6.2.2; previous revision: 1.6.2.1
cvs commit: Using deprecated info format strings.  Convert your scripts to use
the new argument format and remove '1's from your info file format strings.
Mailing the commit message to xorg-commit@lists.freedesktop.org...

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.