Bug#469335: xkb-data: sun rules reference nonexistent symbols
* Bernhard R. Link <brlink@debian.org> [080601 17:37]:
> I'm currently trying to port the patch to the current version, but if
> I do so I get an extreme long set of warnings about multiple defined
> keycodes.
The attached patch makes model sun5 work again, at least in layout us.
I'll see if I can find some other keyboards next weekend to test.
Hochachtungsvoll,
Bernhard R. Link
--- usr/share/X11/xkb/rules/xorg 2008-05-28 14:13:37.000000000 +0200
+++ /usr/share/X11/xkb/rules/xorg 2008-06-01 19:36:50.000000000 +0200
@@ -283,10 +283,12 @@
amiga * = xfree68_vndr/amiga(usa1)+%l%(v)
classmate us = pc+%l(classmate)
- sun4 $nonlatin = latin+sun_vndr/us(sun4)+%l%(v):2
- sun4 * = latin+sun_vndr/us(sun4)+%l%(v)
- sun5 $nonlatin = latin+sun_vndr/us(sun5)+%l%(v):2
- sun5 * = latin+sun_vndr/us(sun5)+%l%(v)
+ sun4 us = sun_vndr/us(type4)
+ sun4 $nonlatin = sun_vndr/us(type4)+%l%(v):2
+ sun4 * = sun_vndr/us(type4)+%l%(v)
+ sun5 us = sun_vndr/us(type5)
+ sun5 $nonlatin = sun_vndr/us(type5)+%l%(v):2
+ sun5 * = sun_vndr/us(type5)+%l%(v)
sun6 us = sun_vndr/us(type6)
sun6 en_US = sun_vndr/us(type6)+iso9995-3(basic)
sun6 * = sun_vndr/us(type6)+%l%(v)
@@ -380,8 +382,8 @@
* yu(unicodeyz) = pc+srp(latinunicodeyz)
ataritt * = xfree68_vndr/ataritt(us)+%l[1]%(v[1])
amiga * = xfree68_vndr/amiga(usa1)+%l[1]%(v[1])
- sun4 * = latin+sun_vndr/us(sun4)+%l[1]%(v[1])
- sun5 * = latin+sun_vndr/us(sun5)+%l[1]%(v[1])
+ sun4 * = sun_vndr/us(type4)+%l[1]%(v[1])
+ sun5 * = sun_vndr/us(type5)+%l[1]%(v[1])
macintosh_old us = macintosh_vndr/us(oldmac)
macintosh_old $macvendorlayouts = macintosh_vndr/us(oldmac)+macintosh_vndr/%l[1]%(v[1])
macintosh_old * = macintosh_vndr/us(oldmac)+%l[1]%(v[1])
Reply to: