use br(thinkpad) for all thinkpads, b.fd.o#20425

diff --git a/ChangeLog b/ChangeLog
index 4234326..7a4711f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-03-03 Sergey Udaltsov
+
+       * rules/base.lists.part, rules/base.ml1_s.part, rules/base.ml_s.part:
+       use br(thinkpad) for all thinkpads,
+       http://bugs.freedesktop.org/show_bug.cgi?id=20425
+
 2009-03-02 Sergey Udaltsov
 
        * po/POTFILES.in: removed evdev.xml.in, which is exact copy of

diff --git a/rules/base.lists.part b/rules/base.lists.part
index c3ba679..b708e46 100644 (file)
--- a/rules/base.lists.part
+++ b/rules/base.lists.part
@@ -88,3 +88,6 @@
               za
 
 ! $evdevkbds = ibm_spacesaver
+
+! $thinkpads = thinkpad thinkpad60 thinkpadz60
+

diff --git a/rules/base.ml1_s.part b/rules/base.ml1_s.part
index 8e0eeef..c45b980 100644 (file)
--- a/rules/base.ml1_s.part
+++ b/rules/base.ml1_s.part
@@ -6,5 +6,5 @@
   macintosh_old        $macvendorlayouts       =       macintosh_vndr/us(oldmac)+macintosh_vndr/%l[1]%(v[1])
   macintosh_old        *                       =       macintosh_vndr/us(oldmac)+%l[1]%(v[1])
  $macs         $macvendorlayouts       =       pc+macintosh_vndr/%l[1]%(v[1])
-  thinkpad     br                      =       pc+%l[1](thinkpad)
+ $thinkpads    br                      =       pc+%l[1](thinkpad)
   *            *                       =       pc+%l[1]%(v[1])

diff --git a/rules/base.ml_s.part b/rules/base.ml_s.part
index 3b0086f..7e9b2d6 100644 (file)
--- a/rules/base.ml_s.part
+++ b/rules/base.ml_s.part
@@ -20,6 +20,6 @@
  $macs         $macvendorlayouts       =       pc+macintosh_vndr/%l%(v)
   olpc         $olpclayouts            =       olpc+%l%(m)
   olpc         *                       =       olpc+%l%(v)
-  thinkpad     br                      =       pc+br(thinkpad)
+ $thinkpads    br                      =       pc+br(thinkpad)
   *            $nonlatin               =       pc+us+%l%(v):2
   *            *                       =       pc+%l%(v)