From 1118b1757d67c5e7deb4c9e4b864b00f9d8a8b0c Mon Sep 17 00:00:00 2001
From: Bruce Dubbs <bdubbs@linuxfromscratch.org>
Date: Tue, 24 May 2016 21:24:59 +0000
Subject: Create branches/merge in svn repo fo rtesting of merged LFS books

git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/merge@11073 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter03/packages.xml | 44 ++++++++++----------------------------------
 chapter03/patches.xml  | 10 +++++++++-
 2 files changed, 19 insertions(+), 35 deletions(-)

(limited to 'chapter03')

diff --git a/chapter03/packages.xml b/chapter03/packages.xml
index dfef86115..40febc0ae 100644
--- a/chapter03/packages.xml
+++ b/chapter03/packages.xml
@@ -112,8 +112,8 @@
         <para>MD5 sum: <literal>&coreutils-md5;</literal></para>
       </listitem>
     </varlistentry>
-<!--
-    <varlistentry>
+
+    <varlistentry revision="systemd">
       <term>D-Bus (&dbus-version;) - <token>&dbus-size;</token>:</term>
       <listitem>
         <para>Home page: <ulink url="&dbus-home;"/></para>
@@ -121,7 +121,7 @@
         <para>MD5 sum: <literal>&dbus-md5;</literal></para>
       </listitem>
     </varlistentry>
--->
+
     <varlistentry>
       <term>DejaGNU (&dejagnu-version;) - <token>&dejagnu-size;</token>:</term>
       <listitem>
@@ -140,22 +140,14 @@
       </listitem>
     </varlistentry>
 
-    <varlistentry>
+    <varlistentry revision="sysv">
       <term>Eudev (&eudev-version;) - <token>&eudev-size;</token>:</term>
       <listitem>
         <para>Download: <ulink url="&eudev-url;"/></para>
         <para>MD5 sum: <literal>&eudev-md5;</literal></para>
       </listitem>
     </varlistentry>
-<!--
-    <varlistentry>
-      <term>Eudev-manpages (&eudev-version;) - <token>&eudev-manpages-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink url="&eudev-manpages-url;"/></para>
-        <para>MD5 sum: <literal>&eudev-manpages-md5;</literal></para>
-      </listitem>
-    </varlistentry>
--->
+
     <varlistentry>
       <term>E2fsprogs (&e2fsprogs-version;) - <token>&e2fsprogs-size;</token>:</term>
       <listitem>
@@ -503,22 +495,6 @@
       </listitem>
     </varlistentry>
 
-    <!-- FIXME:
-    <varlistentry>
-      <term>Ncurses Rollup Patch (&ncurses-date;) - 328 KB:</term>
-      <listitem>
-        <para><ulink url="ftp://invisible-island.net/ncurses/&ncurses-version;/"/></para>
-
-        <note>
-          <para>Ncurses Rollup Patch (&ncurses-date;) may no longer be available
-          at the listed location. The site administrators of the master download
-          location occasionally remove older versions when new ones are released.
-          There is no alternative download location yet.</para>
-        </note>
-      </listitem>
-    </varlistentry>
-    -->
-
     <varlistentry>
       <term>Patch (&patch-version;) - <token>&patch-size;</token>:</term>
       <listitem>
@@ -594,7 +570,7 @@
       </listitem>
     </varlistentry>
 
-    <varlistentry>
+    <varlistentry revision="sysv">
       <term>Sysklogd (&sysklogd-version;) - <token>&sysklogd-size;</token>:</term>
       <listitem>
         <para>Home page: <ulink url="&sysklogd-home;"/></para>
@@ -602,8 +578,8 @@
         <para>MD5 sum: <literal>&sysklogd-md5;</literal></para>
       </listitem>
     </varlistentry>
-<!--
-    <varlistentry>
+
+    <varlistentry revision="systemd">
       <term>Systemd (&systemd-version;) - <token>&systemd-size;</token>:</term>
       <listitem>
         <para>Home page: <ulink url="&systemd-home;"/></para>
@@ -611,8 +587,8 @@
         <para>MD5 sum: <literal>&systemd-md5;</literal></para>
       </listitem>
     </varlistentry>
--->
-    <varlistentry>
+
+    <varlistentry revision="sysv">
       <term>Sysvinit (&sysvinit-version;) - <token>&sysvinit-size;</token>:</term>
       <listitem>
         <para>Home page: <ulink url="&sysvinit-home;"/></para>
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index 2161ae3b9..3d678ff0e 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -90,7 +90,15 @@
       </listitem>
     </varlistentry>
 
-    <varlistentry>
+   <varlistentry revision="systemd">
+      <term>Systemd Compat Patch - <token>&systemd-compat-patch-size;</token>:</term>
+      <listitem>
+        <para>Download: <ulink url="&patches-root;&systemd-compat-patch;"/></para>
+        <para>MD5 sum: <literal>&systemd-compat-patch-md5;</literal></para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry revision="sysv">
       <term>Sysvinit Consolidated Patch - <token>&sysvinit-consolidated-patch-size;</token>:</term>
       <listitem>
         <para>Download: <ulink url="&patches-root;&sysvinit-consolidated-patch;"/></para>
-- 
cgit v1.2.3-54-g00ecf