[BLFS-SVN] Version 2014-01-01, r12504 対応.

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

diff --git a/blfsbook/configure b/blfsbook/configure
index 7b4fdd1..9e79f1e 100755 (executable)
--- a/blfsbook/configure
+++ b/blfsbook/configure
@@ -4013,7 +4013,7 @@ $as_echo "found" >&6; }
   fi
 
 
-TARGETVER=20131230
+TARGETVER=20140101
 
 ORGDAY=`grep 'ENTITY day' ${bookdir}/general.ent | gawk '{print $3;}' | sed 's/^[^\"]*\"\([0-9]*\)\".*$/\1/'`
 ORGMONTH=`grep 'ENTITY month' ${bookdir}/general.ent | gawk '{print $3;}' | sed 's/^[^\"]*\"\([0-9]*\)\".*$/\1/'`

diff --git a/blfsbook/src/book/bookinfo.ch b/blfsbook/src/book/bookinfo.ch
index 612ce51..23e73c6 100644 (file)
--- a/blfsbook/src/book/bookinfo.ch
+++ b/blfsbook/src/book/bookinfo.ch
@@ -56,6 +56,12 @@
 @z
 
 @x
+      <revremark>Eighth release</revremark>
+@y
+      <revremark>第8次リリース</revremark>
+@z
+
+@x
       <revremark>Seventh release</revremark>
 @y
       <revremark>第7次リリース</revremark>

diff --git a/blfsbook/src/general.ch b/blfsbook/src/general.ch
index 6850a3a..26b843c 100644 (file)
--- a/blfsbook/src/general.ch
+++ b/blfsbook/src/general.ch
@@ -15,11 +15,11 @@
 
 @x
 <!ENTITY version      "&year;-&month;-&day;">
-<!ENTITY releasedate  "December 30th, &year;">
+<!ENTITY releasedate  "January 1st, &year;">
 @y
 <!ENTITY version      "&year;-&month;-&day;">
 <!ENTITY releasedate  "&year;/&month;/&day;">
-<!ENTITY jversion     "20131231">
+<!ENTITY jversion     "20140102">
 <!ENTITY jratio       "55.9 &percnt;">
 @z
 

diff --git a/blfsbook/src/kde/add/grantlee.ch b/blfsbook/src/kde/add/grantlee.ch
index 4fa1217..dcef9da 100644 (file)
--- a/blfsbook/src/kde/add/grantlee.ch
+++ b/blfsbook/src/kde/add/grantlee.ch
@@ -21,9 +21,9 @@
 
 % opening the door for theming. がうまく訳せそうにない・・・
 @x
-       Grantlee is a set of Free Software libraries written using the Qt
-       framework.  Currently two libraries are shipped with Grantlee: Grantlee
-       Templates and Grantlee TextDocument.  The goal of Grantlee Templates is
+       Grantlee is a set of free software libraries written using the Qt
+       framework. Currently two libraries are shipped with Grantlee: Grantlee
+       Templates and Grantlee TextDocument. The goal of Grantlee Templates is
        to make it easier for application developers to separate the structure
        of documents from the data they contain, opening the door for theming.
 @y
@@ -152,7 +152,7 @@
         </seg>
         <seg>
            &kde-dir;/lib/cmake/grantlee, 
-           &kde-dir;/lib/grantlee/0.3, and
+           &kde-dir;/lib/grantlee/0.4, and
            &kde-dir;/include/grantlee</seg>
 @y
         <seg>&None;</seg>
@@ -162,6 +162,6 @@
         </seg>
         <seg>
            &kde-dir;/lib/cmake/grantlee, 
-           &kde-dir;/lib/grantlee/0.3,
+           &kde-dir;/lib/grantlee/0.4,
            &kde-dir;/include/grantlee</seg>
 @z

diff --git a/blfsbook/src/kde/add/okular.ch b/blfsbook/src/kde/add/okular.ch
index 4136440..cce56f5 100644 (file)
--- a/blfsbook/src/kde/add/okular.ch
+++ b/blfsbook/src/kde/add/okular.ch
@@ -125,24 +125,26 @@
 @x
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
+      <xref linkend="libkexiv2"/>,
       <ulink url="https://projects.kde.org/projects/extragear/base/plasma-mobile">ActiveApp</ulink>
       (for developing applications for Plasma Active),
       <ulink url="http://libspectre.freedesktop.org/">libspectre</ulink> (for PostScript support),
       <ulink url="http://www.jedrea.com/chmlib">libchm</ulink>,
-      <ulink url="http://djvu.org/">DjVuLibre</ulink>, and
-      <ulink url="http://sourceforge.net/projects/ebook-tools">libepub</ulink>
-
+      <ulink url="http://djvu.org/">DjVuLibre</ulink>,
+      <ulink url="http://sourceforge.net/projects/ebook-tools">libepub</ulink> and
+      <ulink url="https://projects.kde.org/projects/kde/kdegraphics/kdegraphics-mobipocket">Mobipocket</ulink>
     </para>
 @y
     <bridgehead renderas="sect4">&Optional;</bridgehead>
     <para role="optional">
+      <xref linkend="libkexiv2"/>,
       <ulink url="https://projects.kde.org/projects/extragear/base/plasma-mobile">ActiveApp</ulink>
       (Plasma Active のアプリケーション開発のため),
       <ulink url="http://libspectre.freedesktop.org/">libspectre</ulink> (PostScript サポートのため),
       <ulink url="http://www.jedrea.com/chmlib">libchm</ulink>,
       <ulink url="http://djvu.org/">DjVuLibre</ulink>,
-      <ulink url="http://sourceforge.net/projects/ebook-tools">libepub</ulink>
-
+      <ulink url="http://sourceforge.net/projects/ebook-tools">libepub</ulink>,
+      <ulink url="https://projects.kde.org/projects/kde/kdegraphics/kdegraphics-mobipocket">Mobipocket</ulink>
     </para>
 @z
 

diff --git a/blfsbook/src/networking/netlibs/libtirpc.ch b/blfsbook/src/networking/netlibs/libtirpc.ch
index ad65e09..a93f020 100644 (file)
--- a/blfsbook/src/networking/netlibs/libtirpc.ch
+++ b/blfsbook/src/networking/netlibs/libtirpc.ch
@@ -92,12 +92,12 @@
 @x
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <ulink url="http://www.citi.umich.edu/projects/nfsv4/linux/libgssapi">libgssapi</ulink>
+      <xref linkend="mitkrb"/> for the GSSAPI
     </para>
 @y
     <bridgehead renderas="sect4">&Optional;</bridgehead>
     <para role="optional">
-      <ulink url="http://www.citi.umich.edu/projects/nfsv4/linux/libgssapi">libgssapi</ulink>
+      <xref linkend="mitkrb"/> GSSAPI のために
     </para>
 @z
 
@@ -140,14 +140,12 @@
 
 @x
       <parameter>--disable-gssapi</parameter>: This switch is needed if 
-      <ulink url="http://www.citi.umich.edu/projects/nfsv4/linux/libgssapi">
-      libgssapi</ulink> is not installed. Remove it if libgssapi is installed
-      and you want to use it.
+      no GSSAPI is installed. Remove this switch if you have one
+      installed (for example <xref linkend="mitkrb"/>) and you wish to use it.
 @y
       <parameter>--disable-gssapi</parameter>: This switch is needed if 
-      <ulink url="http://www.citi.umich.edu/projects/nfsv4/linux/libgssapi">
-      libgssapi</ulink> is not installed. Remove it if libgssapi is installed
-      and you want to use it.
+      no GSSAPI is installed. Remove this switch if you have one
+      installed (for example <xref linkend="mitkrb"/>) and you wish to use it.
 @z
 
 @x

diff --git a/blfsbook/src/postlfs/security/libcap.ch b/blfsbook/src/postlfs/security/libcap.ch
index f023b1f..ccf28dd 100644 (file)
--- a/blfsbook/src/postlfs/security/libcap.ch
+++ b/blfsbook/src/postlfs/security/libcap.ch
@@ -14,12 +14,6 @@
 @z
 
 @x
-  <!ENTITY libcap-time          "less than 0.1 SBU">
-@y
-  <!ENTITY libcap-time          "&LessThan1;0.1 SBU&LessThan2;">
-@z
-
-@x
     <title>Introduction to libcap</title>
 @y
     <title>&IntroductionTo1;libcap&IntroductionTo2;</title>

diff --git a/blfsbook/src/postlfs/security/nettle.ch b/blfsbook/src/postlfs/security/nettle.ch
index 2f65969..09e9c71 100644 (file)
--- a/blfsbook/src/postlfs/security/nettle.ch
+++ b/blfsbook/src/postlfs/security/nettle.ch
@@ -77,12 +77,12 @@
 @x
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="openssl"/>
+      <xref linkend="openssl"/> (for examples)
     </para>
 @y
     <bridgehead renderas="sect4">&Optional;</bridgehead>
     <para role="optional">
-      <xref linkend="openssl"/>
+      <xref linkend="openssl"/> (example プログラムのため)
     </para>
 @z
 

diff --git a/blfsbook/src/postlfs/security/shadow.ch b/blfsbook/src/postlfs/security/shadow.ch
index 6021eec..d187bc9 100644 (file)
--- a/blfsbook/src/postlfs/security/shadow.ch
+++ b/blfsbook/src/postlfs/security/shadow.ch
@@ -180,15 +180,15 @@
       LFS 構築時に <application>Coreutils</application> パッケージによってインストールされた man ページを置き換えないようにするものです。
 @z
 
-@x
-      <command>sed -i -e '...' -e '...' man/Makefile.in</command>: This command
-      disables the installation of Chinese and Korean manual pages, since
-      <application>Man-DB</application> cannot format them properly.
-@y
-      <command>sed -i -e '...' -e '...' man/Makefile.in</command>:
-      このコマンドは中国語および韓国語による man ページをインストールしないようにします。
-      これらのページは <application>Man-DB</application> が適切に取り扱うことができないためです。
-@z
+% @x
+%       <command>sed -i -e '...' -e '...' man/Makefile.in</command>: This command
+%       disables the installation of Chinese and Korean manual pages, since
+%       <application>Man-DB</application> cannot format them properly.
+% @y
+%       <command>sed -i -e '...' -e '...' man/Makefile.in</command>:
+%       このコマンドは中国語および韓国語による man ページをインストールしないようにします。
+%       これらのページは <application>Man-DB</application> が適切に取り扱うことができないためです。
+% @z
 
 @x
       <command>sed -i -e 's@#ENCRYPT_METHOD DES@ENCRYPT_METHOD SHA512@' -e

diff --git a/blfsbook/src/x/installing/xkeyboard-config.ch b/blfsbook/src/x/installing/xkeyboard-config.ch
index 43e50be..125dde2 100644 (file)
--- a/blfsbook/src/x/installing/xkeyboard-config.ch
+++ b/blfsbook/src/x/installing/xkeyboard-config.ch
@@ -78,13 +78,13 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
       <xref linkend="intltool"/> and
-      <xref linkend="xorg7-app"/>
+      <xref linkend="xorg7-lib"/>
     </para>
 @y
     <bridgehead renderas="sect4">&Required;</bridgehead>
     <para role="required">
       <xref linkend="intltool"/>,
-      <xref linkend="xorg7-app"/>
+      <xref linkend="xorg7-lib"/>
     </para>
 @z
 

diff --git a/blfsbook/src/x/installing/xorg-server.ch b/blfsbook/src/x/installing/xorg-server.ch
index 23bd82c..3b6224e 100644 (file)
--- a/blfsbook/src/x/installing/xorg-server.ch
+++ b/blfsbook/src/x/installing/xorg-server.ch
@@ -89,7 +89,9 @@
 @x
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="openssl"/>,
+      <xref linkend="openssl"/> or
+      <xref linkend="nettle"/> or
+      <xref linkend="libgcrypt"/>,
       <xref linkend="pixman"/>,
       <xref linkend="xorg7-font"/>, and
       <xref linkend="xkeyboard-config"/>
@@ -97,7 +99,9 @@
 @y
     <bridgehead renderas="sect4">&Required;</bridgehead>
     <para role="required">
-      <xref linkend="openssl"/>,
+      <xref linkend="openssl"/> または
+      <xref linkend="nettle"/> または
+      <xref linkend="libgcrypt"/>,
       <xref linkend="pixman"/>,
       <xref linkend="xorg7-font"/>,
       <xref linkend="xkeyboard-config"/>

diff --git a/blfsbook/version.ac b/blfsbook/version.ac
index e64335f..963a0ce 100644 (file)
--- a/blfsbook/version.ac
+++ b/blfsbook/version.ac
@@ -6,4 +6,4 @@ dnl  $Rev$
 dnl  $Date::                           $
 dnl
 dnl m4-include this file to define the current BLFS version
-m4_define([blfs_version], [20131230])
+m4_define([blfs_version], [20140101])