[LFS-SVN] SVN-20191212, チェンジセット 11708-11710 対応。

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

diff --git a/lfsbook/configure b/lfsbook/configure
index d5fff2e..1ead351 100755 (executable)
--- a/lfsbook/configure
+++ b/lfsbook/configure
@@ -4034,7 +4034,7 @@ fi
 
 
 
-TARGETVER=svn-20191206
+TARGETVER=svn-20191212
 
 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/chapter01/changelog.ch b/lfsbook/src/chapter01/changelog.ch
index e53063b..051c7db 100644 (file)
--- a/lfsbook/src/chapter01/changelog.ch
+++ b/lfsbook/src/chapter01/changelog.ch
@@ -54,6 +54,49 @@
 @z
 
 @x
+      <para>2019-12-12</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to libcap-2.28. Fixes
+          <ulink url="&lfs-ticket-root;4559">#4559</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to bison-3.5. Fixes
+          <ulink url="&lfs-ticket-root;4561">#4561</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+@y
+      <para>2019-12-12</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - libcap-2.28 へのアップデート。
+          <ulink url="&lfs-ticket-root;4559">#4559</ulink> を Fix に。</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - bison-3.5 へのアップデート。
+          <ulink url="&lfs-ticket-root;4561">#4561</ulink> を Fix に。</para>
+        </listitem>
+      </itemizedlist>
+@z
+
+@x
+      <para>2019-12-10</para>
+      <itemizedlist>
+        <listitem>
+          <para>[renodr] - Fix a regression in meson that was causing problems
+          in dependent packages.</para>
+        </listitem>
+      </itemizedlist>
+@y
+      <para>2019-12-10</para>
+      <itemizedlist>
+        <listitem>
+          <para>[renodr] - meson において依存パッケージに問題を引き起こす不備を修正。</para>
+        </listitem>
+      </itemizedlist>
+@z
+
+@x
       <para>2019-12-05</para>
       <itemizedlist>
         <listitem revision="systemd">

diff --git a/lfsbook/src/chapter01/jchangelog.ch b/lfsbook/src/chapter01/jchangelog.ch
index 03c3f31..922428e 100644 (file)
--- a/lfsbook/src/chapter01/jchangelog.ch
+++ b/lfsbook/src/chapter01/jchangelog.ch
@@ -60,6 +60,22 @@
 -->
 
    <listitem>
+      <para>2019-12-14</para>
+      <itemizedlist>
+        <listitem>
+          <para>[matsuand] -
+          <phrase revision="sysv">SVN-20191212</phrase>
+          <phrase revision="systemd">20191212-systemd</phrase>,
+          チェンジセット
+          <ulink url="&lfs-rev-root;11708">11708</ulink> ～
+          <ulink url="&lfs-rev-root;11710">11710</ulink>
+          対応。
+          </para>
+        </listitem>
+      </itemizedlist>
+   </listitem>
+
+   <listitem>
       <para>2019-12-06</para>
       <itemizedlist>
         <listitem>

diff --git a/lfsbook/src/chapter06/bison.ch b/lfsbook/src/chapter06/bison.ch
index 18f581c..3e3c4a6 100644 (file)
--- a/lfsbook/src/chapter06/bison.ch
+++ b/lfsbook/src/chapter06/bison.ch
@@ -50,6 +50,14 @@
 @z
 
 @x
+    <para>Compile the package:</para>
+@y
+    <para>
+    &CompileThePackage;
+    </para>
+@z
+
+@x
     <para>To test the results (about 2.2 SBU), issue:</para>
 @y
     <para>コンパイル結果をテストするなら以下を実行します。(約 2.2 SBU)</para>

diff --git a/lfsbook/src/chapter06/meson.ch b/lfsbook/src/chapter06/meson.ch
index fb51450..f5e6960 100644 (file)
--- a/lfsbook/src/chapter06/meson.ch
+++ b/lfsbook/src/chapter06/meson.ch
@@ -29,13 +29,13 @@
     <title>&InstallationOf1;Meson&InstallationOf2;</title>
 @z
 
-% @x
-%     <para>Make a fix from upstream:</para>
-% @y
-%     <para>
-%     アップストリームによる修正を行います。
-%     </para>
-% @z
+@x
+    <para>Apply a fix from upstream to fix a regression:</para>
+@y
+    <para>
+    アップストリームによる修正により不備を修正します。
+    </para>
+@z
 
 @x
     <para>Compile Meson with the following command:</para>

diff --git a/lfsbook/src/general.ch b/lfsbook/src/general.ch
index c09ad52..9dceaf4 100644 (file)
--- a/lfsbook/src/general.ch
+++ b/lfsbook/src/general.ch
@@ -8,24 +8,24 @@
 % $Date::                           $
 %
 @x
-<!ENTITY version         "SVN-20191205">
+<!ENTITY version         "SVN-20191212">
 @y
 <?xml version="1.0" encoding="UTF-8"?>
-<!ENTITY version         "SVN-20191205">
+<!ENTITY version         "SVN-20191212">
 @z
 
 @x
-<!ENTITY versiond        "20191205-systemd">
+<!ENTITY versiond        "20191212-systemd">
 @y
-<!ENTITY versiond        "20191205-systemd">
+<!ENTITY versiond        "20191212-systemd">
 @z
 
 @x
-<!ENTITY releasedate     "December 5th, 2019">
+<!ENTITY releasedate     "December 12th, 2019">
 @y
-<!ENTITY releasedate     "2019/12/05">
-<!ENTITY jversion        "20191206">
-<!ENTITY jversiond       "20191206">
+<!ENTITY releasedate     "2019/12/12">
+<!ENTITY jversion        "20191214">
+<!ENTITY jversiond       "20191214">
 <!ENTITY dir-jversion    "svn-ja">
 <!ENTITY dir-jversiond   "svn-sysdja">
 @z

diff --git a/lfsbook/version.ac b/lfsbook/version.ac
index 8ddb780..41d0d0a 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-20191206])
-m4_define([lfsd_version], [20191206-systemd])
+m4_define([lfs_version], [svn-20191212])
+m4_define([lfsd_version], [20191212-systemd])