kbd; updated to 1.15.5 and aligned with upstream

diff --git a/kbd/.footprint b/kbd/.footprint
index 6c00fe3099120586e6db98ed521aca382fd60e38..ec095f1aeb3be134b7d7e1bfeaec5b7003bdc1f3 100644 (file)
--- a/kbd/.footprint
+++ b/kbd/.footprint
@@ -38,6 +38,7 @@ drwxr-xr-x    root/root       usr/man/man5/
 drwxr-xr-x     root/root       usr/man/man8/
 -rw-r--r--     root/root       usr/man/man8/getkeycodes.8.gz
 -rw-r--r--     root/root       usr/man/man8/kbdrate.8.gz
+-rw-r--r--     root/root       usr/man/man8/resizecons.8.gz
 -rw-r--r--     root/root       usr/man/man8/setfont.8.gz
 -rw-r--r--     root/root       usr/man/man8/setkeycodes.8.gz
 -rw-r--r--     root/root       usr/man/man8/setvtrgb.8.gz
@@ -337,10 +338,15 @@ drwxr-xr-x        root/root       usr/share/kbd/keymaps/i386/colemak/
 -rw-r--r--     root/root       usr/share/kbd/keymaps/i386/colemak/en-latin9.map.gz
 drwxr-xr-x     root/root       usr/share/kbd/keymaps/i386/dvorak/
 -rw-r--r--     root/root       usr/share/kbd/keymaps/i386/dvorak/ANSI-dvorak.map.gz
+-rw-r--r--     root/root       usr/share/kbd/keymaps/i386/dvorak/dvorak-ca-fr.map.gz
+-rw-r--r--     root/root       usr/share/kbd/keymaps/i386/dvorak/dvorak-es.map.gz
 -rw-r--r--     root/root       usr/share/kbd/keymaps/i386/dvorak/dvorak-fr.map.gz
 -rw-r--r--     root/root       usr/share/kbd/keymaps/i386/dvorak/dvorak-l.map.gz
 -rw-r--r--     root/root       usr/share/kbd/keymaps/i386/dvorak/dvorak-r.map.gz
 -rw-r--r--     root/root       usr/share/kbd/keymaps/i386/dvorak/dvorak-ru.map.gz
+-rw-r--r--     root/root       usr/share/kbd/keymaps/i386/dvorak/dvorak-sv-a1.map.gz
+-rw-r--r--     root/root       usr/share/kbd/keymaps/i386/dvorak/dvorak-sv-a5.map.gz
+-rw-r--r--     root/root       usr/share/kbd/keymaps/i386/dvorak/dvorak-uk.map.gz
 -rw-r--r--     root/root       usr/share/kbd/keymaps/i386/dvorak/dvorak.map.gz
 -rw-r--r--     root/root       usr/share/kbd/keymaps/i386/dvorak/no.map.gz
 drwxr-xr-x     root/root       usr/share/kbd/keymaps/i386/fgGIod/
@@ -454,6 +460,7 @@ drwxr-xr-x  root/root       usr/share/kbd/keymaps/i386/qwerty/
 -rw-r--r--     root/root       usr/share/kbd/keymaps/i386/qwerty/ruwin_alt-CP1251.map.gz
 -rw-r--r--     root/root       usr/share/kbd/keymaps/i386/qwerty/ruwin_alt-KOI8-R.map.gz
 -rw-r--r--     root/root       usr/share/kbd/keymaps/i386/qwerty/ruwin_alt-UTF-8.map.gz
+-rw-r--r--     root/root       usr/share/kbd/keymaps/i386/qwerty/ruwin_alt_sh-UTF-8.map.gz
 -rw-r--r--     root/root       usr/share/kbd/keymaps/i386/qwerty/ruwin_cplk-CP1251.map.gz
 -rw-r--r--     root/root       usr/share/kbd/keymaps/i386/qwerty/ruwin_cplk-KOI8-R.map.gz
 -rw-r--r--     root/root       usr/share/kbd/keymaps/i386/qwerty/ruwin_cplk-UTF-8.map.gz

diff --git a/kbd/.md5sum b/kbd/.md5sum
index bcdd1b26979ba723edd7ba6af9f18dae398b54cc..b0a16f5083b738803b80c9055705fd16409ae0c1 100644 (file)
--- a/kbd/.md5sum
+++ b/kbd/.md5sum
@@ -1 +1 @@
-8143e179a0f3c25646ce5085e8777200  kbd-1.15.3.tar.gz
+34c71feead8ab9c01ec638acea8cd877  kbd-1.15.5.tar.gz

diff --git a/kbd/Pkgfile b/kbd/Pkgfile
index 96aca2c3d90b08f09fa19aa8d866a14cc8515960..972756575203ab261610d09f751d49e68eaa1bc4 100644 (file)
--- a/kbd/Pkgfile
+++ b/kbd/Pkgfile
@@ -5,7 +5,7 @@
 # Depends on:
 
 name=kbd
-version=1.15.3
+version=1.15.5
 release=1
 source=(ftp://ftp.altlinux.org/pub/people/legion/kbd/$name-$version.tar.gz)
 
@@ -25,17 +25,17 @@ EOF
               --prefix=/usr \
               --mandir=/usr/man \
               --datadir=/usr/share/kbd \
+              --disable-vlock \
               --disable-nls \
               --cache-file=config.cache
-  make
+  make -j1
   make DESTDIR=$PKG install
 
   ln -sf default8x16.psfu.gz $PKG/usr/share/kbd/consolefonts/default.gz
 
   rm -r $PKG/usr/share/kbd/keymaps/{ppc,mac,atari,amiga,sun}
-  rm $PKG/usr/bin/{psfxtable,mapscrn,loadunimap} \
-     $PKG/usr/bin/{psfaddtable,psfgettable,psfstriptable} \
-     $PKG/usr/man/man1/{psfaddtable.1,psfgettable.1,psfstriptable.1,psfxtable.1} \
-     $PKG/usr/man/man8/{loadunimap.8,resizecons.8,mapscrn.8}
-  find $PKG/usr/share/kbd/ -name "README*" -exec rm {} \;
+  rm $PKG/usr/bin/{loadunimap,mapscrn,psf*table}
+  rm $PKG/usr/man/man8/{loadunimap,mapscrn}.8
+  rm $PKG/usr/man/man1/psf*table.1
+  find $PKG/usr/share/kbd/ -type f -name "README*" -delete
 }