Changeset 0cbb853 for appendices/dependencies.xml

Timestamp:

01/06/2023 04:57:22 AM (16 months ago)

Author:

Xi Ruoyao <xry111@…>

Branches:

xry111/arm64, xry111/arm64-12.0

Children:

83ce6e3

Parents:

688a8f5 (diff), af944eb (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 remote-tracking branch 'origin/trunk' into xry111/arm64

File:

• appendices/dependencies.xml (modified) (20 diffs)

appendices/dependencies.xml

@@ -1475 +1475 @@
 
 <!-- Begin Jinja2 dependency info -->
-  <bridgehead renderas="sect2" id="jinja2-dep">Jinja2</bridgehead>
-
-      <segmentedlist id="jinja2-depends">
+  <bridgehead revision='systemd' renderas="sect2" id="jinja2-dep">Jinja2</bridgehead>
+
+      <segmentedlist id="jinja2-depends" revision='systemd'>
         <segtitle>&dependencies;</segtitle>
         <seglistitem>
@@ -1484 +1484 @@
       </segmentedlist>
 
-      <segmentedlist id="jinja2-rundeps">
+      <segmentedlist id="jinja2-rundeps" revision='systemd'>
         <segtitle>&runtime;</segtitle>
         <seglistitem>
@@ -1491 +1491 @@
       </segmentedlist>
 
-      <segmentedlist id="jinja2-testdeps">
+      <segmentedlist id="jinja2-testdeps" revision='systemd'>
         <segtitle>&testsuites;</segtitle>
         <seglistitem>
@@ -1498 +1498 @@
       </segmentedlist>
 
-      <segmentedlist id="jinja2-before">
+      <segmentedlist id="jinja2-before" revision='systemd'>
         <segtitle>&before;</segtitle>
         <seglistitem>
@@ -1505 +1505 @@
       </segmentedlist>
 
-      <segmentedlist id="jinja2-optdeps">
+      <segmentedlist id="jinja2-optdeps" revision='systemd'>
         <segtitle>&external;</segtitle>
         <seglistitem>
@@ -2072 +2072 @@
 
 <!-- Begin MarkupSafe dependency info -->
-  <bridgehead renderas="sect2" id="markupsafe-dep">MarkupSafe</bridgehead>
-
-      <segmentedlist id="markupsafe-depends">
+  <bridgehead renderas="sect2" id="markupsafe-dep" revision='systemd'>MarkupSafe</bridgehead>
+
+      <segmentedlist id="markupsafe-depends" revision='systemd'>
         <segtitle>&dependencies;</segtitle>
         <seglistitem>
@@ -2081 +2081 @@
       </segmentedlist>
 
-      <segmentedlist id="markupsafe-rundeps">
+      <segmentedlist id="markupsafe-rundeps" revision='systemd'>
         <segtitle>&runtime;</segtitle>
         <seglistitem>
@@ -2088 +2088 @@
       </segmentedlist>
 
-      <segmentedlist id="markupsafe-testdeps">
+      <segmentedlist id="markupsafe-testdeps" revision='systemd'>
         <segtitle>&testsuites;</segtitle>
         <seglistitem>
@@ -2095 +2095 @@
       </segmentedlist>
 
-      <segmentedlist id="markupsafe-before">
+      <segmentedlist id="markupsafe-before" revision='systemd'>
         <segtitle>&before;</segtitle>
         <seglistitem>
@@ -2102 +2102 @@
       </segmentedlist>
 
-      <segmentedlist id="markupsafe-optdeps">
+      <segmentedlist id="markupsafe-optdeps" revision='systemd'>
         <segtitle>&external;</segtitle>
         <seglistitem>
@@ -2136 +2136 @@
         <segtitle>&before;</segtitle>
         <seglistitem>
-          <seg>Systemd</seg>
+          <seg>
+            <phrase revision='sysv'>None</phrase>
+            <phrase revision='systemd'>Systemd</phrase>
+          </seg>
         </seglistitem>
       </segmentedlist>
@@ -2750 +2753 @@
 
 <!-- Begin systemd dependency info -->
-  <bridgehead renderas="sect2" id="systemd-dep">Systemd</bridgehead>
-
-      <segmentedlist id="systemd-depends">
+  <bridgehead renderas="sect2" id="systemd-dep" revision='systemd'>Systemd</bridgehead>
+
+      <segmentedlist id="systemd-depends" revision='systemd'>
         <segtitle>&dependencies;</segtitle>
         <seglistitem>
@@ -2761 +2764 @@
       </segmentedlist>
 
-      <segmentedlist id="systemd-rundeps">
+      <segmentedlist id="systemd-rundeps" revision='systemd'>
         <segtitle>&runtime;</segtitle>
         <seglistitem>
@@ -2768 +2771 @@
       </segmentedlist>
 
-      <segmentedlist id="systemd-testdeps">
-        <segtitle>&testsuites;</segtitle>
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist id="systemd-before">
-        <segtitle>&before;</segtitle>
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist id="systemd-optdeps">
+      <segmentedlist id="systemd-testdeps" revision='systemd'>
+        <segtitle>&testsuites;</segtitle>
+        <seglistitem>
+          <seg>None</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist id="systemd-before" revision='systemd'>
+        <segtitle>&before;</segtitle>
+        <seglistitem>
+          <seg>None</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist id="systemd-optdeps" revision='systemd'>
         <segtitle>&external;</segtitle>
         <seglistitem>
@@ -2837 +2840 @@
 
 <!-- Begin Sysvinit dependency info -->
-  <bridgehead renderas="sect2" id="sysvinit-dep">Sysvinit</bridgehead>
-
-      <segmentedlist id="sysvinit-depends">
+  <bridgehead renderas="sect2" id="sysvinit-dep" revision='sysv'>Sysvinit</bridgehead>
+
+      <segmentedlist id="sysvinit-depends" revision='sysv'>
         <segtitle>&dependencies;</segtitle>
         <seglistitem>
@@ -2846 +2849 @@
       </segmentedlist>
 
-      <segmentedlist id="sysvinit-rundeps">
+      <segmentedlist id="sysvinit-rundeps" revision='sysv'>
         <segtitle>&runtime;</segtitle>
         <seglistitem>
@@ -2853 +2856 @@
       </segmentedlist>
 
-      <segmentedlist id="sysvinit-testdeps">
+      <segmentedlist id="sysvinit-testdeps" revision='sysv'>
         <segtitle>&testsuites;</segtitle>
         <seglistitem>
@@ -2860 +2863 @@
       </segmentedlist>
 
-      <segmentedlist id="sysvinit-before">
-        <segtitle>&before;</segtitle>
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist id="sysvinit-optdeps">
+      <segmentedlist id="sysvinit-before" revision='sysv'>
+        <segtitle>&before;</segtitle>
+        <seglistitem>
+          <seg>None</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist id="sysvinit-optdeps" revision='sysv'>
         <segtitle>&external;</segtitle>
         <seglistitem>
@@ -3110 +3113 @@
         <segtitle>&before;</segtitle>
         <seglistitem>
-          <seg>Jinja2</seg>
+          <seg>
+            <phrase revision='sysv'>None</phrase>
+            <phrase revision='systemd'>Jinja2</phrase>
+          </seg>
         </seglistitem>
       </segmentedlist>
@@ -3263 +3269 @@
         <segtitle>&before;</segtitle>
         <seglistitem>
-          <seg>GCC and Systemd</seg>
+          <seg>GCC <phrase revision='systemd'>and Systemd</phrase></seg>
         </seglistitem>
       </segmentedlist>