kbd-1.15.3.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@9841 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

7 files changed, 49 insertions, 12 deletions

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index d36825cf9..89369c83b 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -37,6 +37,15 @@
 
 -->
     <listitem>
+      <para>2012-05-01</para>
+      <itemizedlist>
+         <listitem>
+           <para>[ken] - Upgrade to Kbd-1.15.3. Fixes
+           <ulink url="&lfs-ticket-root;2990">#2990</ulink>.</para>
+         </listitem>
+      </itemizedlist>
+    </listitem>
+    <listitem>
       <para>2012-04-29</para>
       <itemizedlist>
          <listitem>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index c20d0df0b..b2157758f 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -109,9 +109,9 @@
     <listitem>
       <para>IPRoute2 &iproute2-version;</para>
     </listitem>
-    <!--<listitem>
+    <listitem>
       <para>Kbd &kbd-version;</para>
-    </listitem>-->
+    </listitem>
     <listitem>
       <para>Kmod &kmod-version;</para>
     </listitem>
@@ -235,6 +235,10 @@
       <para>&glibc-gcc_fix-patch;</para>
     </listitem>
 
+    <listitem>
+      <para>&kbd-fixes-patch;</para>
+    </listitem>
+
   </itemizedlist>
 
   <itemizedlist>
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index fc11228a8..ef8b804c0 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -84,6 +84,14 @@
     </varlistentry>
 -->
     <varlistentry>
+      <term>Kbd Loadkeys Fix Patch - <token>&kbd-fixes-patch-size;</token>:</term>
+      <listitem>
+        <para>Download: <ulink url="&patches-root;&kbd-fixes-patch;"/></para>
+        <para>MD5 sum: <literal>&kbd-fixes-patch-md5;</literal></para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
       <term>Kbd Backspace/Delete Fix Patch - <token>&kbd-backspace-patch-size;</token>:</term>
       <listitem>
         <para>Download: <ulink url="&patches-root;&kbd-backspace-patch;"/></para>
diff --git a/chapter06/kbd.xml b/chapter06/kbd.xml
index 11dc5ab16..fa6133bda 100644
--- a/chapter06/kbd.xml
+++ b/chapter06/kbd.xml
@@ -23,7 +23,8 @@
   <sect2 role="package">
     <title/>
 
-    <para>The Kbd package contains key-table files and keyboard utilities.</para>
+    <para>The Kbd package contains key-table files, console fonts, and keyboard
+    utilities.</para>
 
     <segmentedlist>
       <segtitle>&buildtime;</segtitle>
@@ -40,6 +41,11 @@
   <sect2 role="installation">
     <title>Installation of Kbd</title>
 
+    <para>The behaviour of <command>loadkeys</command> when run without a
+    filename was broken in this release. The following patch fixes this:</para>
+
+<screen><userinput remap="pre">patch -Np1 -i ../&kbd-fixes-patch;</userinput></screen>
+
     <para>The behaviour of the Backspace and Delete keys is not consistent
     across the keymaps in the Kbd package. The following patch fixes this
     issue for i386 keymaps:</para>
@@ -49,6 +55,11 @@
     <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 in the Spanish message translations which prevents kbd from
+    building with gettext-&gettext-version;:</para>
+
+<screen><userinput remap="pre">sed -i '/guardado\ el/s/\(^.*en\ %\)\(.*\)/\14\$\2/' po/es.po</userinput></screen>
+
     <para>Prepare Kbd for compilation:</para>
 
 <screen><userinput remap="configure">./configure --prefix=/usr --datadir=/lib/kbd</userinput></screen>
diff --git a/general.ent b/general.ent
index eb446208c..d138aa7f7 100644
--- a/general.ent
+++ b/general.ent
@@ -1,5 +1,5 @@
-<!ENTITY version "SVN-20120429">
-<!ENTITY releasedate "Apr 29, 2012">
+<!ENTITY version "SVN-20120501">
+<!ENTITY releasedate "May 01, 2012">
 <!ENTITY copyrightdate "1999-2012"><!-- jhalfs needs a literal dash, not &ndash; -->
 <!ENTITY milestone "7.2">
 <!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->
diff --git a/packages.ent b/packages.ent
index a92485621..9111e89f2 100644
--- a/packages.ent
+++ b/packages.ent
@@ -278,13 +278,13 @@
 <!ENTITY iproute2-ch6-du "6.6 MB">
 <!ENTITY iproute2-ch6-sbu "0.1 SBU">
 
-<!ENTITY kbd-version "1.15.2">
-<!ENTITY kbd-size "1,520 KB">
-<!ENTITY kbd-url "&anduin-sources;kbd/kbd-&kbd-version;.tar.gz">
-<!ENTITY kbd-md5 "77d0b51454522bc6c170bbdc6e31202a">
-<!ENTITY kbd-home " ">
-<!ENTITY kbd-ch6-du "16.0 MB">
-<!ENTITY kbd-ch6-sbu "less than 0.1 SBU">
+<!ENTITY kbd-version "1.15.3">
+<!ENTITY kbd-size "1,621 KB">
+<!ENTITY kbd-url "http://ftp.altlinux.org/pub/people/legion/kbd/kbd-&kbd-version;.tar.gz">
+<!ENTITY kbd-md5 "8143e179a0f3c25646ce5085e8777200">
+<!ENTITY kbd-home "http://ftp.altlinux.org/pub/people/legion/kbd">
+<!ENTITY kbd-ch6-du "21.0 MB">
+<!ENTITY kbd-ch6-sbu "0.2 SBU">
 
 <!ENTITY kmod-version "8">
 <!ENTITY kmod-size "964 KB">
diff --git a/patches.ent b/patches.ent
index d5d4fd768..93334a86c 100644
--- a/patches.ent
+++ b/patches.ent
@@ -56,6 +56,11 @@
 <!ENTITY kbd-backspace-patch-size "12 KB">
 
 
+<!ENTITY kbd-fixes-patch "kbd-&kbd-version;-upstream_fixes-1.patch">
+<!ENTITY kbd-fixes-patch-md5 "58ae9bd7d546426cfaccf3eba16ad1a2">
+<!ENTITY kbd-fixes-patch-size "1.6 KB">
+
+
 <!ENTITY mpfr-fixes-patch "mpfr-&mpfr-version;-fixes-1.patch">
 <!ENTITY mpfr-fixes-patch-md5 "6a1a0be6f2326e237ce27a0254e360a5">
 <!ENTITY mpfr-fixes-patch-size "17 KB">