Author: dj
Date: Sun Jan 24 21:04:46 2016
New Revision: 16840

Log:
Rename -systemd specific files, move libdrim to X Libraries section.

Added:
   branches/systemd/general/genlib/libevdev.xml
      - copied unchanged from r16839, 
branches/systemd/general/genlib/libevdev-systemd.xml
   branches/systemd/general/genlib/libgcrypt.xml
      - copied unchanged from r16839, 
branches/systemd/general/genlib/libgcrypt-systemd.xml
   branches/systemd/general/genlib/libgpg-error.xml
      - copied unchanged from r16839, 
branches/systemd/general/genlib/libgpg-error-systemd.xml
   branches/systemd/general/genlib/libinput.xml
      - copied unchanged from r16839, 
branches/systemd/general/genlib/libinput-systemd.xml
   branches/systemd/general/genlib/libmbim.xml
      - copied unchanged from r16839, 
branches/systemd/general/genlib/libmbim-systemd.xml
   branches/systemd/general/genlib/libpciaccess.xml
      - copied unchanged from r16839, 
branches/systemd/general/genlib/libpciaccess-systemd.xml
   branches/systemd/general/genlib/libqmi.xml
      - copied unchanged from r16839, 
branches/systemd/general/genlib/libqmi-systemd.xml
   branches/systemd/general/genlib/libxkbcommon.xml
      - copied unchanged from r16839, 
branches/systemd/general/genlib/libxkbcommon-systemd.xml
   branches/systemd/general/genlib/wayland.xml
      - copied unchanged from r16839, 
branches/systemd/general/genlib/wayland-systemd.xml
   branches/systemd/general/genlib/yaml.xml
      - copied unchanged from r16839, 
branches/systemd/general/genlib/yaml-systemd.xml
Replaced:
   branches/systemd/x/lib/libdrm.xml
      - copied unchanged from r16839, branches/systemd/general/genlib/libdrm.xml
Deleted:
   branches/systemd/general/genlib/libdrm-systemd.xml
   branches/systemd/general/genlib/libdrm.xml
   branches/systemd/general/genlib/libevdev-systemd.xml
   branches/systemd/general/genlib/libgcrypt-systemd.xml
   branches/systemd/general/genlib/libgpg-error-systemd.xml
   branches/systemd/general/genlib/libinput-systemd.xml
   branches/systemd/general/genlib/libmbim-systemd.xml
   branches/systemd/general/genlib/libpciaccess-systemd.xml
   branches/systemd/general/genlib/libqmi-systemd.xml
   branches/systemd/general/genlib/libxkbcommon-systemd.xml
   branches/systemd/general/genlib/wayland-systemd.xml
   branches/systemd/general/genlib/yaml-systemd.xml
Modified:
   branches/systemd/general.ent
   branches/systemd/general/genlib/genlib.xml
   branches/systemd/introduction/welcome/changelog.xml
   branches/systemd/x/lib/lib.xml

Modified: branches/systemd/general.ent
==============================================================================
--- branches/systemd/general.ent        Sun Jan 24 19:56:13 2016        (r16839)
+++ branches/systemd/general.ent        Sun Jan 24 21:04:46 2016        (r16840)
@@ -1,12 +1,12 @@
 <!-- $LastChangedBy$ $Date$ -->
 
-<!ENTITY day          "24">                   <!-- Always 2 digits -->
+<!ENTITY day          "25">                   <!-- Always 2 digits -->
 <!ENTITY month        "01">                   <!-- Always 2 digits -->
 <!ENTITY year         "2016">
 <!ENTITY copyrightdate "2001-&year;">
 <!ENTITY copyholder   "The BLFS systemd Development Team">
 <!ENTITY version      "&year;-&month;-&day;">
-<!ENTITY releasedate  "January 24th, &year;">
+<!ENTITY releasedate  "January 25th, &year;">
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
 <!ENTITY blfs-version "systemd">                  <!-- svn|[release #] -->
 <!ENTITY lfs-version  "systemd">          <!-- x.y|development] -->

Modified: branches/systemd/general/genlib/genlib.xml
==============================================================================
--- branches/systemd/general/genlib/genlib.xml  Sun Jan 24 19:56:13 2016        
(r16839)
+++ branches/systemd/general/genlib/genlib.xml  Sun Jan 24 21:04:46 2016        
(r16840)
@@ -72,26 +72,25 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="libcroco.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="libdaemon.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; 
href="libdbusmenuqt.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="libdrm.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="libesmtp.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; 
href="libevdev-systemd.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="libevdev.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="libffi.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; 
href="libgcrypt-systemd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; 
href="libgpg-error-systemd.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="libgcrypt.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; 
href="libgpg-error.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="libgsf.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="libgudev.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="libgusb.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="libical.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="libidn.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; 
href="libinput-systemd.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="libinput.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="libiodbc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="libksba.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="liblinear.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; 
href="libmbim-systemd.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="libmbim.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; 
href="libnfsidmap.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="libpaper.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; 
href="libpciaccess-systemd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; 
href="libqmi-systemd.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; 
href="libpciaccess.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="libqmi.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="libsigc++.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; 
href="libsigsegv.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; 
href="libstatgrab.xml"/>
@@ -100,7 +99,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; 
href="libunistring.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="libusb.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; 
href="libusb-compat.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; 
href="libxkbcommon-systemd.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; 
href="libxkbcommon.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="libxml2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="libxslt.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; 
href="libzeitgeist.xml"/>
@@ -116,9 +115,9 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="qca.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="qjson.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="talloc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; 
href="wayland-systemd.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="wayland.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="wv.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="xapian.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; 
href="yaml-systemd.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="yaml.xml"/>
 
 </chapter>

Copied: branches/systemd/general/genlib/libevdev.xml (from r16839, 
branches/systemd/general/genlib/libevdev-systemd.xml)
==============================================================================
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ branches/systemd/general/genlib/libevdev.xml        Sun Jan 24 21:04:46 
2016        (r16840, copy of r16839, 
branches/systemd/general/genlib/libevdev-systemd.xml)
@@ -0,0 +1,230 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"; [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+  <!ENTITY libevdev-download-http 
"http://www.freedesktop.org/software/libevdev/libevdev-&libevdev-version;.tar.xz";>
+  <!ENTITY libevdev-download-ftp  " ">
+  <!ENTITY libevdev-md5sum        "b66443bb664cfaf2ba7b3f8c238ea951">
+  <!ENTITY libevdev-size          "404 KB">
+  <!ENTITY libevdev-buildsize     "8.9 MB">
+  <!ENTITY libevdev-time          "Less than 0.1 SBU">
+]>
+
+<sect1 id="libevdev" xreflabel="libevdev-&libevdev-version;">
+  <?dbhtml filename="libevdev.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>libevdev-&libevdev-version;</title>
+
+  <indexterm zone="libevdev">
+    <primary sortas="a-libevdev">libevdev</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to libevdev</title>
+
+    <para>
+      <application>libevdev</application> is a wrapper library for evdev
+      devices. It moves the common tasks when dealing with evdev devices
+      into a library and provides a library interface to the callers,
+      thus avoiding erroneous ioctls, etc.
+    </para>
+
+    &lfs78_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&libevdev-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&libevdev-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &libevdev-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &libevdev-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &libevdev-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &libevdev-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">libevdev Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="python2"/> or
+      <xref linkend="python3"/>
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="check"/>,
+      <xref linkend="doxygen"/> and
+      <xref linkend="valgrind"/>
+    </para>
+
+    <para condition="html" role="usernotes">
+      User Notes: <ulink url="&blfs-wiki;/libevdev"/>
+    </para>
+  </sect2>
+
+  <sect2 role="kernel" id="libevdev-kernel">
+    <title>Kernel Configuration</title>
+
+  <para>
+    Enable the following options in the kernel configuration and recompile the
+    kernel if necessary:
+  </para>
+
+<screen><literal>Device Drivers  ---&gt;
+  Input device support ---&gt;
+    &lt;*&gt; Generic input layer (needed for...) [CONFIG_INPUT]
+    &lt;*&gt;   Event interface                   [CONFIG_INPUT_EVDEV]
+    [*]   Miscellaneous devices  ---&gt;       [CONFIG_INPUT_MISC]
+      &lt;*&gt;    User level driver support      
[CONFIG_INPUT_UINPUT]</literal></screen>
+
+    <indexterm zone="libevdev libevdev-kernel">
+      <primary sortas="d-libevdev">libevdev</primary>
+    </indexterm>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of libevdev</title>
+
+    <para>
+      Install <application>libevdev</application> by running the following
+      commands:
+    </para>
+
+<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
+make</userinput></screen>
+
+    <para>
+      If you have the optional <xref linkend="check"/> package installed,
+      the regression tests can be run as the <systemitem 
+      class="username">root</systemitem> user with
+      <userinput>make check</userinput>.
+    </para>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>make install</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
+      href="../../xincludes/static-libraries.xml"/>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>
+          libevdev-tweak-device, mouse-dpi-tool and
+          touchpad-edge-detector
+        </seg>
+        <seg>
+          libevdev.so
+        </seg>
+        <seg>
+          /usr/include/libevdev-1.0
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="libevdev-tweak-device">
+        <term><command>libevdev-tweak-device</command></term>
+        <listitem>
+          <para>
+            is a tool to change some kernel device properties.
+          </para>
+          <indexterm zone="libevdev libevdev-tweak-device">
+            <primary 
sortas="b-libevdev-tweak-device">libevdev-tweak-device</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="mouse-dpi-tool">
+        <term><command>mouse-dpi-tool</command></term>
+        <listitem>
+          <para>
+            is a tool to estimate the resolution of a mouse.
+          </para>
+          <indexterm zone="libevdev mouse-dpi-tool">
+            <primary sortas="b-mouse-dpi-tool">mouse-dpi-tool</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="touchpad-edge-detector">
+        <term><command>touchpad-edge-detector</command></term>
+        <listitem>
+          <para>
+            is a tool that reads the touchpad events from the
+            kernel and calculates the minimum and maximum for
+            the x and y coordinates, respectively.
+          </para>
+          <indexterm zone="libevdev touchpad-edge-detector">
+            <primary 
sortas="b-touchpad-edge-detector">touchpad-edge-detector</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libevdev-lib">
+        <term><filename class="libraryfile">libevdev.so</filename></term>
+        <listitem>
+          <para>
+            contains API functions for accessing evdev devices.
+          </para>
+          <indexterm zone="libevdev libevdev-lib">
+            <primary sortas="c-libevdev">libevdev.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>

Copied: branches/systemd/general/genlib/libgcrypt.xml (from r16839, 
branches/systemd/general/genlib/libgcrypt-systemd.xml)
==============================================================================
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ branches/systemd/general/genlib/libgcrypt.xml       Sun Jan 24 21:04:46 
2016        (r16840, copy of r16839, 
branches/systemd/general/genlib/libgcrypt-systemd.xml)
@@ -0,0 +1,250 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"; [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+  <!ENTITY libgcrypt-download-http " ">
+  <!ENTITY libgcrypt-download-ftp  
"ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-&libgcrypt-version;.tar.bz2";>
+  <!ENTITY libgcrypt-md5sum        "4c13c5fa43147866f993d73ee62af176">
+  <!ENTITY libgcrypt-size          "2.4 MB">
+  <!ENTITY libgcrypt-buildsize     "38 MB (additional 8 MB for docs)">
+  <!ENTITY libgcrypt-time          "0.3 SBU (additional 0.1 SBU for docs and
+                                    0.3 SBU for tests)">
+]>
+
+<sect1 id="libgcrypt" xreflabel="libgcrypt-&libgcrypt-version;">
+  <?dbhtml filename="libgcrypt.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>libgcrypt-&libgcrypt-version;</title>
+
+  <indexterm zone="libgcrypt">
+    <primary sortas="a-libgcrypt">libgcrypt</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to libgcrypt</title>
+
+    <para>
+      The <application>libgcrypt</application> package contains a general
+      purpose crypto library based on the code used in
+      <application>GnuPG</application>. The library provides a high level
+      interface to cryptographic building blocks using an extendable and 
flexible
+      API.
+    </para>
+
+    &lfs78_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&libgcrypt-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&libgcrypt-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &libgcrypt-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &libgcrypt-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &libgcrypt-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &libgcrypt-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">libgcrypt Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="libgpg-error"/>
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="libcap-pam"/> and
+      <xref linkend="pth"/>,
+      <xref linkend="texlive"/> (or <xref linkend="tl-installer"/>)
+    </para>
+
+    <para condition="html" role="usernotes">User Notes:
+      <ulink url="&blfs-wiki;/libgcrypt"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of libgcrypt</title>
+
+    <para>
+      Install <application>libgcrypt</application> by running the
+      following commands:
+    </para>
+
+<screen><userinput>./configure --prefix=/usr &amp;&amp;
+make</userinput></screen>
+
+    <para>
+      Only <command>info</command> documentation is shipped in the package
+      tarball. If you wish to build alternate formats of the documentation,
+      (you must have <xref linkend="texlive"/> installed to build the PDF
+      and PostScript documentation), then issue the following commands:
+    </para>
+
+<screen><userinput>make -j1 -C doc pdf ps html &amp;&amp;
+makeinfo --html --no-split -o doc/gcrypt_nochunks.html doc/gcrypt.texi 
&amp;&amp;
+makeinfo --plaintext       -o doc/gcrypt.txt           
doc/gcrypt.texi</userinput></screen>
+
+    <para>
+      To test the results, issue: <command>make check</command>.
+    </para>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>make install &amp;&amp;
+install -v -dm755   /usr/share/doc/libgcrypt-&libgcrypt-version; &amp;&amp;
+install -v -m644    README doc/{README.apichanges,fips*,libgcrypt*} \
+                    
/usr/share/doc/libgcrypt-&libgcrypt-version;</userinput></screen>
+
+    <para>
+      If you built the additional documentation, install it by issuing the
+      following commands as the <systemitem class="username">root</systemitem>
+      user:
+    </para>
+
+<screen role="root"><userinput>install -v -dm755   
/usr/share/doc/libgcrypt-&libgcrypt-version;/html &amp;&amp;
+install -v -m644 doc/gcrypt.html/* \
+                    /usr/share/doc/libgcrypt-&libgcrypt-version;/html 
&amp;&amp;
+install -v -m644 doc/gcrypt_nochunks.html \
+                    /usr/share/doc/libgcrypt-&libgcrypt-version; &amp;&amp;
+install -v -m644 doc/gcrypt.{pdf,ps,dvi,txt,texi} \
+                    
/usr/share/doc/libgcrypt-&libgcrypt-version;</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <para>
+      <option>--with-capabilities</option>: This option enables libcap2 
support.
+      Note that this breaks <ulink
+      url="https://gitlab.com/cryptsetup/cryptsetup";>Cryptsetup</ulink>.
+    </para>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Library</segtitle>
+      <segtitle>Installed Directory</segtitle>
+
+      <seglistitem>
+        <seg>
+          dumpsexp, hmac256, libgcrypt-config, and mpicalc
+        </seg>
+        <seg>
+          libgcrypt.so
+        </seg>
+        <seg>
+          /usr/share/doc/libgcrypt-&libgcrypt-version;
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="dumpsexp">
+        <term><command>dumpsexp</command></term>
+        <listitem>
+          <para>
+            is a debug tool for S-expressions.
+          </para>
+          <indexterm zone="libgcrypt dumpsexp">
+            <primary sortas="b-dumpsexp">dumpsexp</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="hmac256">
+        <term><command>hmac256</command></term>
+        <listitem>
+          <para>
+            is a standalone HMAC-SHA-256 implementation used to compute
+            an HMAC-SHA-256 authentication code.
+          </para>
+          <indexterm zone="libgcrypt hmac256">
+            <primary sortas="b-hmac256">hmac256</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libgcrypt-config">
+        <term><command>libgcrypt-config</command></term>
+        <listitem>
+          <para>
+            determines the compile and linker flags that should be used to
+            compile and link programs that use <filename 
class="libraryfile">libgcrypt</filename>.
+          </para>
+          <indexterm zone="libgcrypt libgcrypt-config">
+            <primary sortas="b-libgcrypt-config">libgcrypt-config</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="mpicalc">
+        <term><command>mpicalc</command></term>
+        <listitem>
+          <para>
+            is a RPN (Reverse Polish Notation) calculator.
+          </para>
+          <indexterm zone="libgcrypt mpicalc">
+            <primary sortas="b-mpicalc">mpicalc</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libgcrypt-lib">
+        <term><filename class="libraryfile">libgcrypt.so</filename></term>
+        <listitem>
+          <para>
+            contains the cryptographic API functions.
+          </para>
+          <indexterm zone="libgcrypt libgcrypt-lib">
+            <primary sortas="c-libgcrypt">libgcrypt.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>

Copied: branches/systemd/general/genlib/libgpg-error.xml (from r16839, 
branches/systemd/general/genlib/libgpg-error-systemd.xml)
==============================================================================
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ branches/systemd/general/genlib/libgpg-error.xml    Sun Jan 24 21:04:46 
2016        (r16840, copy of r16839, 
branches/systemd/general/genlib/libgpg-error-systemd.xml)
@@ -0,0 +1,184 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"; [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+  <!ENTITY libgpg-error-download-http " ">
+  <!ENTITY libgpg-error-download-ftp  
"ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-&libgpg-error-version;.tar.bz2";>
+  <!ENTITY libgpg-error-md5sum        "ab0b5aba6d0a185b41d07bda804fd8b2">
+  <!ENTITY libgpg-error-size          "748 KB">
+  <!ENTITY libgpg-error-buildsize     "9 MB (with tests)">
+  <!ENTITY libgpg-error-time          "less than 0.1 SBU (with tests)">
+]>
+
+<sect1 id="libgpg-error" xreflabel="libgpg-error-&libgpg-error-version;">
+  <?dbhtml filename="libgpg-error.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>libgpg-error-&libgpg-error-version;</title>
+
+  <indexterm zone="libgpg-error">
+    <primary sortas="a-libgpg-error">libgpg-error</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to libgpg-error</title>
+
+    <para>
+      The <application>libgpg-error</application> package contains a
+      library that defines common error values for all
+      <application>GnuPG</application> components.
+    .</para>
+
+    &lfs78_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&libgpg-error-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&libgpg-error-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &libgpg-error-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &libgpg-error-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &libgpg-error-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &libgpg-error-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <para condition="html" role="usernotes">User Notes:
+      <ulink url="&blfs-wiki;/libgpg-error"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of libgpg-error</title>
+
+    <para>
+      Install <application>libgpg-error</application> by running the
+      following commands:
+    </para>
+
+<screen><userinput>./configure --prefix=/usr &amp;&amp;
+make</userinput></screen>
+
+    <para>
+      To test the results, issue: <command>make check</command>.
+    </para>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>make install &amp;&amp;
+install -v -m644 -D README 
/usr/share/doc/libgpg-error-&libgpg-error-version;/README</userinput></screen>
+
+  </sect2>
+<!-- No longer needed
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
+      href="../../xincludes/static-libraries.xml"/>
+
+  </sect2>
+-->
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Library</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>
+          gpg-error and gpg-error-config
+        </seg>
+        <seg>
+          libgpg-error.so
+        </seg>
+        <seg>
+          /usr/share/common-lisp/source/gpg-error and
+          /usr/share/doc/libgpg-error-&libgpg-error-version;
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="gpg-error">
+        <term><command>gpg-error</command></term>
+        <listitem>
+          <para>
+            is used to determine <application>libgpg-error</application>
+            error codes.
+          </para>
+          <indexterm zone="libgpg-error gpg-error">
+            <primary sortas="b-gpg-error">gpg-error</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="gpg-error-config">
+        <term><command>gpg-error-config</command></term>
+        <listitem>
+          <para>
+            is a utility used to configure and build applications based on
+            the <application>libgpg-error</application> library. It can be used
+            to query the C compiler and linker flags which are required to
+            correctly compile and link the application against the
+            <application>libgpg-error</application> library.
+          </para>
+          <indexterm zone="libgpg-error gpg-error-config">
+            <primary sortas="b-gpg-error-config">gpg-error-config</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libgpg-error-lib">
+        <term><filename class="libraryfile">libgpg-error.so</filename></term>
+        <listitem>
+          <para>
+            contains the <application>libgpg-error</application> API
+            functions.
+          </para>
+          <indexterm zone="libgpg-error libgpg-error-lib">
+            <primary sortas="c-libgpg-error">libgpg-error.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>

Copied: branches/systemd/general/genlib/libinput.xml (from r16839, 
branches/systemd/general/genlib/libinput-systemd.xml)
==============================================================================
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ branches/systemd/general/genlib/libinput.xml        Sun Jan 24 21:04:46 
2016        (r16840, copy of r16839, 
branches/systemd/general/genlib/libinput-systemd.xml)
@@ -0,0 +1,221 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"; [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+  <!ENTITY libinput-download-http 
"http://www.freedesktop.org/software/libinput/libinput-&libinput-version;.tar.xz";>
+  <!ENTITY libinput-download-ftp  " ">
+  <!ENTITY libinput-md5sum        "f390e592aa09f77dabceabeb2ddd4419">
+  <!ENTITY libinput-size          "784 KB">
+  <!ENTITY libinput-buildsize     "25 MB">
+  <!ENTITY libinput-time          "0.2 SBU">
+]>
+
+<sect1 id="libinput" xreflabel="libinput-&libinput-version;">
+  <?dbhtml filename="libinput.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>libinput-&libinput-version;</title>
+
+  <indexterm zone="libinput">
+    <primary sortas="a-libinput">libinput</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to libinput</title>
+
+    <para>
+      <application>libinput</application> is a library that handles
+      input devices for display servers and other applications that
+      need to directly deal with input devices.
+    </para>
+
+    &lfs77_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&libinput-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&libinput-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &libinput-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &libinput-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &libinput-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &libinput-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">libinput Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="libevdev"/> and
+      <xref linkend="mtdev"/>
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="check"/> and
+      <xref linkend="valgrind"/> (to build the tests),
+      <xref linkend="doxygen"/> and
+      <xref linkend="graphviz"/> (to build the documentation)
+      <xref linkend="gtk3"/> (to build the GUI event viewer) and
+      <ulink url="http://www.nongnu.org/libunwind/";>libunwind</ulink>
+    </para>
+
+    <para condition="html" role="usernotes">
+      User Notes: <ulink url="&blfs-wiki;/libinput"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of libinput</title>
+
+    <para>
+      Install <application>libinput</application> by running the following
+      commands:
+    </para>
+
+<screen><userinput>./configure --prefix=/usr    \
+            --disable-static \
+            --with-udev-dir=/lib/udev &amp;&amp;
+make</userinput></screen>
+
+    <para>
+      Running the testsuite for this package can be dangerous, as
+      it creates a number of dummy input devices on the currently
+      running system that can lead to crashing a local X server or
+      a desktop environment. If you understand the risks and have
+      the optional <xref linkend="check"/> and
+      <xref linkend="valgrind"/> packages installed, the regression
+      tests can be run as the <systemitem
+      class="username">root</systemitem> user with
+      <userinput>make check</userinput>. Note that depending on
+      the system configuration and hardware, some tests may fail.
+    </para>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>make install</userinput></screen>
+
+    <para>
+      If <xref linkend="doxygen"/> and <xref linkend="graphviz"/> were
+      present during the build, you can install the generated documentation
+      by running the following commands as the <systemitem
+      class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>install -v -dm755 
/usr/share/doc/libinput-&libinput-version; &amp;&amp;
+cp -rv doc/html/* 
/usr/share/doc/libinput-&libinput-version;</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
+      href="../../xincludes/static-libraries.xml"/>
+
+    <para>
+      <parameter>--with-udev-dir=/lib/udev</parameter>: This switch
+      specifies where UDev rules and hwdb files will be installed.
+    </para>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>
+          libinput-debug-events and libinput-list-devices
+        </seg>
+        <seg>
+          libinput.so
+        </seg>
+        <seg>
+          /usr/share/doc/libinput-&libinput-version;
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="libinput-debug-events">
+        <term><command>libinput-debug-events</command></term>
+        <listitem>
+          <para>
+            is a debug helper for <application>libinput</application>.
+          </para>
+          <indexterm zone="libinput libinput-debug-events">
+            <primary 
sortas="b-libinput-debug-events">libinput-debug-events</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libinput-list-devices">
+        <term><command>libinput-list-devices</command></term>
+        <listitem>
+          <para>
+            lists local devices as recognized by
+            <application>libinput</application>.
+          </para>
+          <indexterm zone="libinput libinput-list-devices">
+            <primary 
sortas="b-libinput-list-devices">libinput-list-devices</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libinput-lib">
+        <term><filename class="libraryfile">libinput.so</filename></term>
+        <listitem>
+          <para>
+            contains API functions for handling input devices.
+          </para>
+          <indexterm zone="libinput libinput-lib">
+            <primary sortas="c-libinput">libinput.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>

Copied: branches/systemd/general/genlib/libmbim.xml (from r16839, 
branches/systemd/general/genlib/libmbim-systemd.xml)
==============================================================================
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ branches/systemd/general/genlib/libmbim.xml Sun Jan 24 21:04:46 2016        
(r16840, copy of r16839, branches/systemd/general/genlib/libmbim-systemd.xml)
@@ -0,0 +1,196 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"; [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+  <!ENTITY libmbim-download-http 
"http://www.freedesktop.org/software/libmbim/libmbim-&libmbim-version;.tar.xz";>
+  <!ENTITY libmbim-download-ftp  " ">
+  <!ENTITY libmbim-md5sum        "921fb5ab3f13f1e00833e009d8f3b4f6">
+  <!ENTITY libmbim-size          "388 KB">
+  <!ENTITY libmbim-buildsize     "17 MB">
+  <!ENTITY libmbim-time          "0.2 SBU">
+]>
+
+<sect1 id="libmbim" xreflabel="libmbim-&libmbim-version;">
+  <?dbhtml filename="libmbim.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>libmbim-&libmbim-version;</title>
+
+  <indexterm zone="libmbim">
+    <primary sortas="a-libmbim">libmbim</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to libmbim</title>
+
+    <para>
+      The <application>libmbim</application> package contains a GLib-based 
library
+      for talking to WWAN modems and devices which speak the Mobile Interface
+      Broadband Model (MBIM) protocol.
+    </para>
+
+    &lfs77_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&libmbim-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&libmbim-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &libmbim-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &libmbim-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &libmbim-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &libmbim-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">libmbim Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="libgudev"/>
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="gtk-doc"/>
+    </para>
+
+    <para condition="html" role="usernotes">User Notes:
+      <ulink url="&blfs-wiki;/libmbim"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of libmbim</title>
+
+    <para>
+      Install <application>libmbim</application> by running the following
+      commands:
+    </para>
+
+<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
+make</userinput></screen>
+
+    <para>
+      To test the results, issue: <command>make check</command>.
+    </para>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>make install</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="commands">
+
+    <title>Command Explanations</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
+      href="../../xincludes/static-libraries.xml"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
+      href="../../xincludes/gtk-doc-rebuild.xml"/>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>
+          mbimcli and mbim-network
+        </seg>
+        <seg>
+          libmbim-glib.so
+        </seg>
+        <seg>
+          /usr/include/libmbim-glib and
+          /usr/share/gtk-doc/html/libmbim-glib
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="mbimcli">
+        <term><command>mbimcli</command></term>
+        <listitem>
+          <para>
+            is an utility used to control MBIM devices.
+          </para>
+          <indexterm zone="libmbim mbimcli">
+            <primary sortas="b-mbimcli">mbimcli</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="mbim-network">
+        <term><command>mbim-network</command></term>
+        <listitem>
+          <para>
+            is an utility used for simple network management
+            of MBIM devices.
+          </para>
+          <indexterm zone="libmbim mbim-network">
+            <primary sortas="b-mbim-network">mbim-network</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libmbim-glib">
+        <term><filename class="libraryfile">libmbim-glib.so</filename></term>
+        <listitem>
+          <para>
+            contains API functions for talking to WWAN modems and devices
+            which speak the Mobile Interface Broadband Model (MBIM)
+            protocol.
+          </para>
+          <indexterm zone="libmbim libmbim-glib">
+            <primary sortas="c-libmbim-glib">libmbim-glib.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>

Copied: branches/systemd/general/genlib/libpciaccess.xml (from r16839, 
branches/systemd/general/genlib/libpciaccess-systemd.xml)
==============================================================================
Binary file (source and/or target). No diff available.

Copied: branches/systemd/general/genlib/libqmi.xml (from r16839, 
branches/systemd/general/genlib/libqmi-systemd.xml)
==============================================================================
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ branches/systemd/general/genlib/libqmi.xml  Sun Jan 24 21:04:46 2016        
(r16840, copy of r16839, branches/systemd/general/genlib/libqmi-systemd.xml)
@@ -0,0 +1,195 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"; [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+  <!ENTITY libqmi-download-http 
"http://www.freedesktop.org/software/libqmi/libqmi-&libqmi-version;.tar.xz";>
+  <!ENTITY libqmi-download-ftp  " ">
+  <!ENTITY libqmi-md5sum        "24c9eb300662ba6cff0152de89bd9ec0">
+  <!ENTITY libqmi-size          "696 KB">
+  <!ENTITY libqmi-buildsize     "64 MB">
+  <!ENTITY libqmi-time          "0.3 SBU">
+]>
+
+<sect1 id="libqmi" xreflabel="libqmi-&libqmi-version;">
+  <?dbhtml filename="libqmi.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>libqmi-&libqmi-version;</title>
+
+  <indexterm zone="libqmi">
+    <primary sortas="a-libqmi">libqmi</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to libqmi</title>
+
+    <para>
+      The <application>libqmi</application> package contains a GLib-based 
library
+      for talking to WWAN modems and devices which speak the Qualcomm MSM 
Interface
+      (QMI) protocol.
+    </para>
+
+    &lfs77_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&libqmi-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&libqmi-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &libqmi-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &libqmi-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &libqmi-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &libqmi-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">libqmi Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="glib2"/>
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="gtk-doc"/>
+    </para>
+
+    <para condition="html" role="usernotes">User Notes:
+      <ulink url="&blfs-wiki;/libqmi"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of libqmi</title>
+
+    <para>
+      Install <application>libqmi</application> by running the following
+      commands:
+    </para>
+
+<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
+make</userinput></screen>
+
+    <para>
+      To test the results, issue: <command>make check</command>.
+    </para>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>make install</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="commands">
+
+    <title>Command Explanations</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
+      href="../../xincludes/static-libraries.xml"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
+      href="../../xincludes/gtk-doc-rebuild.xml"/>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>
+          qmicli and qmi-network
+        </seg>
+        <seg>
+          libqmi-glib.so
+        </seg>
+        <seg>
+          /usr/include/libqmi-glib and
+          /usr/share/gtk-doc/html/libqmi-glib
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="qmicli">
+        <term><command>qmicli</command></term>
+        <listitem>
+          <para>
+            is an utility used to control QMI devices.
+          </para>
+          <indexterm zone="libqmi qmicli">
+            <primary sortas="b-qmicli">qmicli</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="qmi-network">
+        <term><command>qmi-network</command></term>
+        <listitem>
+          <para>
+            is an utility used for simple network management
+            of QMI devices.
+          </para>
+          <indexterm zone="libqmi qmi-network">
+            <primary sortas="b-qmi-network">qmi-network</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libqmi-glib">
+        <term><filename class="libraryfile">libqmi-glib.so</filename></term>
+        <listitem>
+          <para>
+            contains API functions for talking to WWAN modems and devices
+            which speak the Qualcomm MSM Interface (QMI) protocol.
+          </para>
+          <indexterm zone="libqmi libqmi-glib">
+            <primary sortas="c-libqmi-glib">libqmi-glib.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>

Copied: branches/systemd/general/genlib/libxkbcommon.xml (from r16839, 
branches/systemd/general/genlib/libxkbcommon-systemd.xml)
==============================================================================
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ branches/systemd/general/genlib/libxkbcommon.xml    Sun Jan 24 21:04:46 
2016        (r16840, copy of r16839, 
branches/systemd/general/genlib/libxkbcommon-systemd.xml)
@@ -0,0 +1,186 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"; [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+  <!ENTITY libxkbcommon-download-http 
"http://xkbcommon.org/download/libxkbcommon-&libxkbcommon-version;.tar.xz";>
+  <!ENTITY libxkbcommon-download-ftp  " ">
+  <!ENTITY libxkbcommon-md5sum        "2e1faeafcc609c30af3a561a91e84158">
+  <!ENTITY libxkbcommon-size          "604 KB">
+  <!ENTITY libxkbcommon-buildsize     "11 MB">
+  <!ENTITY libxkbcommon-time          "0.1 SBU">
+]>
+
+<sect1 id="libxkbcommon" xreflabel="libxkbcommon-&libxkbcommon-version;">
+  <?dbhtml filename="libxkbcommon.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>libxkbcommon-&libxkbcommon-version;</title>
+
+  <indexterm zone="libxkbcommon">
+    <primary sortas="a-libxkbcommon">libxkbcommon</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to libxkbcommon</title>
+
+    <para>
+      <application>libxkbcommon</application> is a keymap compiler and
+      support library which processes a reduced subset of keymaps as
+      defined by the XKB specification.
+    </para>
+
+    &lfs78_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&libxkbcommon-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&libxkbcommon-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &libxkbcommon-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &libxkbcommon-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &libxkbcommon-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &libxkbcommon-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">libxkbcommon Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="xkeyboard-config"/>
+    </para>
+
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="libxcb"/>
+    </para>
+
+    <para condition="html" role="usernotes">User Notes:
+      <ulink url="&blfs-wiki;/libxkbcommon"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of libxkbcommon</title>
+
+    <para>
+      Install <application>libxkbcommon</application> by running the following
+      commands:
+    </para>
+
+<screen><userinput>./configure --prefix=/usr    \
+            --docdir=/usr/share/doc/libxkbcommon-&libxkbcommon-version; 
&amp;&amp;
+make</userinput></screen>
+
+    <para>
+      To test the results, issue: <command>make check</command>.
+    </para>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>make install</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
+      href="../../xincludes/static-libraries.xml"/>
+
+    <para>
+      <option>--disable-x11</option>: Use this switch if you
+      have not installed <xref linkend="libxcb"/> and
+      don't need the <filename>libxkbcommon-x11.so</filename>
+      library.
+    </para>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>
+          None
+        </seg>
+        <seg>
+          libxkbcommon and libxkbcommon-x11.so
+        </seg>
+        <seg>
+          /usr/include/xkbcommon and
+          /usr/share/doc/libxkbcommon-&libxkbcommon-version;
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="libxkbcommon-lib">
+        <term><filename class="libraryfile">libxkbcommon.so</filename></term>
+        <listitem>
+          <para>
+            contains the <application>libxkbcommon</application> API functions.
+          </para>
+          <indexterm zone="libxkbcommon libxkbcommon-lib">
+            <primary sortas="c-libxkbcommon">libxkbcommon.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libxkbcommon-x11">
+        <term><filename 
class="libraryfile">libxkbcommon-x11.so</filename></term>
+        <listitem>
+          <para>
+            contains the <application>libxkbcommon</application> X11 specific 
API
+            functions.
+          </para>
+          <indexterm zone="libxkbcommon libxkbcommon-x11">
+            <primary sortas="c-libxkbcommon-x11">libxkbcommon-x11.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>

Copied: branches/systemd/general/genlib/wayland.xml (from r16839, 
branches/systemd/general/genlib/wayland-systemd.xml)
==============================================================================
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ branches/systemd/general/genlib/wayland.xml Sun Jan 24 21:04:46 2016        
(r16840, copy of r16839, branches/systemd/general/genlib/wayland-systemd.xml)
@@ -0,0 +1,217 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"; [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+  <!ENTITY wayland-download-http 
"http://wayland.freedesktop.org/releases/wayland-&wayland-version;.tar.xz";>
+  <!ENTITY wayland-download-ftp  " ">
+  <!ENTITY wayland-md5sum        "5e141b3f2a7005d6c89d6f233c87c317">
+  <!ENTITY wayland-size          "344 KB">
+  <!ENTITY wayland-buildsize     "10.1 MB">
+  <!ENTITY wayland-time          "0.1 SBU">
+]>
+
+<sect1 id="wayland" xreflabel="Wayland-&wayland-version;">
+  <?dbhtml filename="wayland.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>Wayland-&wayland-version;</title>
+
+  <indexterm zone="wayland">
+    <primary sortas="a-Wayland">Wayland</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to Wayland</title>
+
+    <para>
+      <application>Wayland</application> is a project to define a protocol
+      for a compositor to talk to its clients as well as a library
+      implementation of the protocol.
+    </para>
+
+    &lfs78_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&wayland-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&wayland-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &wayland-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &wayland-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &wayland-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &wayland-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Wayland Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="libffi"/>
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="doxygen"/>,
+      <xref linkend="graphviz"/> and
+      <xref linkend="xmlto"/> (to build the API documentation) and
+      <xref linkend="DocBook"/>,
+      <xref linkend="docbook-xsl"/> and
+      <xref linkend="libxslt"/> (to build the manual pages)
+    </para>
+
+    <para condition="html" role="usernotes">User Notes:
+      <ulink url="&blfs-wiki;/wayland"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Wayland</title>
+
+    <para>
+      Install <application>Wayland</application> by running the following
+      commands:
+    </para>
+
+<screen><userinput>./configure --prefix=/usr    \
+            --disable-static \
+            --disable-documentation &amp;&amp;
+make</userinput></screen>
+
+    <para>
+      To test the results, issue: <command>make check</command>.
+    </para>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>make install</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
+      href="../../xincludes/static-libraries.xml"/>
+
+    <para>
+      <parameter>--disable-documentation</parameter>: This switch is used to
+      disable building of the API documentation. Remove it if you have
+      installed optional dependencies.
+    </para>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>
+          wayland-scanner
+        </seg>
+        <seg>
+          libwayland-client.so, libwayland-cursor.so, and libwayland-server.so
+        </seg>
+        <seg>
+          /usr/share/wayland
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="wayland-scanner">
+        <term><command>wayland-scanner</command></term>
+        <listitem>
+          <para>
+            is a tool to generate proxy methods in wayland-client-protocol.h
+            and wayland-server-protocol.h
+          </para>
+          <indexterm zone="wayland wayland-scanner">
+            <primary sortas="b-wayland-scanner">wayland-scanner</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libwayland-client">
+        <term><filename 
class="libraryfile">libwayland-client.so</filename></term>
+        <listitem>
+          <para>
+            contains API functions for writing 
<application>Wayland</application>
+            applications.
+          </para>
+          <indexterm zone="wayland libwayland-client">
+            <primary 
sortas="c-libwayland-client">libwayland-client.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libwayland-cursor">
+        <term><filename 
class="libraryfile">libwayland-cursor.so</filename></term>
+        <listitem>
+          <para>
+            contains API functions for managing cursors in 
<application>Wayland</application>
+            applications.
+          </para>
+          <indexterm zone="wayland libwayland-cursor">
+            <primary 
sortas="c-libwayland-cursor">libwayland-cursor.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libwayland-server">
+        <term><filename 
class="libraryfile">libwayland-server.so</filename></term>
+        <listitem>
+          <para>
+            contains API functions for writing 
<application>Wayland</application>
+            compositors.
+          </para>
+          <indexterm zone="wayland libwayland-server">
+            <primary 
sortas="c-libwayland-server">libwayland-server.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>

Copied: branches/systemd/general/genlib/yaml.xml (from r16839, 
branches/systemd/general/genlib/yaml-systemd.xml)
==============================================================================
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ branches/systemd/general/genlib/yaml.xml    Sun Jan 24 21:04:46 2016        
(r16840, copy of r16839, branches/systemd/general/genlib/yaml-systemd.xml)
@@ -0,0 +1,159 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"; [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+  <!ENTITY yaml-download-http 
"http://pyyaml.org/download/libyaml/yaml-&yaml-version;.tar.gz";>
+  <!ENTITY yaml-download-ftp  " ">
+  <!ENTITY yaml-md5sum        "5fe00cda18ca5daeb43762b80c38e06e">
+  <!ENTITY yaml-size          "492 KB">
+  <!ENTITY yaml-buildsize     "6.3 MB">
+  <!ENTITY yaml-time          "0.1 SBU">
+]>
+
+<sect1 id="yaml" xreflabel="YAML-&yaml-version;">
+  <?dbhtml filename="yaml.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>YAML-&yaml-version;</title>
+
+  <indexterm zone="yaml">
+    <primary sortas="a-YAML">YAML</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to YAML</title>
+
+    <para>
+      The <application>YAML</application> package contains a C
+      library for parsing and emitting YAML (YAML Ain't Markup
+      Language).
+    </para>
+
+    &lfs77_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&yaml-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&yaml-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &yaml-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &yaml-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &yaml-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &yaml-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">YAML Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="doxygen"/>
+    </para>
+
+    <para condition="html" role="usernotes">User Notes:
+      <ulink url="&blfs-wiki;/yaml"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of YAML</title>
+
+    <para>
+      Install <application>YAML</application> by running the following
+      commands:
+    </para>
+
+<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
+make</userinput></screen>
+
+    <para>
+      To test the results, issue: <command>make check</command>.
+    </para>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>make install</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
+      href="../../xincludes/static-libraries.xml"/>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>
+          None
+        </seg>
+        <seg>
+          libyaml.so
+        </seg>
+        <seg>
+          None
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="libyaml">
+        <term><filename class="libraryfile">libyaml.so</filename></term>
+        <listitem>
+          <para>
+            contains API functions for parsing and emitting YAML.
+          </para>
+          <indexterm zone="yaml libyaml">
+            <primary sortas="c-libyaml">libyaml.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>

Modified: branches/systemd/introduction/welcome/changelog.xml
==============================================================================
--- branches/systemd/introduction/welcome/changelog.xml Sun Jan 24 19:56:13 
2016        (r16839)
+++ branches/systemd/introduction/welcome/changelog.xml Sun Jan 24 21:04:46 
2016        (r16840)
@@ -43,6 +43,20 @@
     </listitem>
 
 -->
+
+    <listitem>
+      <para>January 24th, 2016</para>
+      <itemizedlist>
+        <listitem>
+          <para>[dj] - Moved libdrm to X Libraries section. Merged from
+          trunk.</para>
+        </listitem>
+        <listitem>
+          <para>[dj] - Renamed systemd specific files to match trunk.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>January 24th, 2016</para>
       <itemizedlist>

Modified: branches/systemd/x/lib/lib.xml
==============================================================================
--- branches/systemd/x/lib/lib.xml      Sun Jan 24 19:56:13 2016        (r16839)
+++ branches/systemd/x/lib/lib.xml      Sun Jan 24 21:04:46 2016        (r16840)
@@ -48,6 +48,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; 
href="gtk-vnc-systemd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="imlib2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="keybinder.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="libdrm.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="libepoxy.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="libglade.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="libnotify.xml"/>

Copied: branches/systemd/x/lib/libdrm.xml (from r16839, 
branches/systemd/general/genlib/libdrm.xml)
==============================================================================
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ branches/systemd/x/lib/libdrm.xml   Sun Jan 24 21:04:46 2016        
(r16840, copy of r16839, branches/systemd/general/genlib/libdrm.xml)
@@ -0,0 +1,254 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"; [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+  <!ENTITY libdrm-download-http 
"http://dri.freedesktop.org/libdrm/libdrm-&libdrm-version;.tar.bz2";>
+  <!ENTITY libdrm-download-ftp  " ">
+  <!ENTITY libdrm-md5sum        "c6809c48538d6e5999588832045ff014">
+  <!ENTITY libdrm-size          "680 KB">
+  <!ENTITY libdrm-buildsize     "17 MB (with tests)">
+  <!ENTITY libdrm-time          "0.8 SBU (with tests)">
+]>
+
+<sect1 id="libdrm" xreflabel="libdrm-&libdrm-version;">
+  <?dbhtml filename="libdrm.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>libdrm-&libdrm-version;</title>
+
+  <indexterm zone="libdrm">
+    <primary sortas="a-libdrm">libdrm</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to libdrm</title>
+
+    <para>
+      <application>libdrm</application> provides a user space library for
+      accessing the DRM, direct rendering manager, on operating systems that
+      support the ioctl interface. libdrm is a low-level library, typically 
used
+      by graphics drivers such as the Mesa DRI drivers, the X drivers, libva 
and
+      similar projects.
+    </para>
+
+    &lfs78_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&libdrm-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&libdrm-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &libdrm-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &libdrm-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &libdrm-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &libdrm-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">libdrm Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="xorg7-lib"/> (for Intel KMS API support required by Mesa) 
<!-- libpciaccess -->
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="DocBook"/>,
+      <xref linkend="docbook-xsl"/> and
+      <xref linkend="libxslt"/> (to build manual pages), and
+      <xref linkend="valgrind"/>
+    </para>
+
+    <para condition="html" role="usernotes">User Notes:
+      <ulink url="&blfs-wiki;/libdrm"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of libdrm</title>
+
+    <para>
+      Install <application>libdrm</application> by running the following
+      commands:
+    </para>
+
+<screen><userinput>sed -e "/pthread-stubs/d" \
+    -i configure.ac &amp;&amp;
+autoreconf -fiv     &amp;&amp;
+
+./configure --prefix=/usr --enable-udev &amp;&amp;
+
+make</userinput></screen>
+
+    <para>
+      To check the results, issue <command>make check</command>. Tests may hang
+      for unknown reasons. If nouveau threaded test hangs, you can disable it
+      with
+      <command>sed -i 's/^TESTS/#&amp;/' tests/nouveau/Makefile.in</command>.
+    </para>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>make install</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <para>
+      <command>sed -e "/pthread-stubs/d" -i configure.ac</command>:
+      This sed removes dependency on libpthread-stubs package
+      which is useless on Linux.
+    </para>
+
+    <para>
+      <parameter>--enable-udev</parameter>: This parameter enables support for 
using
+      <application>Udev</application> instead of <command>mknod</command>.
+    </para>
+<!--
+    <para>
+      <parameter>-\-disable-valgrind</parameter>: This parameter fixes a hard 
dependency on
+      <application>Valgrind</application>.
+    </para> -->
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>
+          None
+        </seg>
+        <seg>
+          libdrm_amdgpu.so, libdrm_intel.so, libdrm_nouveau.so,
+          libdrm_radeon.so, libdrm.so, and libkms.so
+        </seg>
+        <seg>
+          /usr/include/lib{drm,kms}
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="libdrm_amdgpu">
+        <term><filename class="libraryfile">libdrm_amdgpu.so</filename></term>
+        <listitem>
+          <para>
+            contains the AMDGPU specific Direct Rendering Manager functions.
+          </para>
+          <indexterm zone="libdrm libdrm_amdgpu">
+            <primary sortas="c-libdrm_amdgpu">libdrm_amdgpu.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libdrm_intel">
+        <term><filename class="libraryfile">libdrm_intel.so</filename></term>
+        <listitem>
+          <para>
+            contains the Intel specific Direct Rendering Manager
+            functions.
+          </para>
+          <indexterm zone="libdrm libdrm_intel">
+            <primary sortas="c-libdrm_intel">libdrm_intel.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libdrm_nouveau">
+        <term><filename class="libraryfile">libdrm_nouveau.so</filename></term>
+        <listitem>
+          <para>
+            contains the open source nVidia (Nouveau) specific Direct
+            Rendering Manager functions.
+          </para>
+          <indexterm zone="libdrm libdrm_nouveau">
+            <primary sortas="c-libdrm_nouveau">libdrm_nouveau.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libdrm-lib">
+        <term><filename class="libraryfile">libdrm.so</filename></term>
+        <listitem>
+          <para>
+            contains the Direct Rendering Manager API functions.
+          </para>
+          <indexterm zone="libdrm libdrm-lib">
+            <primary sortas="c-libdrm">libdrm.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libdrm_radeon">
+        <term><filename class="libraryfile">libdrm_radeon.so</filename></term>
+        <listitem>
+          <para>
+            contains the AMD Radeon specific Direct Rendering Manager
+            functions.
+          </para>
+          <indexterm zone="libdrm libdrm_radeon">
+            <primary sortas="c-libdrm_radeon">libdrm_radeon.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libkms">
+        <term><filename class="libraryfile">libkms.so</filename></term>
+        <listitem>
+          <para>
+            contains API functions for kernel mode setting abstraction.
+          </para>
+          <indexterm zone="libdrm libkms">
+            <primary sortas="c-libkms">libkms.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
-- 
http://lists.linuxfromscratch.org/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page

Reply via email to