[LFS-SVN] SVN-20210101, チェンジセット 12073-12078 対応。

git-svn-id: svn+ssh://svn.osdn.net/svnroot/lfsbookja/trunk@1340 d6661c75-0afd-443a-aae1-cb31083e41e8

diff --git a/lfsbook/configure b/lfsbook/configure
index 52b2182..4e3bdd0 100755 (executable)
--- a/lfsbook/configure
+++ b/lfsbook/configure
@@ -4034,7 +4034,7 @@ fi
 
 
 
-TARGETVER=svn-20201215
+TARGETVER=svn-20210101
 
 SVNVER=`grep 'ENTITY version ' ${bookdir}/general.ent | sed -e 's/^<!ENTITY version         \"//' -e 's/\">$//' | tr 'A-Z' 'a-z'`
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the original XML version" >&5

diff --git a/lfsbook/src/appendices/dependencies.ch b/lfsbook/src/appendices/dependencies.ch
index 01c6348..1125dba 100644 (file)
--- a/lfsbook/src/appendices/dependencies.ch
+++ b/lfsbook/src/appendices/dependencies.ch
@@ -331,9 +331,9 @@
 
 %----------------------------------------------------------------------
 @x DejaGNU
-         <seg>Bash, Coreutils, Diffutils, GCC, Grep, Make, and Sed</seg>
+         <seg>Bash, Coreutils, Diffutils, GCC, Grep, Make, Sed, and Texinfo</seg>
 @y
-         <seg>Bash, Coreutils, Diffutils, GCC, Grep, Make, Sed</seg>
+         <seg>Bash, Coreutils, Diffutils, GCC, Grep, Make, Sed, Texinfo</seg>
 @z
 @x
           <seg>None</seg>

diff --git a/lfsbook/src/chapter01/changelog.ch b/lfsbook/src/chapter01/changelog.ch
index aa547d5..8d1ca1d 100644 (file)
--- a/lfsbook/src/chapter01/changelog.ch
+++ b/lfsbook/src/chapter01/changelog.ch
@@ -54,6 +54,86 @@
 @z
 
 @x
+      <para>2021-01-01</para>
+        <listitem>
+          <para>[bdubbs] - Update to vim-8.2.2253. Addresses
+          <ulink url="&lfs-ticket-root;4500">#4500</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to iana-etc-20201229. Addresses
+          <ulink url="&lfs-ticket-root;4722">#4722</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to gdbm-1.19. Fixes
+          <ulink url="&lfs-ticket-root;4779">#4779</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to tzdata-2020f. Fixes
+          <ulink url="&lfs-ticket-root;4777">#4777</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to man-pages-5.10. Fixes
+          <ulink url="&lfs-ticket-root;4776">#4776</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to iproute2-5.10.0. Fixes
+          <ulink url="&lfs-ticket-root;4775">#4775</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to zstd-1.4.8. Fixes
+          <ulink url="&lfs-ticket-root;4774">#4774</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to kbd-2.4.0. Fixes
+          <ulink url="&lfs-ticket-root;4773">#4773</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to linux-5.10.4. Fixes
+          <ulink url="&lfs-ticket-root;4772">#4772</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+@y
+      <para>2021-01-01</para>
+        <listitem>
+          <para>[bdubbs] - vim-8.2.2253 へのアップデート。
+          <ulink url="&lfs-ticket-root;4500">#4500</ulink> にて言及。</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - iana-etc-20201229 へのアップデート。
+          <ulink url="&lfs-ticket-root;4722">#4722</ulink> にて言及。</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - gdbm-1.19 へのアップデート。
+          <ulink url="&lfs-ticket-root;4779">#4779</ulink> を Fix に。</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - tzdata-2020f へのアップデート。
+          <ulink url="&lfs-ticket-root;4777">#4777</ulink> を Fix に。</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - man-pages-5.10 へのアップデート。
+          <ulink url="&lfs-ticket-root;4776">#4776</ulink> を Fix に。</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - iproute2-5.10.0 へのアップデート。
+          <ulink url="&lfs-ticket-root;4775">#4775</ulink> を Fix に。</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - zstd-1.4.8 へのアップデート。
+          <ulink url="&lfs-ticket-root;4774">#4774</ulink> を Fix に。</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - kbd-2.4.0 へのアップデート。
+          <ulink url="&lfs-ticket-root;4773">#4773</ulink> を Fix に。</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - linux-5.10.4 へのアップデート。
+          <ulink url="&lfs-ticket-root;4772">#4772</ulink> を Fix に。</para>
+        </listitem>
+      </itemizedlist>
+@z
+
+@x
       <para>2020-12-15</para>
         <listitem>
           <para>[bdubbs] - Update to libcap-2.46. Fixes

diff --git a/lfsbook/src/chapter08/kbd.ch b/lfsbook/src/chapter08/kbd.ch
index 87414ad..8841978 100644 (file)
--- a/lfsbook/src/chapter08/kbd.ch
+++ b/lfsbook/src/chapter08/kbd.ch
@@ -115,14 +115,6 @@
 @z
 
 @x
-    <para>Remove an internal library installed unintentionally:</para>
-@y
-    <para>
-    意図せずインストールされてしまう内部ライブラリを削除します。
-    </para>
-@z
-
-@x
       <para>For some languages (e.g., Belarusian) the Kbd package doesn't
       provide a useful keymap where the stock <quote>by</quote> keymap assumes
       the ISO-8859-5 encoding, and the CP1251 keymap is normally used. Users of

diff --git a/lfsbook/src/chapter08/zstd.ch b/lfsbook/src/chapter08/zstd.ch
index 029e135..32fa3d2 100644 (file)
--- a/lfsbook/src/chapter08/zstd.ch
+++ b/lfsbook/src/chapter08/zstd.ch
@@ -37,9 +37,11 @@
 @z
 
 @x
-    <para>This package does not come with a test suite.</para>
+    <para>To test the results, issue:</para>
 @y
-    <para>&NotExistTestsuite;</para>
+    <para>
+    ビルド結果をテストするには以下を実行します。
+    </para>
 @z
 
 @x

diff --git a/lfsbook/src/general.ch b/lfsbook/src/general.ch
index cb151c0..c116e87 100644 (file)
--- a/lfsbook/src/general.ch
+++ b/lfsbook/src/general.ch
@@ -8,24 +8,24 @@
 % $Date::                           $
 %
 @x
-<!ENTITY version         "SVN-20201215">
+<!ENTITY version         "SVN-20210101">
 @y
 <?xml version="1.0" encoding="UTF-8"?>
-<!ENTITY version         "SVN-20201215">
+<!ENTITY version         "SVN-20210101">
 @z
 
 @x
-<!ENTITY versiond        "20201215-systemd">
+<!ENTITY versiond        "20210101-systemd">
 @y
-<!ENTITY versiond        "20201215-systemd">
+<!ENTITY versiond        "20210101-systemd">
 @z
 
 @x
-<!ENTITY releasedate     "December 15th, 2020">
+<!ENTITY releasedate     "January 1st, 2021">
 @y
-<!ENTITY releasedate     "2020/12/15">
-<!ENTITY jversion        "20201215">
-<!ENTITY jversiond       "20201215">
+<!ENTITY releasedate     "2021/01/01">
+<!ENTITY jversion        "20210101">
+<!ENTITY jversiond       "20210101">
 <!ENTITY dir-jversion    "svn-ja">
 <!ENTITY dir-jversiond   "svn-sysdja">
 @z

diff --git a/lfsbook/version.ac b/lfsbook/version.ac
index 62cd5da..96617b1 100644 (file)
--- a/lfsbook/version.ac
+++ b/lfsbook/version.ac
@@ -6,5 +6,5 @@ dnl  $Rev$
 dnl  $Date::                           $
 dnl
 dnl m4-include this file to define the current LFS version
-m4_define([lfs_version], [svn-20201215])
-m4_define([lfsd_version], [20201215-systemd])
+m4_define([lfs_version], [svn-20210101])
+m4_define([lfsd_version], [20210101-systemd])