[Clfs-commits] [Cross-LFS]Cross-LFS Book branch, master, updated. clfs-2.0.0-143-g8863cd6

[git]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Cross-LFS Book".

The branch, master has been updated
       via  8863cd6f0f561cd81394447cfc5226186bd12734 (commit)
       via  45186aae79dc64fcd858009f4d104a469761f6b1 (commit)
       via  3f3cf4927239cbb0446a26ef429a16c2b2391b4e (commit)
      from  00fcb3efda1d307e50465e942bdf512c3d9ab891 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 8863cd6f0f561cd81394447cfc5226186bd12734
Author: William Harrington <kb0iic at berzerkula.org>
Date:   Mon Jul 22 14:12:36 2013 -0500

    Add kbd 1.15.5 update entry to master changelog.

diff --git a/BOOK/introduction/common/changelog.xml b/BOOK/introduction/common/changelog.xml
index 85a85d3..f9ebde4 100644
--- a/BOOK/introduction/common/changelog.xml
+++ b/BOOK/introduction/common/changelog.xml
@@ -36,6 +36,18 @@
     </listitem>
 -->
    <listitem>
+      <para>22 July 2013</para>
+      <itemizedlist>
+        <listitem>
+          <para>[William Harrington] - Update KBD to 1.15.5.</para>
+        </listitem>
+        <listitem>
+          <para>[William Harrington] - Remove unneeded KBD es_po patch.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+   <listitem>
       <para>09 July 2013</para>
       <itemizedlist>
         <listitem>

commit 45186aae79dc64fcd858009f4d104a469761f6b1
Author: William Harrington <kb0iic at berzerkula.org>
Date:   Mon Jul 22 14:12:14 2013 -0500

    Update KBD to 1.15.5.

diff --git a/BOOK/packages.ent b/BOOK/packages.ent
index 1ac3d0e..26228e2 100644
--- a/BOOK/packages.ent
+++ b/BOOK/packages.ent
@@ -231,10 +231,10 @@
 <!ENTITY isl-md5 "355bf920bf145b7a23f20b9e6080628d">
 <!ENTITY isl-home "http://garage.kotnet.org/~skimo/isl/">
 
-<!ENTITY kbd-version "1.15.3">
-<!ENTITY kbd-size "1,624 KB">
+<!ENTITY kbd-version "1.15.5">
+<!ENTITY kbd-size "1,692 KB">
 <!ENTITY kbd-url "ftp://devel.altlinux.org/legion/kbd/kbd-&kbd-version;.tar.gz">
-<!ENTITY kbd-md5 "8143e179a0f3c25646ce5085e8777200">
+<!ENTITY kbd-md5 "34c71feead8ab9c01ec638acea8cd877">
 <!ENTITY kbd-home " ">
 
 <!ENTITY kmod-version "14">

commit 3f3cf4927239cbb0446a26ef429a16c2b2391b4e
Author: William Harrington <kb0iic at berzerkula.org>
Date:   Mon Jul 22 14:12:02 2013 -0500

    Remove kbd es_po patch.

diff --git a/BOOK/final-system/common/kbd.xml b/BOOK/final-system/common/kbd.xml
index 2f8dc94..6274840 100644
--- a/BOOK/final-system/common/kbd.xml
+++ b/BOOK/final-system/common/kbd.xml
@@ -25,10 +25,6 @@
   <sect2 role="installation">
     <title>Installation of Kbd</title>
 
-    <para os="p1">Apply the following patch to fix a typo in es.po:</para>
-
-    <screen os="p2"><userinput>patch -Np1 -i ../&kbd-espo-patch;</userinput></screen>
-
     <para os="a">Prepare Kbd for compilation:</para>
 
 <screen os="b"><userinput>./configure --prefix=/usr</userinput></screen>
diff --git a/BOOK/final-system/multilib/kbd.xml b/BOOK/final-system/multilib/kbd.xml
index b434573..646f24a 100644
--- a/BOOK/final-system/multilib/kbd.xml
+++ b/BOOK/final-system/multilib/kbd.xml
@@ -23,14 +23,6 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/kbd.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/kbd.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/kbd.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
 <screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr</userinput></screen>
diff --git a/patches/kbd-1.15.3-es.po_fix-1.patch b/patches/kbd-1.15.3-es.po_fix-1.patch
deleted file mode 100644
index d90ce3f..0000000
--- a/patches/kbd-1.15.3-es.po_fix-1.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Submitted By: Jonathan Norman <jonathan dot bluesquarelinux.co.uk>
-Date: 2011-05-17
-Initial Package Version: 1.15.3 
-Origin: Arch Linux
-Upstream Status: Unknown
-Description: Fixes mistake in es.po file.
-
---- kbd-1.15.3/po/es.old	2011-05-14 23:12:49.000000000 +0200
-+++ kbd-1.15.3/po/es.po	2011-05-15 21:07:02.120669404 +0200
-@@ -1363,7 +1363,7 @@
- #: src/setfont.c:682
- #, c-format
- msgid "Saved %d-char %dx%d font file on %s\n"
--msgstr "Se ha guardado el fichero de tipos %2$dx%3$d de %1$d caracteres en %s\n"
-+msgstr "Se ha guardado el fichero de tipos %dx%d de %d caracteres en %s\n"
- 
- #: src/setkeycodes.c:21
- #, c-format

-----------------------------------------------------------------------

Summary of changes:
 BOOK/final-system/common/kbd.xml       |    4 ----
 BOOK/final-system/multilib/kbd.xml     |    8 --------
 BOOK/introduction/common/changelog.xml |   12 ++++++++++++
 BOOK/packages.ent                      |    6 +++---
 patches/kbd-1.15.3-es.po_fix-1.patch   |   18 ------------------
 5 files changed, 15 insertions(+), 33 deletions(-)
 delete mode 100644 patches/kbd-1.15.3-es.po_fix-1.patch


hooks/post-receive
-- 
Cross-LFS Book