From 5bc4bcf8a7d39466092b30dc33a5ea9d4f704d26 Mon Sep 17 00:00:00 2001
From: tnut <thierryn1 at hispeed dot ch>
Date: Thu, 24 Dec 2009 23:59:39 +0100
Subject: Maj kbd#1.15.1-1

---
 base/kbd/.footprint | 6 ++++++
 base/kbd/.md5sum    | 4 ++--
 base/kbd/Pkgfile    | 5 ++---
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/base/kbd/.footprint b/base/kbd/.footprint
index 226a76c63..b16f0187f 100644
--- a/base/kbd/.footprint
+++ b/base/kbd/.footprint
@@ -313,6 +313,7 @@ drwxr-xr-x	root/root	lib/kbd/keymaps/i386/azerty/
 -rw-r--r--	root/root	lib/kbd/keymaps/i386/azerty/wangbe2.map.gz
 drwxr-xr-x	root/root	lib/kbd/keymaps/i386/dvorak/
 -rw-r--r--	root/root	lib/kbd/keymaps/i386/dvorak/ANSI-dvorak.map.gz
+-rw-r--r--	root/root	lib/kbd/keymaps/i386/dvorak/dvorak-fr.map.gz
 -rw-r--r--	root/root	lib/kbd/keymaps/i386/dvorak/dvorak-l.map.gz
 -rw-r--r--	root/root	lib/kbd/keymaps/i386/dvorak/dvorak-r.map.gz
 -rw-r--r--	root/root	lib/kbd/keymaps/i386/dvorak/dvorak.map.gz
@@ -390,6 +391,7 @@ drwxr-xr-x	root/root	lib/kbd/keymaps/i386/qwerty/
 -rw-r--r--	root/root	lib/kbd/keymaps/i386/qwerty/it2.map.gz
 -rw-r--r--	root/root	lib/kbd/keymaps/i386/qwerty/jp106.map.gz
 -rw-r--r--	root/root	lib/kbd/keymaps/i386/qwerty/kazakh.map.gz
+-rw-r--r--	root/root	lib/kbd/keymaps/i386/qwerty/ky_alt_sh-UTF-8.map.gz
 -rw-r--r--	root/root	lib/kbd/keymaps/i386/qwerty/kyrgyz.map.gz
 -rw-r--r--	root/root	lib/kbd/keymaps/i386/qwerty/la-latin1.map.gz
 -rw-r--r--	root/root	lib/kbd/keymaps/i386/qwerty/lt.baltic.map.gz
@@ -444,6 +446,7 @@ drwxr-xr-x	root/root	lib/kbd/keymaps/i386/qwerty/
 -rw-r--r--	root/root	lib/kbd/keymaps/i386/qwerty/sk-qwerty.map.gz
 -rw-r--r--	root/root	lib/kbd/keymaps/i386/qwerty/sr-cy.map.gz
 -rw-r--r--	root/root	lib/kbd/keymaps/i386/qwerty/sv-latin1.map.gz
+-rw-r--r--	root/root	lib/kbd/keymaps/i386/qwerty/tj_alt-UTF8.map.gz
 -rw-r--r--	root/root	lib/kbd/keymaps/i386/qwerty/tr_q-latin5.map.gz
 -rw-r--r--	root/root	lib/kbd/keymaps/i386/qwerty/tralt.map.gz
 -rw-r--r--	root/root	lib/kbd/keymaps/i386/qwerty/trf.map.gz
@@ -468,6 +471,7 @@ drwxr-xr-x	root/root	lib/kbd/keymaps/i386/qwertz/
 -rw-r--r--	root/root	lib/kbd/keymaps/i386/qwertz/de-latin1.map.gz
 -rw-r--r--	root/root	lib/kbd/keymaps/i386/qwertz/de.map.gz
 -rw-r--r--	root/root	lib/kbd/keymaps/i386/qwertz/de_CH-latin1.map.gz
+-rw-r--r--	root/root	lib/kbd/keymaps/i386/qwertz/de_alt_UTF-8.map.gz
 -rw-r--r--	root/root	lib/kbd/keymaps/i386/qwertz/fr_CH-latin1.map.gz
 -rw-r--r--	root/root	lib/kbd/keymaps/i386/qwertz/fr_CH.map.gz
 -rw-r--r--	root/root	lib/kbd/keymaps/i386/qwertz/hu.map.gz
@@ -529,6 +533,7 @@ drwxr-xr-x	root/root	lib/kbd/keymaps/sun/
 -rw-r--r--	root/root	lib/kbd/keymaps/sun/sunt5-ru.map.gz
 -rw-r--r--	root/root	lib/kbd/keymaps/sun/sunt5-uk.map.gz
 -rw-r--r--	root/root	lib/kbd/keymaps/sun/sunt5-us-cz.map.gz
+-rw-r--r--	root/root	lib/kbd/keymaps/sun/sunt6-uk.map.gz
 drwxr-xr-x	root/root	lib/kbd/unimaps/
 -rw-r--r--	root/root	lib/kbd/unimaps/8859-1.a0-ff.uni
 -rw-r--r--	root/root	lib/kbd/unimaps/8859-10.a0-ff.uni
@@ -609,6 +614,7 @@ lrwxrwxrwx	root/root	usr/bin/psfaddtable -> psfxtable
 lrwxrwxrwx	root/root	usr/bin/psfgettable -> psfxtable
 lrwxrwxrwx	root/root	usr/bin/psfstriptable -> psfxtable
 -rwxr-xr-x	root/root	usr/bin/psfxtable
+-rwxr-xr-x	root/root	usr/bin/resizecons
 -rwxr-xr-x	root/root	usr/bin/setkeycodes
 -rwxr-xr-x	root/root	usr/bin/setleds
 -rwxr-xr-x	root/root	usr/bin/setmetamode
diff --git a/base/kbd/.md5sum b/base/kbd/.md5sum
index addc7351d..e729a3be3 100644
--- a/base/kbd/.md5sum
+++ b/base/kbd/.md5sum
@@ -1,2 +1,2 @@
-f75cca16a38da6caa7d52151f7136895  kbd-1.15-backspace-1.patch
-ba3fd20e6c79e58422c3cc6b28718939  kbd-1.15.tar.gz
+f75cca16a38da6caa7d52151f7136895  kbd-1.15.1-backspace-1.patch
+f997c490fe5ede839aacf31da6c4eb06  kbd-1.15.1.tar.gz
diff --git a/base/kbd/Pkgfile b/base/kbd/Pkgfile
index 4e2a3f9b3..4dbbecb34 100755
--- a/base/kbd/Pkgfile
+++ b/base/kbd/Pkgfile
@@ -5,16 +5,15 @@
 # Depends on:
 
 name=kbd
-version=1.15
+version=1.15.1
 release=1
 source=(http://ftp.altlinux.com/pub/people/legion/kbd/kbd-$version.tar.gz \
 http://www.linuxfromscratch.org/patches/lfs/development/kbd-$version-backspace-1.patch \
 	)
 build() {
 cd $name-$version
+autoreconf
 patch -Np1 -i ../kbd-$version-backspace-1.patch
-sed -i -e '1i KEYCODES_PROGS = @KEYCODES_PROGS@' \
-	-e '1i RESIZECONS_PROGS = @RESIZECONS_PROGS@' src/Makefile.in
 ./configure --prefix=/usr \
 	--mandir=/usr/share/man \
 	--datadir=/lib/kbd
-- 
cgit v1.2.3-70-g09d2