[arch-commits] CVS update of core/base/klibc-kbd (PKGBUILD keymap_install)

[Roman Kyrylych]

    Date: Sunday, March 16, 2008 @ 17:38:36
  Author: roman
    Path: /home/cvs-core/core/base/klibc-kbd

Modified: PKGBUILD (1.2 -> 1.3) keymap_install (1.2 -> 1.3)

upgpkg: klibc-kbd 1.15.20080312-3


----------------+
 PKGBUILD       |    6 +++---
 keymap_install |   11 +++++------
 2 files changed, 8 insertions(+), 9 deletions(-)


Index: core/base/klibc-kbd/PKGBUILD
diff -u core/base/klibc-kbd/PKGBUILD:1.2 core/base/klibc-kbd/PKGBUILD:1.3
--- core/base/klibc-kbd/PKGBUILD:1.2	Sun Mar 16 15:12:06 2008
+++ core/base/klibc-kbd/PKGBUILD	Sun Mar 16 17:38:36 2008
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD,v 1.2 2008/03/16 19:12:06 roman Exp $
+# $Id: PKGBUILD,v 1.3 2008/03/16 21:38:36 roman Exp $
 # Maintainer: Tobias Powalowski <tpowa at archlinux.org>
 
 pkgname=klibc-kbd
 pkgver=1.15.20080312
-pkgrel=2
+pkgrel=3
 pkgdesc="Keytable files and keyboard utilities"
 arch=('i686' 'x86_64')
 url="ftp://ftp.altlinux.org/pub/people/legion/kbd/"
@@ -19,7 +19,7 @@
 md5sums=('709b087bb9d6c073bade70eda2da7770'
          '53e9612ac5fc1b23601f793410742ed3'
          '8c1bec330e8c98355502ac861561667d'
-         '43e239fdb252bdcca84471a2e10f1f11'
+         'a404433dc40a7ffc0f7712b9194c3dbc'
          '85457e44dfd7046224e87f0add8da4b2')
 
 build() {
Index: core/base/klibc-kbd/keymap_install
diff -u core/base/klibc-kbd/keymap_install:1.2 core/base/klibc-kbd/keymap_install:1.3
--- core/base/klibc-kbd/keymap_install:1.2	Sun Mar 16 15:12:06 2008
+++ core/base/klibc-kbd/keymap_install	Sun Mar 16 17:38:36 2008
@@ -38,14 +38,13 @@
         for i in $(echo ${KEYMAP}); do
             for j in $(find /usr/share/kbd/keymaps -name "${i}.map.gz"); do
                 add_ucfile ${j}
+                for k in $(zgrep -e '^include ".*"' ${j} | cut -d '"' -f 2); do
+                    for l in $(find /usr/share/kbd/keymaps -name "${k}" -o -name "${k}.*"); do
+                        add_ucfile ${l}
+                    done
+                done
             done
         done
-        for i in $(echo /usr/share/kbd/keymaps/include/*); do
-            add_ucfile ${i}
-        done
-        for i in $(echo /usr/share/kbd/keymaps/*/include/*); do
-            add_ucfile ${i}
-        done
     fi
     if [ -n "${CONSOLEFONT}" ]; then
         for i in $(find /usr/share/kbd/consolefonts -name "${CONSOLEFONT}.*gz"); do