• R/O
  • SSH
  • HTTPS

lfsbookja: コミット


コミットメタ情報

リビジョン1197 (tree)
日時2018-04-22 09:38:52
作者matsuand

ログメッセージ

[LFS-SVN] SVN-20180420, チェンジセット 11400-11404 対応。

変更サマリ

差分

--- trunk/lfsbook/src/general.ch (revision 1196)
+++ trunk/lfsbook/src/general.ch (revision 1197)
@@ -8,24 +8,24 @@
88 % $Date:: $
99 %
1010 @x
11-<!ENTITY version "SVN-20180411">
11+<!ENTITY version "SVN-20180420">
1212 @y
1313 <?xml version="1.0" encoding="UTF-8"?>
14-<!ENTITY version "SVN-20180411">
14+<!ENTITY version "SVN-20180420">
1515 @z
1616
1717 @x
18-<!ENTITY versiond "20180406-systemd">
18+<!ENTITY versiond "20180420-systemd">
1919 @y
20-<!ENTITY versiond "20180411-systemd">
20+<!ENTITY versiond "20180420-systemd">
2121 @z
2222
2323 @x
24-<!ENTITY releasedate "April 11, 2018">
24+<!ENTITY releasedate "April 20, 2018">
2525 @y
26-<!ENTITY releasedate "2018年4月11日">
27-<!ENTITY jversion "20180412">
28-<!ENTITY jversiond "20180412">
26+<!ENTITY releasedate "2018年4月20日">
27+<!ENTITY jversion "20180422">
28+<!ENTITY jversiond "20180422">
2929 <!ENTITY dir-jversion "svn-ja">
3030 <!ENTITY dir-jversiond "svn-sysdja">
3131 @z
--- trunk/lfsbook/src/chapter01/jchangelog.ch (revision 1196)
+++ trunk/lfsbook/src/chapter01/jchangelog.ch (revision 1197)
@@ -60,15 +60,15 @@
6060 -->
6161
6262 <listitem>
63- <para>2018-04-07</para>
63+ <para>2018-04-22</para>
6464 <itemizedlist>
6565 <listitem>
6666 <para>[matsuand] -
67- <phrase revision="sysv">SVN-20180406</phrase>
68- <phrase revision="systemd">20180406-systemd</phrase>,
67+ <phrase revision="sysv">SVN-20180420</phrase>
68+ <phrase revision="systemd">20180420-systemd</phrase>,
6969 チェンジセット
70- <ulink url="&lfs-rev-root;11395">11395</ulink> ~
71- <ulink url="&lfs-rev-root;11397">11397</ulink>
70+ <ulink url="&lfs-rev-root;11400">11400</ulink> ~
71+ <ulink url="&lfs-rev-root;11404">11404</ulink>
7272 対応。
7373 </para>
7474 </listitem>
@@ -92,6 +92,22 @@
9292 </listitem>
9393
9494 <listitem>
95+ <para>2018-04-07</para>
96+ <itemizedlist>
97+ <listitem>
98+ <para>[matsuand] -
99+ <phrase revision="sysv">SVN-20180406</phrase>
100+ <phrase revision="systemd">20180406-systemd</phrase>,
101+ チェンジセット
102+ <ulink url="&lfs-rev-root;11395">11395</ulink> ~
103+ <ulink url="&lfs-rev-root;11397">11397</ulink>
104+ 対応。
105+ </para>
106+ </listitem>
107+ </itemizedlist>
108+ </listitem>
109+
110+ <listitem>
95111 <para>2018-03-31</para>
96112 <itemizedlist>
97113 <listitem>
--- trunk/lfsbook/src/chapter01/changelog.ch (revision 1196)
+++ trunk/lfsbook/src/chapter01/changelog.ch (revision 1197)
@@ -54,6 +54,58 @@
5454 @z
5555
5656 @x
57+ <para>2018-04-20</para>
58+ <itemizedlist>
59+ <listitem>
60+ <para>[bdubbs] - Update to linux-4.16.2. Fixes
61+ <ulink url="&lfs-ticket-root;4258">#4258</ulink>.</para>
62+ </listitem>
63+ <listitem>
64+ <para>[bdubbs] - Update to file-5.33. Fixes
65+ <ulink url="&lfs-ticket-root;4261">#4261</ulink>.</para>
66+ </listitem>
67+ <listitem>
68+ <para>[bdubbs] - Update to perl-5.26.2. Fixes
69+ <ulink url="&lfs-ticket-root;4260">#4260</ulink>.</para>
70+ </listitem>
71+ </itemizedlist>
72+@y
73+ <para>2018-04-20</para>
74+ <itemizedlist>
75+ <listitem>
76+ <para>[bdubbs] - linux-4.16.2 へのアップデート。
77+ <ulink url="&lfs-ticket-root;4258">#4258</ulink> を Fix に。</para>
78+ </listitem>
79+ <listitem>
80+ <para>[bdubbs] - file-5.33 へのアップデート。
81+ <ulink url="&lfs-ticket-root;4261">#4261</ulink> を Fix に。</para>
82+ </listitem>
83+ <listitem>
84+ <para>[bdubbs] - perl-5.26.2 へのアップデート。
85+ <ulink url="&lfs-ticket-root;4260">#4260</ulink> を Fix に。</para>
86+ </listitem>
87+ </itemizedlist>
88+@z
89+
90+@x
91+ <para>2018-04-16</para>
92+ <itemizedlist>
93+ <listitem>
94+ <para>[bdubbs] - Fix man pages and descriptions in meson.
95+ Thanks to Xi Ruoyao for the patch.</para>
96+ </listitem>
97+ </itemizedlist>
98+@y
99+ <para>2018-04-16</para>
100+ <itemizedlist>
101+ <listitem>
102+ <para>[bdubbs] - meson の man ページと説明を改正。
103+ パッチを提供してくれた Xi Ruoyao に感謝。</para>
104+ </listitem>
105+ </itemizedlist>
106+@z
107+
108+@x
57109 <para>2018-04-11</para>
58110 <itemizedlist>
59111 <listitem>
--- trunk/lfsbook/src/chapter06/attr.ch (revision 1196)
+++ trunk/lfsbook/src/chapter06/attr.ch (revision 1197)
@@ -155,9 +155,9 @@
155155 @z
156156
157157 @x libattr
158- <para>Contains the libbrary functions for manipulating extended attributes</para>
158+ <para>Contains the library functions for manipulating extended attributes</para>
159159 @y
160160 <para>
161161 拡張属性を制御するライブラリ関数を提供します。
162162 </para>
163-@z
163+@z
\ No newline at end of file
--- trunk/lfsbook/src/chapter06/pkgmgt.ch (revision 1196)
+++ trunk/lfsbook/src/chapter06/pkgmgt.ch (revision 1197)
@@ -106,7 +106,7 @@
106106
107107 @x
108108 <para>If Glibc needs to be upgraded to a newer version, (e.g. from
109- glibc-2.19 to glibc-2.20, it is safer to rebuild LFS. Though you
109+ glibc-2.19 to glibc-2.20), it is safer to rebuild LFS. Though you
110110 <emphasis>may</emphasis> be able to rebuild all the packages in their
111111 dependency order, we do not recommend it. </para>
112112 @y
--- trunk/lfsbook/src/chapter06/meson.ch (revision 1196)
+++ trunk/lfsbook/src/chapter06/meson.ch (revision 1197)
@@ -54,6 +54,14 @@
5454 @z
5555
5656 @x
57+ <para>At last, move Meson man pages to correct location:</para>
58+@y
59+ <para>
60+ 最後に Meson の man ページを適切なディレクトリに移動します。
61+ </para>
62+@z
63+
64+@x
5765 <title>Contents of Meson</title>
5866 @y
5967 <title>&ContentsOf1;Meson&ContentsOf2;</title>
@@ -60,19 +68,19 @@
6068 @z
6169
6270 @x
63- <segtitle>Installed Libraries</segtitle>
71+ <segtitle>Installed programs</segtitle>
6472 <segtitle>Installed directory</segtitle>
6573 @y
66- <segtitle>&InstalledLibrary;</segtitle>
74+ <segtitle>&InstalledProgram;</segtitle>
6775 <segtitle>&InstalledDirectory;</segtitle>
6876 @z
6977
7078 @x
71- <seg>libmeson.so</seg>
72- <seg>/usr/share/doc/meson-&meson-version;</seg>
79+ <seg>meson, mesonconf, mesonintrospect, mesontest, and wraptool</seg>
80+ <seg>/usr/lib/python3.6/site-packages/meson-&meson-version;-py3.6.egg</seg>
7381 @y
74- <seg>libmeson.so</seg>
75- <seg>/usr/share/doc/meson-&meson-version;</seg>
82+ <seg>meson, mesonconf, mesonintrospect, mesontest, wraptool</seg>
83+ <seg>/usr/lib/python3.6/site-packages/meson-&meson-version;-py3.6.egg</seg>
7684 @z
7785
7886 @x
@@ -81,10 +89,34 @@
8189 <bridgehead renderas="sect3">&ShortDescriptions;</bridgehead>
8290 @z
8391
84-@x libmeson
85- <para>Contains multiple-precision math functions</para>
92+@x meson
93+ <para>A high productivity build system</para>
8694 @y
8795 <para>
88- 倍精度演算(multiple precision) の関数を提供します。
96+ 生産性の高いビルドシステム。
8997 </para>
98+@z
99+
100+@x mesonconf
101+ <para>A tool to configure Meson builds</para>
102+@y
103+ <para>
104+ Meson ビルドを設定するツール。
105+ </para>
106+@z
107+
108+@x mesonintrospect
109+ <para>A tool to extract information about a Meson build</para>
110+@y
111+ <para>
112+ Meson ビルドの情報を抽出するツール。
113+ </para>
114+@z
115+
116+@x wraptool
117+ <para>Test tool for the Meson build system</para>
118+@y
119+ <para>
120+ Meson ビルドシステム用のテストツール。
121+ </para>
90122 @z
\ No newline at end of file
--- trunk/lfsbook/src/chapter06/flex.ch (revision 1196)
+++ trunk/lfsbook/src/chapter06/flex.ch (revision 1197)
@@ -102,11 +102,11 @@
102102
103103 @x
104104 <seg>flex, flex++ (link to flex), and lex (link to flex)</seg>
105- <seg>libfl.so and libfl_pic.so</seg>
105+ <seg>libfl.so</seg>
106106 <seg>/usr/share/doc/flex-&flex-version;</seg>
107107 @y
108108 <seg>flex, flex++ (flex へのリンク), lex (flex へのリンク)</seg>
109- <seg>libfl.so, libfl_pic.so</seg>
109+ <seg>libfl.so</seg>
110110 <seg>/usr/share/doc/flex-&flex-version;</seg>
111111 @z
112112
@@ -140,11 +140,11 @@
140140 @z
141141
142142 @x lex
143- <para>A script that runs <command>flex</command> in
143+ <para>A symbolic link that runs <command>flex</command> in
144144 <command>lex</command> emulation mode</para>
145145 @y
146146 <para>
147- <command>lex</command> のエミュレーションモードとして <command>flex</command> を実行するスクリプト。
147+ <command>lex</command> のエミュレーションモードとして <command>flex</command> を実行するシンボリックリンク。
148148 </para>
149149 @z
150150
--- trunk/lfsbook/src/appendices/dependencies.ch (revision 1196)
+++ trunk/lfsbook/src/appendices/dependencies.ch (revision 1197)
@@ -101,6 +101,11 @@
101101 <seg>Automake, Diffutils, Findutils, Libtool</seg>
102102 @z
103103 @x
104+ <seg>Coreutils, Sed, Tar, and Vim</seg>
105+@y
106+ <seg>Coreutils, Sed, Tar, Vim</seg>
107+@z
108+@x
104109 <seg>None</seg>
105110 @y
106111 <seg>なし</seg>
@@ -120,6 +125,11 @@
120125 <seg>Automake, Diffutils, Findutils, Libtool</seg>
121126 @z
122127 @x
128+ <seg>Acl and Libcap</seg>
129+@y
130+ <seg>Acl, Libcap</seg>
131+@z
132+@x
123133 <seg>None</seg>
124134 @y
125135 <seg>なし</seg>
@@ -147,12 +157,10 @@
147157 @z
148158 @x
149159 <seg>Binutils, Bison, Bzip2, DejaGNU, Diffutils, Expect, Findutils,
150- Flex, GCC, Gettext, Gzip, Libtool, and Tar.</seg>
160+ Flex, GCC, Gettext, Gzip, Libtool, and Tar</seg>
151161 @y
152- <seg>
153- Binutils, Bison, Bzip2, DejaGNU, Diffutils, Expect, Findutils,
154- Flex, GCC, Gettext, Gzip, Libtool, Tar
155- </seg>
162+ <seg>Binutils, Bison, Bzip2, DejaGNU, Diffutils, Expect, Findutils,
163+ Flex, GCC, Gettext, Gzip, Libtool, Tar</seg>
156164 @z
157165 @x
158166 <seg>None</seg>
@@ -205,11 +213,11 @@
205213
206214 %----------------------------------------------------------------------
207215 @x binutils
208- <seg>Bash, Binutils, Coreutils, Diffutils, File, Gawk, GCC, Glibc, Grep,
209- Make, Perl, Sed, Texinfo and Zlib</seg>
216+ <seg>Bash, Binutils, Coreutils, Diffutils, File, Gawk, GCC, Glibc,
217+ Grep, Make, Perl, Sed, Texinfo and Zlib</seg>
210218 @y
211- <seg>Bash, Binutils, Coreutils, Diffutils, File, Gawk, GCC, Glibc, Grep,
212- Make, Perl, Sed, Texinfo, Zlib</seg>
219+ <seg>Bash, Binutils, Coreutils, Diffutils, File, Gawk, GCC, Glibc,
220+ Grep, Make, Perl, Sed, Texinfo, Zlib</seg>
213221 @z
214222 @x
215223 <seg>DejaGNU and Expect</seg>
@@ -311,9 +319,9 @@
311319 <seg>Diffutils, E2fsprogs, Findutils, Shadow, Util-linux</seg>
312320 @z
313321 @x
314- <seg>Bash, Diffutils, Findutils, Man-DB, and Eudev</seg>
322+ <seg>Bash, Diffutils, Eudev, Findutils, and Man-DB</seg>
315323 @y
316- <seg>Bash, Diffutils, Findutils, Man-DB, Eudev</seg>
324+ <seg>Bash, Diffutils, Eudev, Findutils, Man-DB</seg>
317325 @z
318326 @x
319327 <seg>Perl Expect and IO:Tty modules (for test suite)</seg>
@@ -352,9 +360,9 @@
352360 Make, Sed, Texinfo</seg>
353361 @z
354362 @x
355- <seg>Diffutils, Perl</seg>
363+ <seg>Perl</seg>
356364 @y
357- <seg>Diffutils, Perl</seg>
365+ <seg>Perl</seg>
358366 @z
359367 @x
360368 <seg>None</seg>
@@ -443,9 +451,9 @@
443451 Gzip, Make, Sed, Texinfo, Util-linux</seg>
444452 @z
445453 @x
446- <seg>Procps-ng,Psmisc</seg>
454+ <seg>Procps-ng and Psmisc</seg>
447455 @y
448- <seg>Procps-ng,Psmisc</seg>
456+ <seg>Procps-ng, Psmisc</seg>
449457 @z
450458 @x
451459 <seg>None</seg>
@@ -533,7 +541,7 @@
533541 %----------------------------------------------------------------------
534542 @x Gawk
535543 <seg>Bash, Binutils, Coreutils, GCC, Gettext, Glibc, GMP, Grep, Make,
536- MPFR, Patch, Readline, Sed and Texinfo</seg>
544+ MPFR, Patch, Readline, Sed, and Texinfo</seg>
537545 @y
538546 <seg>Bash, Binutils, Coreutils, GCC, Gettext, Glibc, GMP, Grep, Make,
539547 MPFR, Patch, Readline, Sed, Texinfo</seg>
@@ -576,7 +584,7 @@
576584 @z
577585 @x
578586 <seg><ulink url="http://gcc.gnu.org/wiki/Graphite">CLooG-PPL</ulink>,
579- <ulink url="http://gcc.gnu.org/wiki/GNAT">GNAT</ulink> and
587+ <ulink url="http://gcc.gnu.org/wiki/GNAT">GNAT</ulink>, and
580588 <ulink url="http://gcc.gnu.org/wiki/Graphite">PPL</ulink></seg>
581589 @y
582590 <seg><ulink url="http://gcc.gnu.org/wiki/Graphite">CLooG-PPL</ulink>,
@@ -586,9 +594,11 @@
586594
587595 %----------------------------------------------------------------------
588596 @x GDBM
589- <seg>Bash, Binutils, Coreutils, Diffutils, GCC, Grep, Make, and Sed</seg>
597+ <seg>Bash, Binutils, Coreutils, Diffutils, GCC, Grep, Make,
598+ and Sed</seg>
590599 @y
591- <seg>Bash, Binutils, Coreutils, Diffutils, GCC, Grep, Make, Sed</seg>
600+ <seg>Bash, Binutils, Coreutils, Diffutils, GCC, Grep, Make,
601+ Sed</seg>
592602 @z
593603 @x
594604 <seg>None</seg>
@@ -656,11 +666,11 @@
656666
657667 %----------------------------------------------------------------------
658668 @x GMP
659- <seg>Bash, Binutils, Coreutils, Diffutils, Gawk, GCC, Glibc, Grep, M4, Make,
660- Sed and Texinfo</seg>
669+ <seg>Bash, Binutils, Coreutils, Diffutils, Gawk, GCC, Glibc, Grep,
670+ M4, Make, Sed, and Texinfo</seg>
661671 @y
662- <seg>Bash, Binutils, Coreutils, Diffutils, Gawk, GCC, Glibc, Grep, M4, Make,
663- Sed, Texinfo</seg>
672+ <seg>Bash, Binutils, Coreutils, Diffutils, Gawk, GCC, Glibc, Grep,
673+ M4, Make, Sed, Texinfo</seg>
664674 @z
665675 @x
666676 <seg>None</seg>
@@ -668,7 +678,7 @@
668678 <seg>なし</seg>
669679 @z
670680 @x
671- <seg>MPFR, GCC</seg>
681+ <seg>MPFR and GCC</seg>
672682 @y
673683 <seg>MPFR, GCC</seg>
674684 @z
@@ -679,12 +689,17 @@
679689 @z
680690
681691 %----------------------------------------------------------------------
682-@x gperf
683- <seg>Bash, Binutils, Coreutils, GCC, Glibc, Make</seg>
692+@x Gperf
693+ <seg>Bash, Binutils, Coreutils, GCC, Glibc, and Make</seg>
684694 @y
685695 <seg>Bash, Binutils, Coreutils, GCC, Glibc, Make</seg>
686696 @z
687697 @x
698+ <seg>Diffutils and Expect</seg>
699+@y
700+ <seg>Diffutils, Expect</seg>
701+@z
702+@x
688703 <seg>None</seg>
689704 @y
690705 <seg>なし</seg>
@@ -771,7 +786,7 @@
771786 Sed, Texinfo</seg>
772787 @z
773788 @x
774- <seg>Diffutils, Less</seg>
789+ <seg>Diffutils and Less</seg>
775790 @y
776791 <seg>Diffutils, Less</seg>
777792 @z
@@ -900,7 +915,7 @@
900915 %----------------------------------------------------------------------
901916 @x Kmod
902917 <seg>Bash, Binutils, Bison, Coreutils, Flex, GCC, Gettext, Glibc,
903- Gzip, Make, Sed, Xz-Utils, Zlib</seg>
918+ Gzip, Make, Sed, Xz-Utils, and Zlib</seg>
904919 @y
905920 <seg>Bash, Binutils, Bison, Coreutils, Flex, GCC, Gettext, Glibc,
906921 Gzip, Make, Sed, Xz-Utils, Zlib</seg>
@@ -942,9 +957,11 @@
942957
943958 %----------------------------------------------------------------------
944959 @x Libcap
945- <seg>Attr, Bash, Binutils, Coreutils, GCC, Glibc, Perl, Make, and Sed</seg>
960+ <seg>Attr, Bash, Binutils, Coreutils, GCC, Glibc, Perl, Make,
961+ and Sed</seg>
946962 @y
947- <seg>Attr, Bash, Binutils, Coreutils, GCC, Glibc, Perl, Make, Sed</seg>
963+ <seg>Attr, Bash, Binutils, Coreutils, GCC, Glibc, Perl, Make,
964+ Sed</seg>
948965 @z
949966 @x
950967 <seg>No test suite available</seg>
@@ -1002,7 +1019,7 @@
10021019 Make, Sed, Texinfo</seg>
10031020 @z
10041021 @x
1005- <seg>Autoconf, Automake, Findutils</seg>
1022+ <seg>Autoconf, Automake, and Findutils</seg>
10061023 @y
10071024 <seg>Autoconf, Automake, Findutils</seg>
10081025 @z
@@ -1019,11 +1036,11 @@
10191036
10201037 %----------------------------------------------------------------------
10211038 @x Linux Kernel
1022- <seg>Bash, Bc, Binutils, Coreutils, Diffutils, Findutils, GCC, Glibc, Grep,
1023- Gzip, Kmod, Make, Ncurses, OpenSSL, Perl, and Sed</seg>
1039+ <seg>Bash, Bc, Binutils, Coreutils, Diffutils, Findutils, GCC, Glibc,
1040+ Grep, Gzip, Kmod, Make, Ncurses, OpenSSL, Perl, and Sed</seg>
10241041 @y
1025- <seg>Bash, Bc, Binutils, Coreutils, Diffutils, Findutils, GCC, Glibc, Grep,
1026- Gzip, Kmod, Make, Ncurses, OpenSSL, Perl, Sed</seg>
1042+ <seg>Bash, Bc, Binutils, Coreutils, Diffutils, Findutils, GCC, Glibc,
1043+ Grep, Gzip, Kmod, Make, Ncurses, OpenSSL, Perl, Sed</seg>
10271044 @z
10281045 @x
10291046 <seg>No test suite available</seg>
@@ -1163,7 +1180,7 @@
11631180 %----------------------------------------------------------------------
11641181 @x MPC
11651182 <seg>Bash, Binutils, Coreutils, Diffutils, Gawk, GCC, Glibc, Grep, GMP,
1166- Make, MPFR, Sed and Texinfo</seg>
1183+ Make, MPFR, Sed, and Texinfo</seg>
11671184 @y
11681185 <seg>Bash, Binutils, Coreutils, Diffutils, Gawk, GCC, Glibc, Grep, GMP,
11691186 Make, MPFR, Sed, Texinfo</seg>
@@ -1187,7 +1204,7 @@
11871204 %----------------------------------------------------------------------
11881205 @x MPFR
11891206 <seg>Bash, Binutils, Coreutils, Diffutils, Gawk, GCC, Glibc, Grep, GMP,
1190- Make, Sed and Texinfo</seg>
1207+ Make, Sed, and Texinfo</seg>
11911208 @y
11921209 <seg>Bash, Binutils, Coreutils, Diffutils, Gawk, GCC, Glibc, Grep, GMP,
11931210 Make, Sed, Texinfo</seg>
@@ -1198,7 +1215,7 @@
11981215 <seg>なし</seg>
11991216 @z
12001217 @x
1201- <seg>Gawk, GCC</seg>
1218+ <seg>Gawk and GCC</seg>
12021219 @y
12031220 <seg>Gawk, GCC</seg>
12041221 @z
@@ -1222,11 +1239,11 @@
12221239 <seg>テストスイートはありません</seg>
12231240 @z
12241241 @x
1225- <seg>Bash, GRUB, Inetutils, Less, Procps-ng, Psmisc, Readline, Texinfo,
1226- Util-linux, and Vim</seg>
1242+ <seg>Bash, GRUB, Inetutils, Less, Procps-ng, Psmisc, Readline,
1243+ Texinfo, Util-linux, and Vim</seg>
12271244 @y
1228- <seg>Bash, GRUB, Inetutils, Less, Procps-ng, Psmisc, Readline, Texinfo,
1229- Util-linux, Vim</seg>
1245+ <seg>Bash, GRUB, Inetutils, Less, Procps-ng, Psmisc, Readline,
1246+ Texinfo, Util-linux, Vim</seg>
12301247 @z
12311248 @x
12321249 <seg>None</seg>
@@ -1241,7 +1258,7 @@
12411258 <!-- Begin Ninja dependency info -->
12421259 @z
12431260 @x
1244- <seg>Binutils, Coreutils, Gcc, Python</seg>
1261+ <seg>Binutils, Coreutils, Gcc, and Python</seg>
12451262 @y
12461263 <seg>Binutils, Coreutils, Gcc, Python</seg>
12471264 @z
@@ -1257,7 +1274,7 @@
12571274 @z
12581275 %----------------------------------------------------------------------
12591276 @x Openssl
1260- <seg>Binutils, Coreutils, Gcc, Make, Perl</seg>
1277+ <seg>Binutils, Coreutils, Gcc, Make, and Perl</seg>
12611278 @y
12621279 <seg>Binutils, Coreutils, Gcc, Make, Perl</seg>
12631280 @z
@@ -1343,7 +1360,7 @@
13431360
13441361 %----------------------------------------------------------------------
13451362 @x Popt
1346- <seg>Bash, Binutils, Coreutils, Gawk, GCC, Glibc, Grep, Make</seg>
1363+ <seg>Bash, Binutils, Coreutils, Gawk, GCC, Glibc, Grep, and Make</seg>
13471364 @y
13481365 <seg>Bash, Binutils, Coreutils, Gawk, GCC, Glibc, Grep, Make</seg>
13491366 @z
@@ -1382,11 +1399,11 @@
13821399
13831400 %----------------------------------------------------------------------
13841401 @x Psmisc
1385- <seg>Bash, Binutils, Coreutils, GCC, Gettext, Glibc, Grep, Make, Ncurses,
1386- and Sed</seg>
1402+ <seg>Bash, Binutils, Coreutils, GCC, Gettext, Glibc, Grep, Make,
1403+ Ncurses, and Sed</seg>
13871404 @y
1388- <seg>Bash, Binutils, Coreutils, GCC, Gettext, Glibc, Grep, Make, Ncurses,
1389- Sed</seg>
1405+ <seg>Bash, Binutils, Coreutils, GCC, Gettext, Glibc, Grep, Make,
1406+ Ncurses, Sed</seg>
13901407 @z
13911408 @x
13921409 <seg>No test suite available</seg>
@@ -1447,7 +1464,7 @@
14471464 <seg>テストスイートはありません</seg>
14481465 @z
14491466 @x
1450- <seg>Bash, Gawk</seg>
1467+ <seg>Bash and Gawk</seg>
14511468 @y
14521469 <seg>Bash, Gawk</seg>
14531470 @z
@@ -1500,7 +1517,7 @@
15001517 <seg>Coreutils</seg>
15011518 @z
15021519 @x
1503- <seg>Acl, Attr, Cracklib, PAM</seg>
1520+ <seg>Acl, Attr, Cracklib, and PAM</seg>
15041521 @y
15051522 <seg>Acl, Attr, Cracklib, PAM</seg>
15061523 @z
@@ -1649,11 +1666,11 @@
16491666
16501667 %----------------------------------------------------------------------
16511668 @x Util-linux
1652- <seg>Bash, Binutils, Coreutils, Diffutils, Findutils, Gawk, GCC,
1653- Gettext, Glibc, Grep, Make, Ncurses, Sed, Eudev, and Zlib</seg>
1669+ <seg>Bash, Binutils, Coreutils, Diffutils, Eudev, Findutils, Gawk, GCC,
1670+ Gettext, Glibc, Grep, Make, Ncurses, Sed, and Zlib</seg>
16541671 @y
1655- <seg>Bash, Binutils, Coreutils, Diffutils, Findutils, Gawk, GCC,
1656- Gettext, Glibc, Grep, Make, Ncurses, Sed, Eudev, Zlib</seg>
1672+ <seg>Bash, Binutils, Coreutils, Diffutils, Eudev, Findutils, Gawk, GCC,
1673+ Gettext, Glibc, Grep, Make, Ncurses, Sed, Zlib</seg>
16571674 @z
16581675 @x
16591676 <seg>None</seg>
@@ -1708,8 +1725,8 @@
17081725 @z
17091726
17101727 %----------------------------------------------------------------------
1711-@x Xz
1712- <seg>Bash, Binutils, Coreutils, Diffutils, GCC, Glibc, and Make.</seg>
1728+@x Xz-utils
1729+ <seg>Bash, Binutils, Coreutils, Diffutils, GCC, Glibc, and Make</seg>
17131730 @y
17141731 <seg>Bash, Binutils, Coreutils, Diffutils, GCC, Glibc, Make</seg>
17151732 @z
@@ -1719,9 +1736,9 @@
17191736 <seg>なし</seg>
17201737 @z
17211738 @x
1722- <seg>GRUB, Kmod, Man-DB, Eudev</seg>
1739+ <seg>Eudev, GRUB, Kmod, and Man-DB</seg>
17231740 @y
1724- <seg>GRUB, Kmod, Man-DB, Eudev</seg>
1741+ <seg>Eudev, GRUB, Kmod, Man-DB</seg>
17251742 @z
17261743 @x
17271744 <seg>None</seg>
--- trunk/lfsbook/version.ac (revision 1196)
+++ trunk/lfsbook/version.ac (revision 1197)
@@ -6,5 +6,5 @@
66 dnl $Date:: $
77 dnl
88 dnl m4-include this file to define the current LFS version
9-m4_define([lfs_version], [svn-20180411])
10-m4_define([lfsd_version], [20180411-systemd])
9+m4_define([lfs_version], [svn-20180420])
10+m4_define([lfsd_version], [20180420-systemd])
--- trunk/lfsbook/configure (revision 1196)
+++ trunk/lfsbook/configure (revision 1197)
@@ -4034,7 +4034,7 @@
40344034
40354035
40364036
4037-TARGETVER=svn-20180411
4037+TARGETVER=svn-20180420
40384038
40394039 SVNVER=`grep 'ENTITY version ' ${bookdir}/general.ent | sed -e 's/^<!ENTITY version \"//' -e 's/\">$//' | tr 'A-Z' 'a-z'`
40404040 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the original XML version" >&5
旧リポジトリブラウザで表示