Updated to

  xkeyboard-config-1.7
  pixman-0.16.2
  libX11-1.3
  libXinerama-1.1
  xkbcomp-1.1.1
  recordproto-1.14
  xineramaproto-1.2
  inputproto-2.0
  compositeproto-0.4.1
  xorg-server-1.7.0

1 files changed, 46 insertions, 46 deletions

diff --git a/xorg-server/xkbdata.src/geometry/geometry.dir b/xorg-server/xkbdata.src/geometry/geometry.dir
index 41d54d2b5..fb1c401a3 100644
--- a/xorg-server/xkbdata.src/geometry/geometry.dir
+++ b/xorg-server/xkbdata.src/geometry/geometry.dir
@@ -1,8 +1,31 @@
--d------ -------- everex(STEPnote)
 -d------ -------- macintosh(macintosh)
 -------- -------- macintosh(applepro)
 -------- -------- macintosh(macbook78)
 -------- -------- macintosh(macbook79)
+-d------ -------- winbook(XP5)
+-d------ -------- kinesis(model100)
+-------- -------- typematrix(tm2020)
+-------- -------- typematrix(tm2030_shape)
+-------- -------- typematrix(tm2030_MiscDiod_dvk)
+-------- -------- typematrix(tm2030_MiscDiod_102)
+-------- -------- typematrix(tm2030_MiscDiod_106)
+-------- -------- typematrix(tm2030_MiscDiod_off)
+-------- -------- typematrix(tm2030_MiscDiod_on)
+-------- -------- typematrix(tm2030USB_func)
+-------- -------- typematrix(tm2030USB_alpha)
+-------- -------- typematrix(tm2030USB_ctrl)
+-------- -------- typematrix(tm2030PS2)
+-------- -------- typematrix(tm2030USB)
+-------- -------- typematrix(tm2030USB-102)
+-------- -------- typematrix(tm2030USB-106)
+-d------ -------- northgate(omnikey101)
+-d------ -------- sony(nwp5461)
+-------- -------- thinkpad(common)
+-------- -------- thinkpad(us)
+-------- -------- thinkpad(intl)
+-------- -------- thinkpad(60)
+-d------ -------- fujitsu(138)
+-------- -------- fujitsu(140)
 -------- -------- sun(type4)
 -------- -------- sun(type4tuv)
 -------- -------- sun(type4_ca)
@@ -36,8 +59,14 @@
 -------- -------- sun(x86)
 -------- -------- sun(MS_x86)
 -------- -------- sun(x86tuv)
--d------ -------- fujitsu(138)
--------- -------- fujitsu(140)
+-d------ -------- amiga(usa1)
+-------- -------- amiga(de)
+-d------ -------- microsoft(natural)
+-------- -------- microsoft(elite)
+-d------ -------- hp(pc101)
+-------- -------- hp(hil)
+-------- -------- hp(omnibook)
+-------- -------- hp(omnibook_intl)
 -d------ -------- pc(pc101)
 -------- -------- pc(pc102)
 -------- -------- pc(pc104)
@@ -48,6 +77,7 @@
 -------- -------- pc(kr106)
 -------- -------- pc(latitude)
 -------- -------- pc(pc104alt)
+-d------ -------- chicony(us)
 -d------ -------- hhk(win1)
 -------- -------- hhk(win2)
 -------- -------- hhk(win3)
@@ -57,36 +87,27 @@
 -------- -------- hhk(jp3)
 -------- -------- hhk(jp4)
 h-p----- -------- hhk(basic)
--d------ -------- kinesis(model100)
--d------ -------- hp(pc101)
--------- -------- hp(hil)
--------- -------- hp(omnibook)
--------- -------- hp(omnibook_intl)
--d------ -------- microsoft(natural)
--------- -------- microsoft(elite)
--d------ -------- keytronic(FlexPro)
--d------ -------- northgate(omnikey101)
--d------ -------- sgi_vndr/indy(pc101)
--------- -------- sgi_vndr/indy(pc102)
--------- -------- sgi_vndr/indy(jp106)
 -d------ -------- sgi_vndr/O2(pc101)
 -------- -------- sgi_vndr/O2(pc102)
 -------- -------- sgi_vndr/O2(jp106)
 -d------ -------- sgi_vndr/indigo(pc101)
 -------- -------- sgi_vndr/indigo(pc102)
--d------ -------- sony(nwp5461)
--d------ -------- winbook(XP5)
--d------ -------- ataritt(us)
--------- -------- ataritt(de)
--------- -------- thinkpad(common)
--------- -------- thinkpad(us)
--------- -------- thinkpad(intl)
--------- -------- thinkpad(60)
+-d------ -------- sgi_vndr/indy(pc101)
+-------- -------- sgi_vndr/indy(pc102)
+-------- -------- sgi_vndr/indy(jp106)
+-d------ -------- keytronic(FlexPro)
 -d------ -------- dell(dell101)
 -------- -------- dell(dell65)
 -------- -------- dell(dell65x)
 -------- -------- dell(dellm65)
 -------- -------- dell(latitude)
+-d------ -------- everex(STEPnote)
+-d------ -------- nec(pc98)
+-------- -------- digital_vndr/lk(lk201)
+-------- -------- digital_vndr/lk(lk401)
+-------- -------- digital_vndr/lk(lk450)
+-------- -------- digital_vndr/lk(lk401bj)
+-------- -------- digital_vndr/lk(lk401jj)
 --p----- -------- digital_vndr/pc(common)
 --p----- -------- digital_vndr/pc(leds_on_keys)
 --p----- -------- digital_vndr/pc(leds_alone)
@@ -95,26 +116,5 @@ h-p----- -------- hhk(basic)
 -------- -------- digital_vndr/pc(pcxaj)
 -------- -------- digital_vndr/unix(unix)
 -------- -------- digital_vndr/unix(lk421jj)
--------- -------- digital_vndr/lk(lk201)
--------- -------- digital_vndr/lk(lk401)
--------- -------- digital_vndr/lk(lk450)
--------- -------- digital_vndr/lk(lk401bj)
--------- -------- digital_vndr/lk(lk401jj)
--------- -------- typematrix(tm2020)
--------- -------- typematrix(tm2030_shape)
--------- -------- typematrix(tm2030_MiscDiod_dvk)
--------- -------- typematrix(tm2030_MiscDiod_102)
--------- -------- typematrix(tm2030_MiscDiod_106)
--------- -------- typematrix(tm2030_MiscDiod_off)
--------- -------- typematrix(tm2030_MiscDiod_on)
--------- -------- typematrix(tm2030USB_func)
--------- -------- typematrix(tm2030USB_alpha)
--------- -------- typematrix(tm2030USB_ctrl)
--------- -------- typematrix(tm2030PS2)
--------- -------- typematrix(tm2030USB)
--------- -------- typematrix(tm2030USB-102)
--------- -------- typematrix(tm2030USB-106)
--d------ -------- chicony(us)
--d------ -------- nec(pc98)
--d------ -------- amiga(usa1)
--------- -------- amiga(de)
+-d------ -------- ataritt(us)
+-------- -------- ataritt(de)