Fix build order, update to man-pages-4.04.

git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/systemd@10984 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

5 files changed, 25 insertions, 12 deletions

diff --git a/appendices/dependencies.xml b/appendices/dependencies.xml
index 37a249770..481c9938c 100644
--- a/appendices/dependencies.xml
+++ b/appendices/dependencies.xml
@@ -1354,7 +1354,7 @@
         <segtitle>&before;</segtitle>
 
         <seglistitem>
-          <seg>Udev</seg>
+          <seg>Systemd</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -2126,7 +2126,7 @@
 
         <seglistitem>
          <seg>Acl, Attr, Bash, Binutils, Coreutils, Diffutils, Expat, Gawk,
-         GCC, Glibc, Gperf, Grep, Intltool, Libcap,
+         GCC, Gettext, Glibc, Gperf, Grep, Intltool, Kmod, Libcap,
          Make, Sed, and Util-linux</seg>
         </seglistitem>
       </segmentedlist>
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 8d2be271d..a37bdd83c 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -37,6 +37,19 @@
 -->
 
     <listitem>
+      <para>2016-01-01</para>
+      <itemizedlist>
+        <listitem>
+          <para>[dj] - Fix broken build order - move xz, kmod, gettext, and
+          util-linux before systemd.</para>
+        </listitem>
+        <listitem>
+          <para>[dj] - Update to man-pages-4.04 - Merged from trunk.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>2015-12-31</para>
       <itemizedlist>
         <listitem>
diff --git a/chapter06/chapter06.xml b/chapter06/chapter06.xml
index 3d98c683e..ddfd2c853 100644
--- a/chapter06/chapter06.xml
+++ b/chapter06/chapter06.xml
@@ -55,6 +55,10 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="intltool.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="autoconf.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="automake.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xz.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kmod.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gettext.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="util-linux.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="systemd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="procps.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="e2fsprogs.xml"/>
@@ -62,20 +66,16 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="diffutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gawk.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="findutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gettext.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="groff.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xz.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="grub.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="less.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gzip.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="iproute2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kbd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kmod.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libpipeline.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="make.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="patch.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dbus.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="util-linux.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="man-db.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="tar.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="texinfo.xml"/>
diff --git a/general.ent b/general.ent
index 035abd429..0df651f32 100644
--- a/general.ent
+++ b/general.ent
@@ -1,7 +1,7 @@
-<!ENTITY version         "20151231-systemd">
+<!ENTITY version         "20160101-systemd">
 <!ENTITY short-version   "systemd">  <!-- Used in dbus chapter, change to x.y for release -->
-<!ENTITY releasedate     "December 31st, 2015">
-<!ENTITY copyrightdate   "1999-2015"><!-- jhalfs needs a literal dash, not &ndash; -->
+<!ENTITY releasedate     "January 1, 2016">
+<!ENTITY copyrightdate   "1999-2016"><!-- jhalfs needs a literal dash, not &ndash; -->
 <!ENTITY milestone       "7.9">
 <!ENTITY generic-version "systemd"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->
 
diff --git a/packages.ent b/packages.ent
index e8b938699..835225fdb 100644
--- a/packages.ent
+++ b/packages.ent
@@ -421,10 +421,10 @@
 <!ENTITY man-db-ch6-du "31 MB">
 <!ENTITY man-db-ch6-sbu "0.5 SBU">
 
-<!ENTITY man-pages-version "4.03">
-<!ENTITY man-pages-size "1,379 KB">
+<!ENTITY man-pages-version "4.04">
+<!ENTITY man-pages-size "1,393 KB">
 <!ENTITY man-pages-url "&kernel;linux/docs/man-pages/man-pages-&man-pages-version;.tar.xz">
-<!ENTITY man-pages-md5 "3835788d4422b92ac565b4bd97d295f6">
+<!ENTITY man-pages-md5 "c20326ff9687f3ded1c24aa319a3880d">
 <!ENTITY man-pages-home "http://www.kernel.org/doc/man-pages/">
 <!ENTITY man-pages-ch6-du "26 MB">
 <!ENTITY man-pages-ch6-sbu "less than 0.1 SBU">