From c68d57a81a082bd5a93dc444a2058f1be99aa770 Mon Sep 17 00:00:00 2001
From: Pierre Labastie <pierre.labastie@neuf.fr>
Date: Sun, 19 Feb 2023 14:37:28 +0100
Subject: [PATCH] Finish adding revision attributes in dependencies

This was half done. Furthermore, dbus had completely disappeared.
Also fix an url to sphinx, that is now in BLFS.
---
 appendices/dependencies.xml | 75 +++++++++++++++++++++----------------
 1 file changed, 43 insertions(+), 32 deletions(-)

diff --git a/appendices/dependencies.xml b/appendices/dependencies.xml
index d5ee5909e..71ceac7e2 100644
--- a/appendices/dependencies.xml
+++ b/appendices/dependencies.xml
@@ -464,7 +464,9 @@
       <segmentedlist id="coreutils-before">
         <segtitle>&before;</segtitle>
         <seglistitem>
-          <seg>Bash, Diffutils, Eudev, Findutils, and Man-DB</seg>
+          <seg>Bash, Diffutils, <phrase revision="sysv">Eudev, </phrase>
+          Findutils, <phrase revision="sysv">and </phrase>Man-DB<phrase
+          revision="systemd">, and Systemd</phrase></seg>
         </seglistitem>
       </segmentedlist>
 
@@ -480,42 +482,45 @@
       </segmentedlist>
 
 <!-- Begin D-Bus dependency info -->
-<!--
-  <bridgehead renderas="sect2" id="dbus-dep">D-Bus</bridgehead>
 
-      <segmentedlist>
+  <bridgehead renderas="sect2" id="dbus-dep" revision="systemd">D-Bus</bridgehead>
+
+      <segmentedlist id="dbus-depends" revision="systemd">
         <segtitle>&dependencies;</segtitle>
-
         <seglistitem>
           <seg>Bash, Binutils, Coreutils, Diffutils, Gawk, GCC, Glibc, Grep,
-          Make, Sed, and Util-linux</seg>
+          Make, Sed, Systemd, and Util-linux</seg>
         </seglistitem>
       </segmentedlist>
 
-      <segmentedlist>
+      <segmentedlist id="dbus-rundeps" revision="systemd">
+        <segtitle>&runtime;</segtitle>
+        <seglistitem>
+          <seg>Glibc and Systemd</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist id="dbus-testdeps" revision="systemd">
         <segtitle>&testsuites;</segtitle>
-
         <seglistitem>
-          <seg>None</seg>
+          <seg>Several packages in BLFS</seg>
         </seglistitem>
       </segmentedlist>
 
-      <segmentedlist>
+      <segmentedlist id="dbus-before" revision="systemd">
         <segtitle>&before;</segtitle>
-
         <seglistitem>
           <seg>None</seg>
         </seglistitem>
       </segmentedlist>
 
-      <segmentedlist>
+      <segmentedlist id="dbus-optdeps" revision="systemd">
         <segtitle>&external;</segtitle>
-
         <seglistitem>
-          <seg>Xorg Libs</seg>
+          <seg><ulink url="&blfs-book;x/x7lib.html">Xorg Libraries</ulink></seg>
         </seglistitem>
       </segmentedlist>
--->
+
 <!-- Begin DejaGNU dependency info -->
   <bridgehead renderas="sect2" id="dejagnu-dep">DejaGNU</bridgehead>
 
@@ -634,9 +639,9 @@
       </segmentedlist>
 
 <!-- Begin Eudev dependency info -->
-  <bridgehead renderas="sect2" id="eudev-dep">Eudev</bridgehead>
+  <bridgehead renderas="sect2" id="eudev-dep" revision="sysv">Eudev</bridgehead>
 
-      <segmentedlist id="eudev-depends">
+      <segmentedlist id="eudev-depends" revision="sysv">
         <segtitle>&dependencies;</segtitle>
         <seglistitem>
           <seg>Bash, Binutils, Coreutils, Gawk, GCC, Glibc, Grep, Gperf, Make,
@@ -644,28 +649,28 @@
         </seglistitem>
       </segmentedlist>
 
-      <segmentedlist id="eudev-rundeps">
+      <segmentedlist id="eudev-rundeps" revision="sysv">
         <segtitle>&runtime;</segtitle>
         <seglistitem>
           <seg>Glibc, Kmod, Xz, Util-linux, and Zlib.</seg>
         </seglistitem>
       </segmentedlist>
 
-      <segmentedlist id="eudev-testdeps">
+      <segmentedlist id="eudev-testdeps" revision="sysv">
         <segtitle>&testsuites;</segtitle>
         <seglistitem>
           <seg>None</seg>
         </seglistitem>
       </segmentedlist>
 
-      <segmentedlist id="eudev-before">
+      <segmentedlist id="eudev-before" revision="sysv">
         <segtitle>&before;</segtitle>
         <seglistitem>
           <seg>None</seg>
         </seglistitem>
       </segmentedlist>
 
-      <segmentedlist id="eudev-optdeps">
+      <segmentedlist id="eudev-optdeps" revision="sysv">
         <segtitle>&external;</segtitle>
         <seglistitem>
           <seg>None</seg>
@@ -1579,7 +1584,8 @@
       <segmentedlist id="kmod-before">
         <segtitle>&before;</segtitle>
         <seglistitem>
-          <seg>Eudev</seg>
+          <seg><phrase revision="sysv">Eudev</phrase>
+          <phrase revision="systemd">Systemd</phrase></seg>
         </seglistitem>
       </segmentedlist>
 
@@ -2716,37 +2722,37 @@
       </segmentedlist>
 
 <!-- Begin Sysklogd dependency info -->
-  <bridgehead renderas="sect2" id="sysklogd-dep">Sysklogd</bridgehead>
+  <bridgehead renderas="sect2" id="sysklogd-dep" revision="sysv">Sysklogd</bridgehead>
 
-      <segmentedlist id="sysklogd-depends">
+      <segmentedlist id="sysklogd-depends" revision="sysv">
         <segtitle>&dependencies;</segtitle>
         <seglistitem>
           <seg>Binutils, Coreutils, GCC, Glibc, Make, and Patch</seg>
         </seglistitem>
       </segmentedlist>
 
-      <segmentedlist id="sysklogd-rundeps">
+      <segmentedlist id="sysklogd-rundeps" revision="sysv">
         <segtitle>&runtime;</segtitle>
         <seglistitem>
           <seg>Glibc</seg>
         </seglistitem>
       </segmentedlist>
 
-      <segmentedlist id="sysklogd-testdeps">
+      <segmentedlist id="sysklogd-testdeps" revision="sysv">
         <segtitle>&testsuites;</segtitle>
         <seglistitem>
           <seg>No test suite available</seg>
         </seglistitem>
       </segmentedlist>
 
-      <segmentedlist id="sysklogd-before">
+      <segmentedlist id="sysklogd-before" revision="sysv">
         <segtitle>&before;</segtitle>
         <seglistitem>
           <seg>None</seg>
         </seglistitem>
       </segmentedlist>
 
-      <segmentedlist id="sysklogd-optdeps">
+      <segmentedlist id="sysklogd-optdeps" revision="sysv">
         <segtitle>&external;</segtitle>
         <seglistitem>
           <seg>None</seg>
@@ -2830,7 +2836,8 @@
             <ulink url="https://sourceforge.net/projects/linuxquota/">
               quota-tools</ulink>,
             <ulink url="&blfs-book;basicnet/rsync.html">rsync</ulink>,
-            <ulink url="https://pypi.python.org/pypi/Sphinx">Sphinx</ulink>,
+            <ulink url="&blfs-book;general/python-modules.html#sphinx">
+              Sphinx</ulink>,
             <ulink url="https://tpm2-tss.readthedocs.io/en/latest/">
               tpm2-tss</ulink>,
             <ulink url="&blfs-book;general/valgrind.html">Valgrind</ulink>,
@@ -3002,8 +3009,10 @@
       <segmentedlist id="util-linux-depends">
         <segtitle>&dependencies;</segtitle>
         <seglistitem>
-          <seg>Bash, Binutils, Coreutils, Diffutils, Eudev, Findutils, Gawk,
-          GCC, Gettext, Glibc, Grep, Make, Ncurses, Sed, and Zlib</seg>
+          <seg>Bash, Binutils, Coreutils, Diffutils,
+          <phrase revision="sysv">Eudev, </phrase>Findutils, Gawk,
+          GCC, Gettext, Glibc, Grep, Make, Ncurses, Sed,
+          <phrase revision="systemd">Systemd, </phrase>and Zlib</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -3194,7 +3203,9 @@
       <segmentedlist id="xz-before">
         <segtitle>&before;</segtitle>
         <seglistitem>
-          <seg>Eudev, File, GRUB, Kmod, and Man-DB</seg>
+          <seg><phrase revision="sysv">Eudev, </phrase>File, GRUB, Kmod,
+          <phrase revision="sysv">and </phrase>Man-DB<phrase
+          revision="systemd">, and Systemd</phrase></seg>
         </seglistitem>
       </segmentedlist>