Changeset 4ce7c10 for BOOK/appendices/dependencies/common.xml

Timestamp:

Jan 29, 2011, 4:28:46 PM (13 years ago)

Author:

Joe Ciccone <jciccone@…>

Branches:

clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit

Children:

d2759bb

Parents:

f33b74f (diff), 9fedd70f (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into systemd

Conflicts:

BOOK/final-system/multilib/util-linux-64bit.xml
BOOK/final-system/multilib/util-linux-n32.xml
BOOK/final-system/multilib/util-linux.xml

File:

• BOOK/appendices/dependencies/common.xml (modified) (5 diffs)

BOOK/appendices/dependencies/common.xml

@@ -242 +242 @@
 
         <seglistitem>
-          <seg>Diffutils, E2fsprogs, Findutils, Util-linux-ng</seg>
+          <seg>Diffutils, E2fsprogs, Findutils, Util-linux</seg>
         </seglistitem>
       </segmentedlist>
@@ -400 +400 @@
         <seglistitem>
          <seg>Bash, Binutils, Coreutils, EGLIBC, Gawk, GCC, Gettext, Grep, Gzip,
-         Make, Sed, Texinfo and Util-linux-ng</seg>
+         Make, Sed, Texinfo and Util-linux</seg>
         </seglistitem>
       </segmentedlist>
@@ -1111 +1111 @@
         <seglistitem>
           <seg>Bash, GRUB, Inetutils, Less, Procps, Psmisc, Readline, Texinfo,
-          Util-linux-ng and Vim</seg>
+          Util-linux and Vim</seg>
         </seglistitem>
       </segmentedlist>
@@ -1476 +1476 @@
       </segmentedlist>
 
-<!-- Begin Util-linux-ng dependency info -->
-  <bridgehead renderas="sect2" id="util-linux-ng-dep">Util-linux-ng</bridgehead>
+<!-- Begin Util-linux dependency info -->
+  <bridgehead renderas="sect2" id="util-linux-dep">Util-linux</bridgehead>
 
       <segmentedlist>
@@ -1583 +1583 @@
 
         <seglistitem>
-          <seg>File, Module-Init-Tools and Util-linux-ng</seg>
+          <seg>File, Module-Init-Tools and Util-linux</seg>
         </seglistitem>
       </segmentedlist>