From 682a13be3d5142101ce23f501e95ffd19a5b9d17 Mon Sep 17 00:00:00 2001
From: Matthew Burgess <matthew@linuxfromscratch.org>
Date: Sun, 15 Sep 2013 22:28:08 +0000
Subject: Update to Kbd-2.0.0. Fixes #3390.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@10345 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 appendices/dependencies.xml |  4 ++--
 chapter01/changelog.xml     | 10 ++++++++++
 chapter01/whatsnew.xml      |  4 ++--
 chapter06/kbd.xml           | 10 +++-------
 general.ent                 |  4 ++--
 packages.ent                |  4 ++--
 6 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/appendices/dependencies.xml b/appendices/dependencies.xml
index a8d718246..078e6ff9e 100644
--- a/appendices/dependencies.xml
+++ b/appendices/dependencies.xml
@@ -1087,8 +1087,8 @@
         <segtitle>&dependencies;</segtitle>
 
         <seglistitem>
-         <seg>Bash, Binutils, Bison, Coreutils, Flex, GCC, Gettext, Glibc,
-         Gzip, Make, Patch, and Sed</seg>
+         <seg>Bash, Binutils, Bison, Check, Coreutils, Flex, GCC, Gettext,
+         Glibc, Gzip, Make, Patch, and Sed</seg>
         </seglistitem>
       </segmentedlist>
 
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index f05a3bc80..c8c9fbee5 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -35,6 +35,16 @@
       </itemizedlist>
     </listitem>
 -->
+    <listitem>
+      <para>2013-09-15</para>
+      <itemizedlist>
+        <listitem>
+          <para>[matthew] - Update to Kbd-2.0.0. Fixes
+          <ulink url="&lfs-ticket-root;3390">#3390</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>2013-09-13</para>
       <itemizedlist>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index 8d57d270e..a7502ca4b 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -112,9 +112,9 @@
     <listitem>
       <para>IPRoute2 &iproute2-version;</para>
     </listitem>
-    <!--<listitem>
+    <listitem>
       <para>Kbd &kbd-version;</para>
-    </listitem>-->
+    </listitem>
     <listitem>
       <para>Kmod &kmod-version;</para>
     </listitem>
diff --git a/chapter06/kbd.xml b/chapter06/kbd.xml
index fb7adc552..44491083f 100644
--- a/chapter06/kbd.xml
+++ b/chapter06/kbd.xml
@@ -50,21 +50,17 @@
     <para>After patching, the Backspace key generates the character with code 127,
     and the Delete key generates a well-known escape sequence.</para>
 
-    <para>Fix a bug that causes some keymaps not to be loaded correctly:</para>
-
-<screen><userinput remap="pre">sed -i -e '326 s/if/while/' src/loadkeys.analyze.l</userinput></screen>
-
     <para>Remove the redundant <command>resizecons</command> program (it requires
     the defunct svgalib to provide the video mode files - for normal use
     <command>setfont</command> sizes the console appropriately) together with its
     manpage.</para>
 
 <screen><userinput remap="pre">sed -i 's/\(RESIZECONS_PROGS=\)yes/\1no/g' configure
-sed -i 's/resizecons.8 //' man/man8/Makefile.in</userinput></screen>
+sed -i 's/resizecons.8 //' docs/man/man8/Makefile.in</userinput></screen>
 
     <para>Prepare Kbd for compilation:</para>
 
-<screen><userinput remap="configure">./configure --prefix=/usr --disable-vlock</userinput></screen>
+<screen><userinput remap="configure">PKG_CONFIG_PATH=/tools/lib/pkgconfig ./configure --prefix=/usr --disable-vlock</userinput></screen>
 
     <variablelist>
       <title>The meaning of the configure options:</title>
@@ -119,7 +115,7 @@ sed -i 's/resizecons.8 //' man/man8/Makefile.in</userinput></screen>
     <para>If desired, install the documentation:</para>
 
 <screen><userinput remap="install">mkdir -v       /usr/share/doc/kbd-&kbd-version;
-cp -R -v doc/* /usr/share/doc/kbd-&kbd-version;</userinput></screen>
+cp -R -v docs/doc/* /usr/share/doc/kbd-&kbd-version;</userinput></screen>
 
   </sect2>
 
diff --git a/general.ent b/general.ent
index 5b1a0a3f1..9dd2aa832 100644
--- a/general.ent
+++ b/general.ent
@@ -1,5 +1,5 @@
-<!ENTITY version         "SVN-20130914">
-<!ENTITY releasedate     "September 14, 2013">
+<!ENTITY version         "SVN-20130915">
+<!ENTITY releasedate     "September 15, 2013">
 <!ENTITY copyrightdate   "1999-2013"><!-- jhalfs needs a literal dash, not &ndash; -->
 <!ENTITY milestone       "7.5">
 <!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->
diff --git a/packages.ent b/packages.ent
index d51a796ac..9f032852c 100644
--- a/packages.ent
+++ b/packages.ent
@@ -286,10 +286,10 @@
 <!ENTITY iproute2-ch6-du "7.3 MB">
 <!ENTITY iproute2-ch6-sbu "0.1 SBU">
 
-<!ENTITY kbd-version "1.15.5">
+<!ENTITY kbd-version "2.0.0">
 <!ENTITY kbd-size "1,690 KB">
 <!ENTITY kbd-url "http://ftp.altlinux.org/pub/people/legion/kbd/kbd-&kbd-version;.tar.gz">
-<!ENTITY kbd-md5 "34c71feead8ab9c01ec638acea8cd877">
+<!ENTITY kbd-md5 "5ba259a0b2464196f6488a72070a3d60">
 <!ENTITY kbd-home "http://ftp.altlinux.org/pub/people/legion/kbd">
 <!ENTITY kbd-ch6-du "20 MB">
 <!ENTITY kbd-ch6-sbu "0.1 SBU">
-- 
cgit v1.2.3-54-g00ecf