[LFS-SVN] SVN-20200116, チェンジセット 11730 対応。

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

diff --git a/lfsbook/configure b/lfsbook/configure
index 0eaac3e..91e7bb4 100755 (executable)
--- a/lfsbook/configure
+++ b/lfsbook/configure
@@ -4034,7 +4034,7 @@ fi
 
 
 
-TARGETVER=svn-20200113
+TARGETVER=svn-20200116
 
 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 83dd15e..73f5038 100644 (file)
--- a/lfsbook/src/chapter01/changelog.ch
+++ b/lfsbook/src/chapter01/changelog.ch
@@ -54,6 +54,24 @@
 @z
 
 @x
+      <para>2020-01-16</para>
+      <itemizedlist>
+        <listitem>
+          <para>[pierre] - Update to libcap-2.31. Fixes
+          <ulink url="&lfs-ticket-root;4574">#4574</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+@y
+      <para>2020-01-16</para>
+      <itemizedlist>
+        <listitem>
+          <para>[pierre] - libcap-2.31 へのアップデート。
+          <ulink url="&lfs-ticket-root;4574">#4574</ulink> を Fix に。</para>
+        </listitem>
+      </itemizedlist>
+@z
+
+@x
       <para>2020-01-13</para>
       <itemizedlist>
         <listitem>

diff --git a/lfsbook/src/chapter01/jchangelog.ch b/lfsbook/src/chapter01/jchangelog.ch
index 55450de..966b5df 100644 (file)
--- a/lfsbook/src/chapter01/jchangelog.ch
+++ b/lfsbook/src/chapter01/jchangelog.ch
@@ -60,6 +60,21 @@
 -->
 
    <listitem>
+      <para>2020-01-17</para>
+      <itemizedlist>
+        <listitem>
+          <para>[matsuand] -
+          <phrase revision="sysv">SVN-20200116</phrase>
+          <phrase revision="systemd">20200116-systemd</phrase>,
+          チェンジセット
+          <ulink url="&lfs-rev-root;11730">11730</ulink>
+          対応。
+          </para>
+        </listitem>
+      </itemizedlist>
+   </listitem>
+
+   <listitem>
       <para>2020-01-14</para>
       <itemizedlist>
         <listitem>

diff --git a/lfsbook/src/chapter06/libcap.ch b/lfsbook/src/chapter06/libcap.ch
index b002ef1..64ca6d8 100644 (file)
--- a/lfsbook/src/chapter06/libcap.ch
+++ b/lfsbook/src/chapter06/libcap.ch
@@ -32,10 +32,10 @@
 @z
 
 @x
-    <para>Prevent a static library from being installed:</para>
+    <para>Prevent two static libraries from being installed:</para>
 @y
     <para>
-    スタティックライブラリをインストールしないようにします。
+    2 つのスタティックライブラリをインストールしないようにします。
     </para>
 @z
 

diff --git a/lfsbook/src/general.ch b/lfsbook/src/general.ch
index ae76c44..72a6e58 100644 (file)
--- a/lfsbook/src/general.ch
+++ b/lfsbook/src/general.ch
@@ -8,24 +8,24 @@
 % $Date::                           $
 %
 @x
-<!ENTITY version         "SVN-20200113">
+<!ENTITY version         "SVN-20200116">
 @y
 <?xml version="1.0" encoding="UTF-8"?>
-<!ENTITY version         "SVN-20200113">
+<!ENTITY version         "SVN-20200116">
 @z
 
 @x
-<!ENTITY versiond        "20200113-systemd">
+<!ENTITY versiond        "20200116-systemd">
 @y
-<!ENTITY versiond        "20200113-systemd">
+<!ENTITY versiond        "20200116-systemd">
 @z
 
 @x
-<!ENTITY releasedate     "January 13th, 2020">
+<!ENTITY releasedate     "January 16th, 2020">
 @y
-<!ENTITY releasedate     "2020/01/13">
-<!ENTITY jversion        "20200114">
-<!ENTITY jversiond       "20200114">
+<!ENTITY releasedate     "2020/01/16">
+<!ENTITY jversion        "20200117">
+<!ENTITY jversiond       "20200117">
 <!ENTITY dir-jversion    "svn-ja">
 <!ENTITY dir-jversiond   "svn-sysdja">
 @z

diff --git a/lfsbook/version.ac b/lfsbook/version.ac
index 54b356a..a07a6cf 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-20200113])
-m4_define([lfsd_version], [20200113-systemd])
+m4_define([lfs_version], [svn-20200116])
+m4_define([lfsd_version], [20200116-systemd])