Changeset 08c33f7

Timestamp:

08/18/2021 03:45:10 AM (20 months ago)

Author:

Thomas Trepl (Moody) <thomas@…>

Branches:

ml-11.0, multilib

Children:

e05a52a

Parents:

edba175 (diff), d182d83 (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:

Automatic merge of trunk into multilib

Files:

• appendices/dependencies.xml (modified) (1 diff)
• chapter01/changelog.xml (modified) (1 diff)
• chapter01/whatsnew.xml (modified) (1 diff)
• general.ent (modified) (1 diff)

appendices/dependencies.xml

@@ -2812 +2812 @@
             <ulink url="http://lz4.github.io/lz4/">LZ4</ulink>,
             <ulink url="&blfs-book;postlfs/make-ca.html">make-ca</ulink>,
+            <ulink url="&blfs-book;postlfs/p11-kit.html">p11-kit</ulink>,
             <ulink url="&blfs-book;general/pcre2.html">PCRE2</ulink>,
             <ulink url="&blfs-book;postlfs/polkit.html">Polkit</ulink>,

chapter01/changelog.xml

@@ -46 +46 @@
     -->
     <listitem>
+      <para>2021-08-16</para>
+      <itemizedlist>
+        <listitem>
+          <para>[dj] - add p11-kit to dependencies list for systemd.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>2021-08-14</para>
       <itemizedlist>

chapter01/whatsnew.xml

@@ -40 +40 @@
       <para>Autoconf-&autoconf-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>Automake-&automake-version;</para>
-    </listitem>-->
+    </listitem>
     <listitem>
       <para>Bash &bash-version;</para>

general.ent

@@ -8 +8 @@
 <!--
 <!ENTITY version         "10.2-rc1">
-<!ENTITY versiond        "10.2-rc1">
+<!ENTITY versiond        "10.2-systemd-rc1">
 <!ENTITY releasedate     "August 26th, 2021">
 <!ENTITY copyrightdate   "1999-2021">