Index: archive/colord.xml
===================================================================
--- archive/colord.xml	(revision 1accff3ccff5fba203a6c94bcaf7415759814d6a)
+++ archive/colord.xml	(revision 1accff3ccff5fba203a6c94bcaf7415759814d6a)
@@ -0,0 +1,346 @@
+<?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 colord-download-http
+           "https://www.freedesktop.org/software/colord/releases/colord-&colord-version;.tar.xz">
+  <!ENTITY colord-download-ftp  " ">
+  <!ENTITY colord-md5sum        "80b106ba18a43c7eeaf2d9a2b8c5725b">
+  <!ENTITY colord-size          "1.2 MB">
+  <!ENTITY colord-buildsize     "37 MB (without tests)">
+  <!ENTITY colord-time          "0.4 SBU (without tests)">
+]>
+
+<sect1 id="colord" xreflabel="Colord-&colord-version;">
+  <?dbhtml filename="colord.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>Colord-&colord-version;</title>
+
+  <indexterm zone="colord">
+    <primary sortas="a-Colord">Colord</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to Colord</title>
+
+    <para>
+      <application>Colord</application> is a system activated daemon that
+      maps devices to color profiles. It is used by
+      <application>GNOME Color Manager</application> for system integration
+      and use when there are no users logged in.
+    </para>
+
+    &lfs81_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&colord-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&colord-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &colord-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &colord-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &colord-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &colord-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Colord Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="dbus"/>,
+      <xref linkend="glib2"/>,
+      <xref linkend="lcms2"/>, and
+      <xref linkend="sqlite"/>
+    </para>
+
+    <bridgehead renderas="sect4">Required (for the tests)</bridgehead>
+    <para role="required">
+      <xref linkend="valgrind"/>
+    </para>
+
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="gobject-introspection"/>,
+      <xref linkend="libgudev"/>,
+      <xref linkend="libgusb"/>,
+      <xref linkend="polkit"/>,<phrase revision="sysv"> and</phrase>
+      <phrase revision="systemd"><xref linkend="systemd"/>, and</phrase>
+      <xref linkend="vala"/>
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="docbook-utils"/>,
+      <xref linkend="gnome-desktop"/> and
+      <xref linkend="colord-gtk"/> (to build the example tools),
+      <xref linkend="gtk-doc"/>,
+      <xref linkend="libxslt"/>,
+      <xref linkend="sane"/>,
+      <ulink url="http://www.argyllcms.com/">ArgllCMS</ulink>, and
+      <ulink url="http://bash-completion.alioth.debian.org/">Bash Completion</ulink>,
+    </para>
+
+    <para condition="html" role="usernotes">User Notes:
+      <ulink url="&blfs-wiki;/colord"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Colord</title>
+
+    <para>
+      There should be a dedicated user and group to take control
+      of the <command>colord</command> daemon after it is started.
+      Issue the following commands as the
+      <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>groupadd -g 71 colord &amp;&amp;
+useradd -c "Color Daemon Owner" -d /var/lib/colord -u 71 \
+        -g colord -s /bin/false colord</userinput></screen>
+
+    <para>
+      Install <application>Colord</application> by running the following
+      commands:
+    </para>
+
+<screen revision="sysv"><userinput>./configure --prefix=/usr                \
+            --sysconfdir=/etc            \
+            --localstatedir=/var         \
+            --with-daemon-user=colord    \
+            --enable-vala                \
+            --enable-systemd-login=no    \
+            --disable-argyllcms-sensor   \
+            --disable-bash-completion    \
+            --disable-static             \
+            --with-systemdsystemunitdir=no &amp;&amp;
+make</userinput></screen>
+
+<screen revision="systemd"><userinput>./configure --prefix=/usr                \
+            --sysconfdir=/etc            \
+            --localstatedir=/var         \
+            --with-daemon-user=colord    \
+            --enable-vala                \
+            --disable-argyllcms-sensor   \
+            --disable-bash-completion    \
+            --disable-static &amp;&amp;
+make</userinput></screen>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>make install</userinput></screen>
+
+    <para>
+      To test the results, issue: <command>make -k check</command>. For unknown
+      reasons, some tests may fail. Note that the system-wide
+      <application>D-Bus</application> daemon must be running or the tests
+      will fail.
+    </para>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <para>
+      <parameter>--with-daemon-user=colord</parameter>: This
+      switch is used so the <command>colord</command> daemon
+      will run as an unprivileged user instead of
+      <systemitem class="username">root</systemitem> user.
+    </para>
+
+    <para>
+      <parameter>--enable-vala</parameter>: This switch enables
+      building of the Vala bindings. Remove if you don't
+      have <xref linkend="vala"/> installed.
+    </para>
+
+    <para revision="sysv">
+      <parameter>--enable-systemd-login=no</parameter>: This parameter fixes
+      building without <application>systemd</application>, which is not part
+      of LFS/BLFS. If you use <application>systemd</application>,
+      replace "no" by "yes".
+    </para>
+
+    <para>
+      <parameter>--disable-argyllcms-sensor</parameter>: Disables <ulink
+      url="http://www.argyllcms.com/">ArgllCMS</ulink> sensor driver.
+    </para>
+
+    <para>
+      <parameter>--disable-bash-completion</parameter>: This switch
+      disables <application>Bash Completion</application>
+      support for <application>Colord</application> apps.
+    </para>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/static-libraries.xml"/>
+
+    <para revision="sysv">
+      <parameter>--with-systemdsystemunitdir=no</parameter>: Disables
+      attempting to build with systemd libraries.
+    </para>
+
+    <para>
+      <option>--enable-gtk-doc</option>: Use this switch if
+      <application>GTK-Doc</application> is installed and you wish to build
+      and install the API documentation.
+    </para>
+
+    <para>
+      <option>--disable-gusb</option>: Use this switch if you don't have
+      <application>libgusb</application> installed.
+    </para>
+
+    <para>
+      <option>--disable-udev</option>: Use this switch if you don't have GUdev
+      installed.
+    </para>
+
+    <para>
+      <option>--disable-polkit</option>: Use this switch if you don't have
+      <application>Polkit</application> installed.
+    </para>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>
+          cd-create-profile, cd-fix-profile, cd-iccdump, cd-it8, and colormgr
+        </seg>
+        <seg>
+          libcolord.so, libcolordprivate.so, and libcolorhug.so
+        </seg>
+        <seg>
+          /usr/include/colord-1,
+          /usr/lib/colord-{plugins,sensors},
+          /usr/share/color{,d},
+          /usr/share/gtk-doc/html/colord, and
+          /var/lib/colord
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="cd-create-profile">
+        <term><command>cd-create-profile</command></term>
+        <listitem>
+          <para>
+            is a Color Manager Profile Creation Tool.
+          </para>
+          <indexterm zone="colord cd-create-profile">
+            <primary sortas="b-cd-create-profile">cd-create-profile</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="cd-fix-profile">
+        <term><command>cd-fix-profile</command></term>
+        <listitem>
+          <para>
+            is a tool used to fix metadata in ICC profiles.
+          </para>
+          <indexterm zone="colord cd-fix-profile">
+            <primary sortas="b-cd-fix-profile">cd-fix-profile</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="cd-iccdump">
+        <term><command>cd-iccdump</command></term>
+        <listitem>
+          <para>
+            dumps the contents of an ICC profile as human readable text.
+          </para>
+          <indexterm zone="colord cd-iccdump">
+            <primary sortas="b-cd-iccdump">cd-iccdump</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="cd-it8">
+        <term><command>cd-it8</command></term>
+        <listitem>
+          <para>
+            is a Color Manager Testing Tool.
+          </para>
+          <indexterm zone="colord cd-it8">
+            <primary sortas="b-cd-it8">cd-it8</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="colormgr">
+        <term><command>colormgr</command></term>
+        <listitem>
+          <para>
+            is a text-mode program that allows you to interact with colord
+            on the command line.
+          </para>
+          <indexterm zone="colord colormgr">
+            <primary sortas="b-colormgr">colormgr</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libcolord">
+        <term><filename class="libraryfile">libcolord.so</filename></term>
+        <listitem>
+          <para>
+            contains the <application>Colord</application> API functions.
+          </para>
+          <indexterm zone="colord libcolord">
+            <primary sortas="c-libcolord">libcolord.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: general.ent
===================================================================
--- general.ent	(revision ac1fadc59c06550c282428e512bc697ae63928f7)
+++ general.ent	(revision 1accff3ccff5fba203a6c94bcaf7415759814d6a)
@@ -1,5 +1,5 @@
 <!-- $LastChangedBy$ $Date$ -->
 
-<!ENTITY day          "13">                   <!-- Always 2 digits -->
+<!ENTITY day          "14">                   <!-- Always 2 digits -->
 <!ENTITY month        "10">                   <!-- Always 2 digits -->
 <!ENTITY year         "2017">
@@ -7,5 +7,5 @@
 <!ENTITY copyholder   "The BLFS Development Team">
 <!ENTITY version      "&year;-&month;-&day;">
-<!ENTITY releasedate  "October 13th, &year;">
+<!ENTITY releasedate  "October 14th, &year;">
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
 <!ENTITY blfs-version "svn">                  <!-- svn|[release #] -->
Index: general/sysutils/colord.xml
===================================================================
--- general/sysutils/colord.xml	(revision ac1fadc59c06550c282428e512bc697ae63928f7)
+++ general/sysutils/colord.xml	(revision 1accff3ccff5fba203a6c94bcaf7415759814d6a)
@@ -5,14 +5,13 @@
   %general-entities;
 
-  <!ENTITY colord-download-http
-           "https://www.freedesktop.org/software/colord/releases/colord-&colord-version;.tar.xz">
+  <!ENTITY colord-download-http "https://www.freedesktop.org/software/colord/releases/colord-&colord-version;.tar.xz">
   <!ENTITY colord-download-ftp  " ">
-  <!ENTITY colord-md5sum        "80b106ba18a43c7eeaf2d9a2b8c5725b">
+  <!ENTITY colord-md5sum        "a8e7fcf0a45383ca7a65cef91ca5e019">
   <!ENTITY colord-size          "1.2 MB">
-  <!ENTITY colord-buildsize     "37 MB (without tests)">
-  <!ENTITY colord-time          "0.4 SBU (without tests)">
+  <!ENTITY colord-buildsize     "44 MB (with tests)">
+  <!ENTITY colord-time          "0.7 SBU (with tests)">
 ]>
 
-<sect1 id="colord" xreflabel="Colord-&colord-version;">
+<sect1 id="colord" xreflabel="colord-&colord-version;" revision="systemd">
   <?dbhtml filename="colord.html"?>
 
@@ -25,5 +24,5 @@
 
   <indexterm zone="colord">
-    <primary sortas="a-Colord">Colord</primary>
+    <primary sortas="a-colord">Colord</primary>
   </indexterm>
 
@@ -32,8 +31,8 @@
 
     <para>
-      <application>Colord</application> is a system activated daemon that
-      maps devices to color profiles. It is used by
+      <application>Colord</application> is a system service that makes it easy
+      to manage, install, and generate color profiles. It is used mainly by
       <application>GNOME Color Manager</application> for system integration
-      and use when there are no users logged in.
+      and use when no users are logged in.
     </para>
 
@@ -84,9 +83,4 @@
     </para>
 
-    <bridgehead renderas="sect4">Required (for the tests)</bridgehead>
-    <para role="required">
-      <xref linkend="valgrind"/>
-    </para>
-
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
@@ -94,6 +88,6 @@
       <xref linkend="libgudev"/>,
       <xref linkend="libgusb"/>,
-      <xref linkend="polkit"/>,<phrase revision="sysv"> and</phrase>
-      <phrase revision="systemd"><xref linkend="systemd"/>, and</phrase>
+      <xref linkend="polkit"/>,
+      <xref linkend="systemd"/>, and
       <xref linkend="vala"/>
     </para>
@@ -107,10 +101,10 @@
       <xref linkend="libxslt"/>,
       <xref linkend="sane"/>,
-      <ulink url="http://www.argyllcms.com/">ArgllCMS</ulink>, and
-      <ulink url="http://bash-completion.alioth.debian.org/">Bash Completion</ulink>,
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/colord"/>
+      <ulink url="http://www.argyllcms.com/">ArgLLCMS</ulink>, and
+      <ulink url="https://github.com/scop/bash-completion/">Bash Completion</ulink>
+    </para>
+
+    <para condition="html" role="usernotes">
+      User Notes: <ulink url="&blfs-wiki;/colord"/>
     </para>
   </sect2>
@@ -118,9 +112,16 @@
   <sect2 role="installation">
     <title>Installation of Colord</title>
-
-    <para>
-      There should be a dedicated user and group to take control
-      of the <command>colord</command> daemon after it is started.
-      Issue the following commands as the
+    
+    <warning>
+      <para>
+        This package will overwrite any previous version of Colord that you
+        may have on your system. This package is a development version
+        and is only intended to be used by gnome-color-manager at this time.
+      </para>
+    </warning>
+
+    <para>
+      There should be a dedicated user and group to take control of the colord
+      daemon after it has started. Issue the following commands as the
       <systemitem class="username">root</systemitem> user:
     </para>
@@ -135,23 +136,15 @@
     </para>
 
-<screen revision="sysv"><userinput>./configure --prefix=/usr                \
-            --sysconfdir=/etc            \
-            --localstatedir=/var         \
-            --with-daemon-user=colord    \
-            --enable-vala                \
-            --enable-systemd-login=no    \
-            --disable-argyllcms-sensor   \
-            --disable-bash-completion    \
-            --disable-static             \
-            --with-systemdsystemunitdir=no &amp;&amp;
-make</userinput></screen>
-
-<screen revision="systemd"><userinput>./configure --prefix=/usr                \
-            --sysconfdir=/etc            \
-            --localstatedir=/var         \
-            --with-daemon-user=colord    \
-            --enable-vala                \
-            --disable-argyllcms-sensor   \
-            --disable-bash-completion    \
+<screen><userinput>./configure --prefix=/usr              \
+            --sysconfdir=/etc          \
+            --localstatedir=/var       \
+            --with-daemon-user=colord  \
+            --enable-vala              \
+            --enable-daemon            \
+            --enable-session-helper    \
+            --enable-libcolordcompat   \
+            --disable-rpath            \
+            --disable-argyllcms-sensor \
+            --disable-bash-completion  \
             --disable-static &amp;&amp;
 make</userinput></screen>
@@ -164,8 +157,9 @@
 
     <para>
-      To test the results, issue: <command>make -k check</command>. For unknown
-      reasons, some tests may fail. Note that the system-wide
-      <application>D-Bus</application> daemon must be running or the tests
-      will fail.
+      To test the results, issue: <command>make -k check</command>.
+      At least one test, 
+      <filename>./lib/colord/.libs/lt-cd-test-daemon</filename>, may fail.
+      The test suite must be run after the package is installed, and the
+      system-wide D-Bus Daemon must be running.
     </para>
 
@@ -176,32 +170,46 @@
 
     <para>
-      <parameter>--with-daemon-user=colord</parameter>: This
-      switch is used so the <command>colord</command> daemon
-      will run as an unprivileged user instead of
+      <parameter>--with-daemon-user=colord</parameter>: This switch is used
+      so the colord daemon will run as an unprivileged user instead of the
       <systemitem class="username">root</systemitem> user.
     </para>
 
     <para>
-      <parameter>--enable-vala</parameter>: This switch enables
-      building of the Vala bindings. Remove if you don't
-      have <xref linkend="vala"/> installed.
-    </para>
-
-    <para revision="sysv">
-      <parameter>--enable-systemd-login=no</parameter>: This parameter fixes
-      building without <application>systemd</application>, which is not part
-      of LFS/BLFS. If you use <application>systemd</application>,
-      replace "no" by "yes".
-    </para>
-
-    <para>
-      <parameter>--disable-argyllcms-sensor</parameter>: Disables <ulink
-      url="http://www.argyllcms.com/">ArgllCMS</ulink> sensor driver.
-    </para>
-
-    <para>
-      <parameter>--disable-bash-completion</parameter>: This switch
-      disables <application>Bash Completion</application>
-      support for <application>Colord</application> apps.
+      <parameter>--enable-vala</parameter>: This switch enables building the
+      <application>Vala</application> bindings. Remove if you don't have
+      <xref linkend="vala"/> installed.
+    </para>
+
+    <para>
+      <parameter>--enable-daemon</parameter>: This switch enables building
+      the <application>Colord</application> daemon.
+    </para>
+
+    <para>
+      <parameter>--enable-session-helper</parameter>: This switch enables
+      building the session helper for <application>Colord</application>.
+    </para>
+
+    <para>
+      <parameter>--enable-libcolordcompat</parameter>: This switch enables
+      building a compatibility library for older packages that use
+      <application>Colord</application>.
+    </para>
+
+    <para>
+      <parameter>--disable-rpath</parameter>: This switch prevents the build
+      process from hard-coding library paths into its executables.
+    </para>
+
+    <para>
+      <parameter>--disable-argyllcms-sensor</parameter>: This switch disables
+      the ArgLLCMS sensor driver. Omit if you have
+      <ulink url="http://www.argyllcms.com/">ArgLLCMS</ulink> installed
+      and wish to use it.
+    </para>
+
+    <para>
+      <parameter>--disable-bash-completion</parameter>: This switch disables
+      Bash Completion support for Colord applications.
     </para>
 
@@ -209,14 +217,6 @@
       href="../../xincludes/static-libraries.xml"/>
 
-    <para revision="sysv">
-      <parameter>--with-systemdsystemunitdir=no</parameter>: Disables
-      attempting to build with systemd libraries.
-    </para>
-
-    <para>
-      <option>--enable-gtk-doc</option>: Use this switch if
-      <application>GTK-Doc</application> is installed and you wish to build
-      and install the API documentation.
-    </para>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../xincludes/gtk-doc-rebuild.xml"/>
 
     <para>
@@ -226,11 +226,11 @@
 
     <para>
-      <option>--disable-udev</option>: Use this switch if you don't have GUdev
-      installed.
+      <option>--disable-udev</option>: Use this switch if you don't have
+      <application>libgudev</application> installed.
     </para>
 
     <para>
       <option>--disable-polkit</option>: Use this switch if you don't have
-      <application>Polkit</application> installed.
+      <application>polkit</application> installed.
     </para>
 
@@ -247,13 +247,20 @@
       <seglistitem>
         <seg>
-          cd-create-profile, cd-fix-profile, cd-iccdump, cd-it8, and colormgr
+          cd-create-profile,
+          cd-fix-profile,
+          cd-iccdump,
+          cd-it8, and
+          colormgr
         </seg>
         <seg>
-          libcolord.so, libcolordprivate.so, and libcolorhug.so
+          libcolord.so,
+          libcolordcompat.so,
+          libcolordprivate.so, and
+          libcolorhug.so
         </seg>
         <seg>
           /usr/include/colord-1,
           /usr/lib/colord-{plugins,sensors},
-          /usr/share/color{,d},
+          /usr/share/color{d},
           /usr/share/gtk-doc/html/colord, and
           /var/lib/colord
@@ -267,9 +274,13 @@
       <?dbhtml list-presentation="table"?>
 
+      <!-- If the program or library name conflicts (is the same) as the
+      package name, add -prog or -lib to the varlistentry entity id
+      and the 2nd entry of the indexterm zone entity -->
+
       <varlistentry id="cd-create-profile">
         <term><command>cd-create-profile</command></term>
         <listitem>
           <para>
-            is a Color Manager Profile Creation Tool.
+            is the Color Manager Profile Creation Tool.
           </para>
           <indexterm zone="colord cd-create-profile">
@@ -307,5 +318,5 @@
         <listitem>
           <para>
-            is a Color Manager Testing Tool.
+            is the Color Manager Testing Tool.
           </para>
           <indexterm zone="colord cd-it8">
@@ -319,6 +330,6 @@
         <listitem>
           <para>
-            is a text-mode program that allows you to interact with colord
-            on the command line.
+            is a text-mode program that allows you to interact with colord on
+            the command line.
           </para>
           <indexterm zone="colord colormgr">
@@ -328,5 +339,5 @@
       </varlistentry>
 
-      <varlistentry id="libcolord">
+      <varlistentry id="libcolord.so">
         <term><filename class="libraryfile">libcolord.so</filename></term>
         <listitem>
@@ -334,13 +345,48 @@
             contains the <application>Colord</application> API functions.
           </para>
-          <indexterm zone="colord libcolord">
-            <primary sortas="c-libcolord">libcolord.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
+          <indexterm zone="colord libcolord.so">
+            <primary sortas="c-libcolord.so">libcolord.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libcolordcompat.so">
+        <term><filename class="libraryfile">libcolordcompat.so</filename></term>
+        <listitem>
+          <para>
+            contains legacy API functions for compatibility with older
+            applications.
+          </para>
+          <indexterm zone="colord libcolordcompat.so">
+            <primary sortas="c-libcolordcompat.so">libcolordcompat.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libcolordprivate.so">
+        <term><filename class="libraryfile">libcolordprivate.so</filename></term>
+        <listitem>
+          <para>
+            contains internal API functions for the programs included with
+            <application>Colord</application>.
+          </para>
+          <indexterm zone="colord libcolordprivate.so">
+            <primary sortas="c-libcolordprivate.so">libcolordprivate.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libcolorhug.so">
+        <term><filename class="libraryfile">libcolorhug.so</filename></term>
+        <listitem>
+          <para>
+            contains a simple display hardware colorimiter.
+          </para>
+          <indexterm zone="colord libcolorhug.so">
+            <primary sortas="c-libcolorhug.so">libcolorhug.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
     </variablelist>
-
   </sect2>
-
 </sect1>
Index: neral/sysutils/colord1.xml
===================================================================
--- general/sysutils/colord1.xml	(revision ac1fadc59c06550c282428e512bc697ae63928f7)
+++ 	(revision )
@@ -1,392 +1,0 @@
-<?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 colord1-download-http "https://www.freedesktop.org/software/colord/releases/colord-&colord1-version;.tar.xz">
-  <!ENTITY colord1-download-ftp  " ">
-  <!ENTITY colord1-md5sum        "a8e7fcf0a45383ca7a65cef91ca5e019">
-  <!ENTITY colord1-size          "1.2 MB">
-  <!ENTITY colord1-buildsize     "44 MB (with tests)">
-  <!ENTITY colord1-time          "0.7 SBU (with tests)">
-]>
-
-<sect1 id="colord1" xreflabel="colord-&colord1-version;" revision="systemd">
-  <?dbhtml filename="colord1.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>Colord-&colord1-version;</title>
-
-  <indexterm zone="colord1">
-    <primary sortas="a-colord1">Colord</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Colord</title>
-
-    <para>
-      <application>Colord</application> is a system service that makes it easy
-      to manage, install, and generate color profiles. It is used mainly by
-      <application>GNOME Color Manager</application> for system integration
-      and use when no users are logged in.
-    </para>
-
-    &lfs81_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&colord1-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&colord1-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &colord1-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &colord1-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &colord1-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &colord1-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Colord Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="dbus"/>,
-      <xref linkend="glib2"/>,
-      <xref linkend="lcms2"/>, and
-      <xref linkend="sqlite"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="gobject-introspection"/>,
-      <xref linkend="libgudev"/>,
-      <xref linkend="libgusb"/>,
-      <xref linkend="polkit"/>,
-      <xref linkend="systemd"/>, and
-      <xref linkend="vala"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="docbook-utils"/>,
-      <xref linkend="gnome-desktop"/> and
-      <xref linkend="colord-gtk"/> (to build the example tools),
-      <xref linkend="gtk-doc"/>,
-      <xref linkend="libxslt"/>,
-      <xref linkend="sane"/>,
-      <ulink url="http://www.argyllcms.com/">ArgLLCMS</ulink>, and
-      <ulink url="https://github.com/scop/bash-completion/">Bash Completion</ulink>
-    </para>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/colord1"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Colord</title>
-    
-    <warning>
-      <para>
-        This package will overwrite any previous version of Colord that you
-        may have on your system. This package is a development version
-        and is only intended to be used by gnome-color-manager at this time.
-      </para>
-    </warning>
-
-    <para>
-      There should be a dedicated user and group to take control of the colord
-      daemon after it has started. Issue the following commands as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>groupadd -g 71 colord &amp;&amp;
-useradd -c "Color Daemon Owner" -d /var/lib/colord -u 71 \
-        -g colord -s /bin/false colord</userinput></screen>
-
-    <para>
-      Install <application>Colord</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr              \
-            --sysconfdir=/etc          \
-            --localstatedir=/var       \
-            --with-daemon-user=colord  \
-            --enable-vala              \
-            --enable-daemon            \
-            --enable-session-helper    \
-            --enable-libcolordcompat   \
-            --disable-rpath            \
-            --disable-argyllcms-sensor \
-            --disable-bash-completion  \
-            --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make -k check</command>.
-      At least one test, 
-      <filename>./lib/colord/.libs/lt-cd-test-daemon</filename>, may fail.
-      The test suite must be run after the package is installed, and the
-      system-wide D-Bus Daemon must be running.
-    </para>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>--with-daemon-user=colord</parameter>: This switch is used
-      so the colord daemon will run as an unprivileged user instead of the
-      <systemitem class="username">root</systemitem> user.
-    </para>
-
-    <para>
-      <parameter>--enable-vala</parameter>: This switch enables building the
-      <application>Vala</application> bindings. Remove if you don't have
-      <xref linkend="vala"/> installed.
-    </para>
-
-    <para>
-      <parameter>--enable-daemon</parameter>: This switch enables building
-      the <application>Colord</application> daemon.
-    </para>
-
-    <para>
-      <parameter>--enable-session-helper</parameter>: This switch enables
-      building the session helper for <application>Colord</application>.
-    </para>
-
-    <para>
-      <parameter>--enable-libcolordcompat</parameter>: This switch enables
-      building a compatibility library for older packages that use
-      <application>Colord</application>.
-    </para>
-
-    <para>
-      <parameter>--disable-rpath</parameter>: This switch prevents the build
-      process from hard-coding library paths into its executables.
-    </para>
-
-    <para>
-      <parameter>--disable-argyllcms-sensor</parameter>: This switch disables
-      the ArgLLCMS sensor driver. Omit if you have
-      <ulink url="http://www.argyllcms.com/">ArgLLCMS</ulink> installed
-      and wish to use it.
-    </para>
-
-    <para>
-      <parameter>--disable-bash-completion</parameter>: This switch disables
-      Bash Completion support for Colord applications.
-    </para>
-
-    <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"/>
-
-    <para>
-      <option>--disable-gusb</option>: Use this switch if you don't have
-      <application>libgusb</application> installed.
-    </para>
-
-    <para>
-      <option>--disable-udev</option>: Use this switch if you don't have
-      <application>libgudev</application> installed.
-    </para>
-
-    <para>
-      <option>--disable-polkit</option>: Use this switch if you don't have
-      <application>polkit</application> installed.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          cd-create-profile,
-          cd-fix-profile,
-          cd-iccdump,
-          cd-it8, and
-          colormgr
-        </seg>
-        <seg>
-          libcolord.so,
-          libcolordcompat.so,
-          libcolordprivate.so, and
-          libcolorhug.so
-        </seg>
-        <seg>
-          /usr/include/colord-1,
-          /usr/lib/colord-{plugins,sensors},
-          /usr/share/color{d},
-          /usr/share/gtk-doc/html/colord, and
-          /var/lib/colord
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <!-- If the program or library name conflicts (is the same) as the
-      package name, add -prog or -lib to the varlistentry entity id
-      and the 2nd entry of the indexterm zone entity -->
-
-      <varlistentry id="cd-create-profile1">
-        <term><command>cd-create-profile</command></term>
-        <listitem>
-          <para>
-            is the Color Manager Profile Creation Tool.
-          </para>
-          <indexterm zone="colord1 cd-create-profile">
-            <primary sortas="b-cd-create-profile1">cd-create-profile</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="cd-fix-profile1">
-        <term><command>cd-fix-profile</command></term>
-        <listitem>
-          <para>
-            is a tool used to fix metadata in ICC profiles.
-          </para>
-          <indexterm zone="colord1 cd-fix-profile">
-            <primary sortas="b-cd-fix-profile1">cd-fix-profile</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="cd-iccdump1">
-        <term><command>cd-iccdump</command></term>
-        <listitem>
-          <para>
-            dumps the contents of an ICC profile as human readable text.
-          </para>
-          <indexterm zone="colord1 cd-iccdump">
-            <primary sortas="b-cd-iccdump1">cd-iccdump</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="cd-it81">
-        <term><command>cd-it8</command></term>
-        <listitem>
-          <para>
-            is the Color Manager Testing Tool.
-          </para>
-          <indexterm zone="colord1 cd-it8">
-            <primary sortas="b-cd-it81">cd-it8</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="colormgr1">
-        <term><command>colormgr</command></term>
-        <listitem>
-          <para>
-            is a text-mode program that allows you to interact with colord on
-            the command line.
-          </para>
-          <indexterm zone="colord1 colormgr">
-            <primary sortas="b-colormgr1">colormgr</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libcolord.so">
-        <term><filename class="libraryfile">libcolord.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>Colord</application> API functions.
-          </para>
-          <indexterm zone="colord1 libcolord.so">
-            <primary sortas="c-libcolord.so1">libcolord.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libcolordcompat.so">
-        <term><filename class="libraryfile">libcolordcompat.so</filename></term>
-        <listitem>
-          <para>
-            contains legacy API functions for compatibility with older
-            applications.
-          </para>
-          <indexterm zone="colord1 libcolordcompat.so">
-            <primary sortas="c-libcolordcompat.so1">libcolordcompat.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libcolordprivate.so">
-        <term><filename class="libraryfile">libcolordprivate.so</filename></term>
-        <listitem>
-          <para>
-            contains internal API functions for the programs included with
-            <application>Colord</application>.
-          </para>
-          <indexterm zone="colord1 libcolordprivate.so">
-            <primary sortas="c-libcolordprivate.so1">libcolordprivate.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libcolorhug.so">
-        <term><filename class="libraryfile">libcolorhug.so</filename></term>
-        <listitem>
-          <para>
-            contains a simple display hardware colorimiter.
-          </para>
-          <indexterm zone="colord libcolorhug.so">
-            <primary sortas="c-libcolorhug.so1">libcolorhug.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-</sect1>
Index: general/sysutils/sysutils.xml
===================================================================
--- general/sysutils/sysutils.xml	(revision ac1fadc59c06550c282428e512bc697ae63928f7)
+++ general/sysutils/sysutils.xml	(revision 1accff3ccff5fba203a6c94bcaf7415759814d6a)
@@ -25,5 +25,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bluez.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="colord.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="colord1.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="cpio.xml"/>
 
Index: gnome/applications/gnome-color-manager.xml
===================================================================
--- gnome/applications/gnome-color-manager.xml	(revision ac1fadc59c06550c282428e512bc697ae63928f7)
+++ gnome/applications/gnome-color-manager.xml	(revision 1accff3ccff5fba203a6c94bcaf7415759814d6a)
@@ -79,5 +79,5 @@
     <para role="required">
       <xref linkend="colord-gtk"/>,
-      <xref linkend="colord1"/>,
+      <xref linkend="colord"/>,
       <xref linkend="gtk3"/>,
       <xref linkend="itstool"/>,
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision ac1fadc59c06550c282428e512bc697ae63928f7)
+++ introduction/welcome/changelog.xml	(revision 1accff3ccff5fba203a6c94bcaf7415759814d6a)
@@ -43,4 +43,14 @@
 -->
     <listitem>
+      <para>October 14th, 2017</para>
+      <itemizedlist>
+        <listitem>
+          <para>[dj] - Remove colord-1.2. Fixes
+          <ulink url="&blfs-ticket-root;9642">#9642</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>October 13th, 2017</para>
       <itemizedlist>
Index: packages.ent
===================================================================
--- packages.ent	(revision ac1fadc59c06550c282428e512bc697ae63928f7)
+++ packages.ent	(revision 1accff3ccff5fba203a6c94bcaf7415759814d6a)
@@ -254,6 +254,5 @@
 <!ENTITY autofs-version               "5.1.3">
 <!ENTITY bluez-version                "5.47">
-<!ENTITY colord-version               "1.2.12">    <!-- Even minors only -->
-<!ENTITY colord1-version              "1.3.5">     <!-- See ticket #8061 -->
+<!ENTITY colord-version               "1.3.5">
 <!ENTITY cpio-version                 "2.12">
 <!ENTITY cups-pk-helper-version       "0.2.6">
