Merge branch 'trunk' into xry111/clfs-ng

.gitignore

@@ -3,4 +3,4 @@ conditional.ent
 version.ent
 appendices/*.script
 *.swp
-
+fop.log

chapter01/changelog.xml

@@ -43,6 +43,10 @@
     <listitem>
       <para>2022-03-15</para>
       <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to meson-0.61.3. Fixes
+          <ulink url="&lfs-ticket-root;5023">#5023</ulink>.</para>
+        </listitem>
         <listitem>
           <para>[xry111] - Update to expat-2.4.7. Fixes
           <ulink url="&lfs-ticket-root;5019">#5019</ulink>.</para>
@@ -96,7 +100,7 @@
           <para>[xry111] - Update to MarkupSafe-2.1.0. Fixes
           <ulink url="&lfs-ticket-root;5015">#5015</ulink>.</para>
         </listitem>
-        <listitem>
+        <listitem revision="systemd">
           <para>[xry111] - Update to dbus-1.14.0. Fixes
           <ulink url="&lfs-ticket-root;5017">#5017</ulink>.</para>
         </listitem>

chapter08/systemd.xml

@@ -180,7 +180,7 @@ meson --prefix=/usr                 \
 
     <para>Install the man pages:</para>
 
-<screen><userinput remap="install">tar -xf ../../systemd-man-pages-&systemd-man-version;.tar.xz --strip-components=1 -C /usr/share/man</userinput></screen>
+<screen><userinput remap="install">tar -xf ../../systemd-man-pages-&systemd-man-version;.tar.xz -C /usr/share/man</userinput></screen>
 
     <para>Remove a useless directory:</para>
 

packages.ent

@@ -496,10 +496,10 @@
 <!ENTITY markupsafe-fin-du "520 KB">
 <!ENTITY markupsafe-fin-sbu "less than 0.1 SBU">
 
-<!ENTITY meson-version "0.61.2">
-<!ENTITY meson-size "1,968 KB">
+<!ENTITY meson-version "0.61.3">
+<!ENTITY meson-size "1,965 KB">
 <!ENTITY meson-url "&github;/mesonbuild/meson/releases/download/&meson-version;/meson-&meson-version;.tar.gz">
-<!ENTITY meson-md5 "7c4220066c70057b4c5a997a47ac710c">
+<!ENTITY meson-md5 "8998d77313d753a0c474d9bdf1738b2e">
 <!ENTITY meson-home "https://mesonbuild.com">
 <!ENTITY meson-fin-du "41 MB">
 <!ENTITY meson-fin-sbu "less than 0.1 SBU">