Changeset 4e9c598

Timestamp:

08/25/2021 01:02:57 AM (3 years ago)

Author:

Ken Moffat <ken@…>

Branches:

11.0, 11.1, 11.2, 11.3, 12.0, 12.1, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, lazarus, lxqt, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, trunk, upgradedb, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal

Children:

b0a073b

Parents:

ba716181 (diff), 2edca105 (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 'trunk' of git.linuxfromscratch.org:blfs into trunk

Files:

• kde/kf5-apps/add-pkgs.xml (modified) (2 diffs)
• server/major/proftpd.xml (modified) (1 diff)
• server/major/vsftpd.xml (modified) (2 diffs)
• x/dm/lxdm.xml (modified) (1 diff)
• x/installing/x7driver-ati.xml (modified) (1 diff)
• x/lib/imlib2.xml (modified) (1 diff)

kde/kf5-apps/add-pkgs.xml

@@ -26 +26 @@
   </para>
 
-  <note>
-    <para>
-      Some packages, such as kde-baseapps, kde-runtime, and kmag listed in the
-      link above are only for the older KDE4 and cannot be used with KF5.
-    </para>
-  </note>
-
   <para>
     Some additional packages worth mentioning are:
@@ -49 +42 @@
     <listitem>
       <para>Kaccessible: Integration of accessibility utilities.</para>
+    </listitem>
+    <listitem>
+      <para>Kio-extras: various plugins for urls like <command>man://</command>
+      or <command>smb://</command>.</para>
     </listitem>
     <listitem>

server/major/proftpd.xml

@@ -35 +35 @@
     </para>
 
-    &lfs101_checked;
+    &lfs110_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>

server/major/vsftpd.xml

@@ -36 +36 @@
     </para>
 
-    &lfs101_checked;
+    &lfs110_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -217 +217 @@
 <screen role="root"><userinput>cat &gt;&gt; /etc/vsftpd.conf &lt;&lt; "EOF"
 <literal>background=YES
-listen=YES
 nopriv_user=vsftpd
 secure_chroot_dir=&vsftpd-empty;</literal>

x/dm/lxdm.xml

@@ -37 +37 @@
     </para>
 
-    &lfs101_checked;
+    &lfs110_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>

x/installing/x7driver-ati.xml

@@ -40 +40 @@
       </para>
 
-      &lfs101_checked;
+      &lfs110_checked;
 
       <note>

x/lib/imlib2.xml

@@ -77 +77 @@
     </para>
 
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="giflib"/>
+    </para>
+
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
       <xref linkend="libpng"/>,
       <xref linkend="libjpeg"/>,
-      <xref linkend="libtiff"/>,
-      <xref linkend="giflib"/>, and
+      <xref linkend="libtiff"/>, and
       <ulink url="https://sourceforge.net/projects/mad">libid3tag</ulink>
     </para>