diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | configure.in | 1 | ||||
| -rw-r--r-- | geometry/Makefile.am | 4 | ||||
| -rw-r--r-- | geometry/ibm_vndr/.cvsignore | 2 | ||||
| -rw-r--r-- | geometry/ibm_vndr/Makefile.am | 4 | ||||
| -rw-r--r-- | geometry/thinkpad (renamed from geometry/ibm_vndr/thinkpad) | 0 | ||||
| -rw-r--r-- | rules/base.m_g.part | 3 | ||||
| -rw-r--r-- | rules/base.xml.in | 6 |
8 files changed, 16 insertions, 10 deletions
@@ -1,5 +1,11 @@ 2006-09-05 Sergey Udaltsov + geometry/ibm_vnd, configure.in, rules/base.m_g.part: getting rid of + ibm_vndr geometry, fixing rules, + https://bugs.freedesktop.org/show_bug.cgi?id=7990 + +2006-09-05 Sergey Udaltsov + symbols/gb: s/ralt_switch/ralt_switch_multikey https://bugs.freedesktop.org/show_bug.cgi?id=7674 diff --git a/configure.in b/configure.in index 270357a6..2fae764c 100644 --- a/configure.in +++ b/configure.in @@ -49,7 +49,6 @@ Makefile compat/Makefile geometry/Makefile geometry/digital_vndr/Makefile -geometry/ibm_vndr/Makefile geometry/sgi_vndr/Makefile keycodes/Makefile keycodes/digital_vndr/Makefile diff --git a/geometry/Makefile.am b/geometry/Makefile.am index 26a19c0a..c54eb2b7 100644 --- a/geometry/Makefile.am +++ b/geometry/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = digital_vndr ibm_vndr sgi_vndr +SUBDIRS = digital_vndr sgi_vndr geomdir = $(xkb_base)/geometry @@ -7,7 +7,7 @@ amiga ataritt chicony \ dell everex fujitsu \ hp keytronic kinesis \ macintosh microsoft nec \ -northgate pc sony \ +northgate pc sony thinkpad \ sun winbook README include $(top_srcdir)/xkbrules.am diff --git a/geometry/ibm_vndr/.cvsignore b/geometry/ibm_vndr/.cvsignore deleted file mode 100644 index 282522db..00000000 --- a/geometry/ibm_vndr/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -Makefile.in diff --git a/geometry/ibm_vndr/Makefile.am b/geometry/ibm_vndr/Makefile.am deleted file mode 100644 index 84130ace..00000000 --- a/geometry/ibm_vndr/Makefile.am +++ /dev/null @@ -1,4 +0,0 @@ -geomdir = $(xkb_base)/geometry/ibm_vndr - -dist_geom_DATA = \ -thinkpad diff --git a/geometry/ibm_vndr/thinkpad b/geometry/thinkpad index 6599c418..6599c418 100644 --- a/geometry/ibm_vndr/thinkpad +++ b/geometry/thinkpad diff --git a/rules/base.m_g.part b/rules/base.m_g.part index 2e43ed22..850cc90c 100644 --- a/rules/base.m_g.part +++ b/rules/base.m_g.part @@ -3,7 +3,8 @@ flexpro = keytronic(FlexPro) hp6000 = hp(omnibook) omnikey101 = northgate(omnikey101) - thinkpad = ibm_vndr/thinkpad(common) + thinkpad = thinkpad(us) + thinkpadintl = thinkpad(intl) $pcmodels = pc(%m) $pcgeometries = pc(%m) everex = everex(STEPnote) diff --git a/rules/base.xml.in b/rules/base.xml.in index 363cfb75..c7d90c7b 100644 --- a/rules/base.xml.in +++ b/rules/base.xml.in @@ -418,6 +418,12 @@ </model> <model> <configItem> + <name>thinkpadintl</name> + <_description>IBM ThinkPad 560Z/600/600E/A22E, Intl</_description> + </configItem> + </model> + <model> + <configItem> <name>logiaccess</name> <_description>Logitech Access Keyboard</_description> </configItem> |