Index: general.ent
===================================================================
--- general.ent	(revision 4849cdc412bcdd44bbddd037f68ff26a6fc55b00)
+++ general.ent	(revision 23d3543cc8c665f26aba0bf01604687b435e22b6)
@@ -4,5 +4,5 @@
 -->
 
-<!ENTITY day          "12">                   <!-- Always 2 digits -->
+<!ENTITY day          "17">                   <!-- Always 2 digits -->
 <!ENTITY month        "05">                   <!-- Always 2 digits -->
 <!ENTITY year         "2013">
@@ -10,5 +10,5 @@
 <!ENTITY copyholder   "The BLFS Development Team">
 <!ENTITY version      "&year;-&month;-&day;">
-<!ENTITY releasedate  "May 12th, &year;">
+<!ENTITY releasedate  "May 17th, &year;">
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
 <!ENTITY blfs-version "svn">                  <!-- svn|[release #] -->
@@ -229,5 +229,5 @@
 
 <!ENTITY iso-codes-version            "3.40">
-<!ENTITY json-c-version               "0.10">
+<!ENTITY json-c-version               "0.11">
 <!ENTITY json-glib-version            "0.16.0">
 <!ENTITY keyutils-version             "1.5.5">
@@ -238,5 +238,5 @@
 <!ENTITY libdaemon-version            "0.14">
 <!ENTITY libdbusmenu-qt-version       "0.9.2">
-<!ENTITY libdrm-version               "2.4.44">
+<!ENTITY libdrm-version               "2.4.45">
 <!ENTITY libesmtp-version             "1.0.6">
 <!ENTITY libffi-version               "3.0.13">
@@ -246,5 +246,5 @@
 <!ENTITY libgsf-version               "1.14.26">
 <!ENTITY libgusb-version              "0.1.6">
-<!ENTITY libical-version              "0.48">
+<!ENTITY libical-version              "1.0">
 <!ENTITY libidl-version               "0.8.14">
 <!ENTITY libidn-version               "1.25">
@@ -335,5 +335,5 @@
 <!ENTITY autofs-version               "5.0.7">
 <!ENTITY bluez-version                "4.101">
-<!ENTITY colord-version               "0.1.34">
+<!ENTITY colord-version               "1.0.0">
 <!ENTITY cpio-version                 "2.11">
 <!ENTITY dbus-version                 "1.6.10">
@@ -370,5 +370,5 @@
 <!ENTITY bazaar-version               "2.5.0">
 <!ENTITY check-version                "0.9.10">
-<!ENTITY cmake-version                "2.8.10.2">
+<!ENTITY cmake-version                "2.8.11">
 <!ENTITY cvs-version                  "1.11.23">
 <!ENTITY dejagnu-version              "1.5.1">
@@ -391,6 +391,6 @@
 <!ENTITY pkgconfig-version            "0.28">
 <!ENTITY python2-version              "2.7.5">
-<!ENTITY python3-version              "3.3.1">
-<!ENTITY ruby-version                 "1.9.3-p392">
+<!ENTITY python3-version              "3.3.2">
+<!ENTITY ruby-version                 "1.9.3-p429">
 <!ENTITY slang-version                "2.2.4">
 <!ENTITY subversion-version           "1.7.8">
@@ -578,5 +578,5 @@
 <!ENTITY startup-notification-version "0.12">
 <!ENTITY webkitgtk-version            "1.10.2">
-<!ENTITY xulrunner-version            "20.0.1">
+<!ENTITY xulrunner-version            "21.0">
 
 <!ENTITY gtk2-libdir                  "2.0/2.10.0">
@@ -760,5 +760,5 @@
 
 <!-- Xfce apps -->
-<!ENTITY midori-version               "0.5.0">
+<!ENTITY midori-version               "0.5.1">
 <!ENTITY parole-version               "0.5.0">
 <!ENTITY gtksourceview2-version       "2.10.5">
@@ -798,5 +798,5 @@
 <!ENTITY pidgin-version               "2.10.7">
 <!ENTITY rox-filer-version            "2.11">
-<!ENTITY thunderbird-version          "17.0.5">
+<!ENTITY thunderbird-version          "17.0.6">
 <!ENTITY transmission-version         "2.77">
 <!ENTITY xchat-version                "2.8.8">
@@ -870,5 +870,5 @@
 <!ENTITY audacious-version            "3.3.3">
 <!ENTITY audacious-plugins-version    "3.3.3">
-<!ENTITY amarok-version               "2.7.0">
+<!ENTITY amarok-version               "2.7.1">
 <!ENTITY gvolwheel-version            "1.0">
 
Index: general/genlib/json-c.xml
===================================================================
--- general/genlib/json-c.xml	(revision 4849cdc412bcdd44bbddd037f68ff26a6fc55b00)
+++ general/genlib/json-c.xml	(revision 23d3543cc8c665f26aba0bf01604687b435e22b6)
@@ -5,9 +5,9 @@
   %general-entities;
 
-  <!ENTITY json-c-download-http "https://github.com/downloads/json-c/json-c/json-c-&json-c-version;.tar.gz">
+  <!ENTITY json-c-download-http "https://s3.amazonaws.com/json-c_releases/releases/json-c-&json-c-version;.tar.gz">
   <!ENTITY json-c-download-ftp  " ">
-  <!ENTITY json-c-md5sum        "a4edc79410eb894f08d7d52ca9f88732">
-  <!ENTITY json-c-size          "380 KB">
-  <!ENTITY json-c-buildsize     "3.5 MB">
+  <!ENTITY json-c-md5sum        "aa02367d2f7a830bf1e3376f77881e98">
+  <!ENTITY json-c-size          "548 KB">
+  <!ENTITY json-c-buildsize     "5.0 MB">
   <!ENTITY json-c-time          "less than 0.1 SBU">
 ]>
@@ -37,5 +37,5 @@
     </para>
 
-    &lfs72_checked;
+    &lfs73_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -86,9 +86,5 @@
     </para>
 
-<screen><userinput>sed -e 's/json_object.c/json_object.c json_object_iterator.c/'    \
-    -e 's/json_object.h/json_object.h json_object_iterator.h/'    \
-    -e 's/json_object.lo/json_object.lo json_object_iterator.lo/' \
-    -i Makefile.in &amp;&amp;
-./configure --prefix=/usr --disable-static &amp;&amp;
+<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
 make</userinput></screen>
 
@@ -107,9 +103,4 @@
     <title>Command Explanations</title>
 
-    <para>
-      <command>sed -e 's/json_object...</command>: This <command>sed</command>
-      make sure that all the necessary headers are installed correctly.
-    </para>
-
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../../xincludes/static-libraries.xml"/>
@@ -122,6 +113,6 @@
     <segmentedlist>
       <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directory</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
@@ -130,8 +121,9 @@
         </seg>
         <seg>
-          libjson.so
+          libjson-c.so and libjson.so
         </seg>
         <seg>
-          /usr/include/json
+          /usr/include/json and
+          /usr/include/json-c
         </seg>
       </seglistitem>
@@ -147,8 +139,20 @@
         <listitem>
           <para>
-            contains <application>JSON-C</application> API functions.
+            contains the <application>JSON-C</application> API functions.
           </para>
           <indexterm zone="json-c libjson">
             <primary sortas="c-libjson">libjson.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libjson-c">
+        <term><filename class="libraryfile">libjson-c.so</filename></term>
+        <listitem>
+          <para>
+            contains the <application>JSON-C</application> API functions.
+          </para>
+          <indexterm zone="json-c libjson-c">
+            <primary sortas="c-libjson-c">libjson-c.so</primary>
           </indexterm>
         </listitem>
Index: general/genlib/libdrm.xml
===================================================================
--- general/genlib/libdrm.xml	(revision 4849cdc412bcdd44bbddd037f68ff26a6fc55b00)
+++ general/genlib/libdrm.xml	(revision 23d3543cc8c665f26aba0bf01604687b435e22b6)
@@ -7,7 +7,7 @@
   <!ENTITY libdrm-download-http "http://dri.freedesktop.org/libdrm/libdrm-&libdrm-version;.tar.bz2">
   <!ENTITY libdrm-download-ftp  " ">
-  <!ENTITY libdrm-md5sum        "b760b1f2ae4ec6452383164ec697cd5d">
-  <!ENTITY libdrm-size          "528 KB">
-  <!ENTITY libdrm-buildsize     "10 MB">
+  <!ENTITY libdrm-md5sum        "92ce56e7533a9b2fcb5c8f32d305328b">
+  <!ENTITY libdrm-size          "540 KB">
+  <!ENTITY libdrm-buildsize     "11 MB">
   <!ENTITY libdrm-time          "0.2 SBU">
 ]>
Index: general/genlib/libical.xml
===================================================================
--- general/genlib/libical.xml	(revision 4849cdc412bcdd44bbddd037f68ff26a6fc55b00)
+++ general/genlib/libical.xml	(revision 23d3543cc8c665f26aba0bf01604687b435e22b6)
@@ -7,8 +7,8 @@
   <!ENTITY libical-download-http "http://downloads.sourceforge.net/freeassociation/libical-&libical-version;.tar.gz">
   <!ENTITY libical-download-ftp  " ">
-  <!ENTITY libical-md5sum        "e549f434d5fbf9cd156c60ed4943618f">
-  <!ENTITY libical-size          "1.1 MB">
-  <!ENTITY libical-buildsize     "56 MB">
-  <!ENTITY libical-time          "0.5 SBU">
+  <!ENTITY libical-md5sum        "4438c31d00ec434f02867a267a92f8a1">
+  <!ENTITY libical-size          "1.2 MB">
+  <!ENTITY libical-buildsize     "20 MB">
+  <!ENTITY libical-time          "0.4 SBU">
 ]>
 
@@ -30,42 +30,65 @@
     <title>Introduction to libical</title>
 
-    <para>The <application>libical</application> package is an implementation of
-    iCalendar protocols and data formats.</para>
-
-    &lfs72_checked;
+    <para>
+      The <application>libical</application> package contains an implementation
+      of the iCalendar protocols and data formats.
+    </para>
+
+    &lfs73_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&libical-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&libical-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &libical-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &libical-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &libical-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &libical-time;</para>
+        <para>
+          Download (HTTP): <ulink url="&libical-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&libical-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &libical-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &libical-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &libical-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &libical-time;
+        </para>
       </listitem>
     </itemizedlist>
 
-    <!-- There is no support for the current version of BLFS BDB -->
     <bridgehead renderas="sect3">libical Dependencies</bridgehead>
 
+    <!-- Upstream recommends to use CMake since autotools
+    doesn't bump soname for 0.48 -> 1.0 incompatibility -->
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="cmake"/>
+    </para>
+
+    <!-- Can't be built using CMake
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <!-- <para role="optional"><xref linkend="db"/></para> -->
-    <para role="optional"><xref linkend="python2"/> (must have
-    <ulink url="http://www.swig.org/">SWIG</ulink> also)</para>
+    <para role="optional">
+      <xref linkend="openjdk"/> and
+      <xref linkend="python2"/> (must have
+      <ulink url="http://www.swig.org/">SWIG</ulink> also)
+    </para> -->
 
     <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/libical"/></para>
-
+      <ulink url="&blfs-wiki;/libical"/>
+    </para>
   </sect2>
 
@@ -73,33 +96,46 @@
     <title>Installation of libical</title>
 
-    <para>Install <application>libical</application> by running the following
-    commands:</para>
-
-<screen><userinput>./configure --prefix=/usr --enable-cxx &amp;&amp;
+    <para>
+      Install <application>libical</application> by running the
+      following commands:
+    </para>
+
+<screen><userinput>mkdir build &amp;&amp;
+cd build &amp;&amp;
+cmake -DCMAKE_INSTALL_PREFIX=/usr \
+      -DCMAKE_BUILD_TYPE=Release  \
+      .. &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 -m755 -d /usr/share/doc/libical-&libical-version; &amp;&amp;
-install -v -m644    README doc/{Adding,Using}*.txt \
-                    /usr/share/doc/libical-&libical-version;</userinput></screen>
-
-  </sect2>
-
-  <!--  There is no support for the current version of BLFS BDB -->
+    <para>
+      To test the results, issue: <command>make test</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><option>-with-bdb4</option>: This option adds support for
-    <application>Berkeley DB 4.0</application>.</para> -->
-
-    <para><parameter>--enable-cxx</parameter>: This parameter builds C++
-    <application>libical</application> library bindings.</para>
-
-    <para><option>--enable-python</option>: This option builds Python
-    <application>libical</application> bindings.</para>
+    <para>
+      <parameter>-DCMAKE_BUILD_TYPE=Release</parameter>: This switch is used
+      to apply higher level of the compiler optimizations.
+    </para>
+
+    <!-- No CMake equivalents
+    <para>
+      <parameter>- -enable-cxx</parameter>: This switch enables
+      <application>libical</application> C++ library.
+    </para>
+
+    <para>
+      <option>- -enable-python</option>: This switch enables
+      <application>libical</application> Python bindings.
+    </para> -->
 
   </sect2>
@@ -111,11 +147,16 @@
       <segtitle>Installed Programs</segtitle>
       <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
+      <segtitle>Installed Directory</segtitle>
 
       <seglistitem>
-        <seg>None</seg>
-        <seg>libical{,_cxx}.{so,a}, libicalss{,_cxx}.{so,a}, libicalvcal.{so,a},
-        and (optionally) the Python _LibicalWrap.{so,a} modules</seg>
-        <seg>/usr/include/libical and /usr/share/doc/libical-&libical-version;</seg>
+        <seg>
+          None
+        </seg>
+        <seg>
+          libical.{so,a}, libicalss.{so,a} and libicalvcal.{so,a}
+        </seg>
+        <seg>
+          /usr/include/libical
+        </seg>
       </seglistitem>
     </segmentedlist>
@@ -127,8 +168,10 @@
 
       <varlistentry id="libical-lib">
-        <term><filename class='libraryfile'>libical.{so,a}</filename></term>
+        <term><filename class="libraryfile">libical.{so,a}</filename></term>
         <listitem>
-          <para>contains the <application>libical</application> API
-          functions.</para>
+          <para>
+            contains the <application>libical</application> API
+            functions.
+          </para>
           <indexterm zone="libical libical-lib">
             <primary sortas="c-libical">libical.{so,a}</primary>
@@ -138,8 +181,10 @@
 
       <varlistentry id="libicalss">
-        <term><filename class='libraryfile'>libicalss.{so,a}</filename></term>
+        <term><filename class="libraryfile">libicalss.{so,a}</filename></term>
         <listitem>
-          <para>is a libary that allows you to store iCal component data to disk
-          in a variety of ways.</para>
+          <para>
+            is a libary that allows you to store iCal component data
+            to disk in a variety of ways.
+          </para>
           <indexterm zone="libical libicalss">
             <primary sortas="c-libicalss">libicalss.{so,a}</primary>
@@ -149,7 +194,9 @@
 
       <varlistentry id="libicalvcal">
-        <term><filename class='libraryfile'>libicalvcal.{so,a}</filename></term>
+        <term><filename class="libraryfile">libicalvcal.{so,a}</filename></term>
         <listitem>
-          <para>is a vCard/vCalendar C interface.</para>
+          <para>
+            is a vCard/vCalendar C interface.
+          </para>
           <indexterm zone="libical libicalvcal">
             <primary sortas="c-libicalvcal">libicalvcal.{so,a}</primary>
Index: general/prog/cmake.xml
===================================================================
--- general/prog/cmake.xml	(revision 4849cdc412bcdd44bbddd037f68ff26a6fc55b00)
+++ general/prog/cmake.xml	(revision 23d3543cc8c665f26aba0bf01604687b435e22b6)
@@ -7,7 +7,7 @@
   <!ENTITY cmake-download-http "http://www.cmake.org/files/v&cmake-major-version;/cmake-&cmake-version;.tar.gz">
   <!ENTITY cmake-download-ftp  " ">
-  <!ENTITY cmake-md5sum        "097278785da7182ec0aea8769d06860c">
-  <!ENTITY cmake-size          "5.6 MB">
-  <!ENTITY cmake-buildsize     "255 MB (including tests)">
+  <!ENTITY cmake-md5sum        "be6008f2299613d23fe82ab53ef7472e">
+  <!ENTITY cmake-size          "5.7 MB">
+  <!ENTITY cmake-buildsize     "275 MB (including tests)">
   <!ENTITY cmake-time          "1.9 SBU (additional 3.1 SBU for the test suite)">
 ]>
@@ -39,5 +39,5 @@
     </para>
 
-    &lfs72_checked;
+    &lfs73_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: general/prog/python2.xml
===================================================================
--- general/prog/python2.xml	(revision 4849cdc412bcdd44bbddd037f68ff26a6fc55b00)
+++ general/prog/python2.xml	(revision 23d3543cc8c665f26aba0bf01604687b435e22b6)
@@ -10,6 +10,6 @@
   <!ENTITY python2-md5sum        "5eea8462f69ab1369d32f9c4cd6272ab">
   <!ENTITY python2-size          "9.8 MB">
-  <!ENTITY python2-buildsize     "235 MB (not including the test suite)">
-  <!ENTITY python2-time          "1.0 SBU (not including the test suite)">
+  <!ENTITY python2-buildsize     "235 MB">
+  <!ENTITY python2-time          "1.0 SBU">
 
   <!ENTITY python2htmldoc-download-http
@@ -160,5 +160,5 @@
     </para>
 
-<screen role="root"><userinput>install -v -m755 -d /usr/share/doc/python-&python2-version; &amp;&amp;
+<screen role="root"><userinput>install -v -dm755 /usr/share/doc/python-&python2-version; &amp;&amp;
 tar --strip-components=1 -C /usr/share/doc/python-&python2-version; \
     -xvf ../python-&python2-version;-docs-html.tar.bz2                      &amp;&amp;
Index: general/prog/python3.xml
===================================================================
--- general/prog/python3.xml	(revision 4849cdc412bcdd44bbddd037f68ff26a6fc55b00)
+++ general/prog/python3.xml	(revision 23d3543cc8c665f26aba0bf01604687b435e22b6)
@@ -8,13 +8,13 @@
            "http://www.python.org/ftp/python/&python3-version;/Python-&python3-version;.tar.xz">
   <!ENTITY python3-download-ftp  " ">
-  <!ENTITY python3-md5sum        "993232d9f4d9b4863cc1ec69a792e9cd">
+  <!ENTITY python3-md5sum        "c94b78ea3b68a9bbc9906af4d5b4fdc7">
   <!ENTITY python3-size          "12 MB">
-  <!ENTITY python3-buildsize     "260 MB (not including the testsuite)">
-  <!ENTITY python3-time          "1.2 SBU (not including the testsuite)">
+  <!ENTITY python3-buildsize     "260 MB">
+  <!ENTITY python3-time          "0.9 SBU">
 
   <!ENTITY python3htmldoc-download-http
            "http://docs.python.org/ftp/python/doc/&python3-version;/python-&python3-version;-docs-html.tar.bz2">
-  <!ENTITY python3htmldoc-md5sum        "e730def6cc4d6dddb076aae82661b6d6">
-  <!ENTITY python3htmldoc-size          "4.6 MB">
+  <!ENTITY python3htmldoc-md5sum        "b5eee2b290338fb08c1512bfc79bb999">
+  <!ENTITY python3htmldoc-size          "4.7 MB">
 ]>
 
@@ -134,6 +134,5 @@
     </para>
 
-<screen><userinput>sed "s@\"\$CFLAGS -Werror\"@\"\$CFLAGS -Werror -Wformat\"@g" -i configure &amp;&amp;
-./configure --prefix=/usr       \
+<screen><userinput>./configure --prefix=/usr       \
             --enable-shared     \
             --with-system-expat \
@@ -159,5 +158,5 @@
     </para>
 
-<screen role="root"><userinput>install -v -m755 -d /usr/share/doc/python-&python3-version;/html &amp;&amp;
+<screen role="root"><userinput>install -v -dm755 /usr/share/doc/python-&python3-version;/html &amp;&amp;
 tar --strip-components=1 \
     --no-same-owner \
@@ -170,10 +169,4 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
-
-    <para>
-      <command>sed "s@\"\$CFLAGS -Werror\"@\"\$CFLAGS -Werror -Wformat\"@g"
-      -i configure</command>: Fixes building with
-      <application>GCC</application> 4.8.
-    </para>
 
     <para>
Index: general/prog/ruby.xml
===================================================================
--- general/prog/ruby.xml	(revision 4849cdc412bcdd44bbddd037f68ff26a6fc55b00)
+++ general/prog/ruby.xml	(revision 23d3543cc8c665f26aba0bf01604687b435e22b6)
@@ -7,7 +7,7 @@
   <!ENTITY ruby-download-http " ">
   <!ENTITY ruby-download-ftp  "ftp://ftp.ruby-lang.org/pub/ruby/1.9/ruby-&ruby-version;.tar.bz2">
-  <!ENTITY ruby-md5sum        "a810d64e2255179d2f334eb61fb8519c">
+  <!ENTITY ruby-md5sum        "c2b2de5ef15ea9b1aaa3152f9112af1b">
   <!ENTITY ruby-size          "9.6 MB">
-  <!ENTITY ruby-buildsize     "940 MB">
+  <!ENTITY ruby-buildsize     "890 MB">
   <!ENTITY ruby-time          "4.0 SBU">
 ]>
@@ -36,5 +36,5 @@
     </para>
 
-    &lfs72_checked;
+    &lfs73_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: general/sysutils/colord.xml
===================================================================
--- general/sysutils/colord.xml	(revision 4849cdc412bcdd44bbddd037f68ff26a6fc55b00)
+++ general/sysutils/colord.xml	(revision 23d3543cc8c665f26aba0bf01604687b435e22b6)
@@ -8,8 +8,8 @@
            "http://www.freedesktop.org/software/colord/releases/colord-&colord-version;.tar.xz">
   <!ENTITY colord-download-ftp  " ">
-  <!ENTITY colord-md5sum        "a14bea627172cb8d3aed3c3d22dea085">
+  <!ENTITY colord-md5sum        "5b0c442a2a87c3688b17e1547452ffcb">
   <!ENTITY colord-size          "1.1 MB">
-  <!ENTITY colord-buildsize     "32 MB">
-  <!ENTITY colord-time          "0.3 SBU">
+  <!ENTITY colord-buildsize     "35 MB">
+  <!ENTITY colord-time          "0.4 SBU">
 ]>
 
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 4849cdc412bcdd44bbddd037f68ff26a6fc55b00)
+++ introduction/welcome/changelog.xml	(revision 23d3543cc8c665f26aba0bf01604687b435e22b6)
@@ -45,4 +45,46 @@
 -->
     <listitem>
+      <para>May 17th, 2013</para>
+      <itemizedlist>
+        <listitem>
+          <para>[krejzi] - Amarok 2.7.1.</para>
+        </listitem>
+        <listitem>
+          <para>[krejzi] - CMake 2.8.11.</para>
+        </listitem>
+        <listitem>
+          <para>[krejzi] - Colord 1.0.0.</para>
+        </listitem>
+        <listitem>
+          <para>[krejzi] - Firefox/Xulrunner 21.0.</para>
+        </listitem>
+        <listitem>
+          <para>[krejzi] - JSON-C 0.11.</para>
+        </listitem>
+        <listitem>
+          <para>[krejzi] - libdrm 2.4.45.</para>
+        </listitem>
+        <listitem>
+          <para>[krejzi] - libical 1.0.</para>
+        </listitem>
+        <listitem>
+          <para>[krejzi] - Midori 0.5.1.</para>
+        </listitem>
+        <listitem>
+          <para>[krejzi] - Python 3.3.2.</para>
+        </listitem>
+        <listitem>
+          <para>[krejzi] - Ruby 1.9.3-p429.</para>
+        </listitem>
+        <listitem>
+          <para>[krejzi] - Thunderbird 17.0.6.</para>
+        </listitem>
+        <listitem>
+          <para>[krejzi] - Xorg Synaptics Driver 1.7.1.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>May 12th, 2013</para>
       <itemizedlist>
Index: multimedia/audioutils/amarok.xml
===================================================================
--- multimedia/audioutils/amarok.xml	(revision 4849cdc412bcdd44bbddd037f68ff26a6fc55b00)
+++ multimedia/audioutils/amarok.xml	(revision 23d3543cc8c665f26aba0bf01604687b435e22b6)
@@ -7,7 +7,7 @@
   <!ENTITY amarok-download-http "&kde-download-http;amarok/&amarok-version;/src/amarok-&amarok-version;.tar.bz2">
   <!ENTITY amarok-download-ftp  "&kde-download-ftp;amarok/&amarok-version;/src/amarok-&amarok-version;.tar.bz2">
-  <!ENTITY amarok-md5sum        "4ccb750a9e86ce17d4172f770ac7a663">
+  <!ENTITY amarok-md5sum        "855203770cfb43be39bd9b961540dbaf">
   <!ENTITY amarok-size          "41 MB">
-  <!ENTITY amarok-buildsize     "305 MB">
+  <!ENTITY amarok-buildsize     "310 MB">
   <!ENTITY amarok-time          "9.2 SBU">
 ]>
Index: multimedia/libdriv/pulseaudio.xml
===================================================================
--- multimedia/libdriv/pulseaudio.xml	(revision 4849cdc412bcdd44bbddd037f68ff26a6fc55b00)
+++ multimedia/libdriv/pulseaudio.xml	(revision 23d3543cc8c665f26aba0bf01604687b435e22b6)
@@ -39,5 +39,5 @@
     </para>
 
-    &lfs72_checked;
+    &lfs73_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -145,4 +145,5 @@
 
 <screen><userinput>find . -name "Makefile.in" | xargs sed -i "s|(libdir)/@PACKAGE@|(libdir)/pulse|" &amp;&amp;
+sed -i "s@json >= 0.9@json-c >= 0.11@g" configure &amp;&amp;
 ./configure --prefix=/usr \
             --sysconfdir=/etc \
@@ -168,9 +169,14 @@
 
     <para>
-      <command>find . -name Makefile.in ...</command>: This command changes
+      <command>find . -name Makefile.in ...</command>: This sed changes
       the build system to install <application>PulseAudio</application>
       private libraries into
       <filename class="directory">/usr/lib/pulse</filename> instead of
       <filename class="directory">/usr/lib/pulseaudio</filename>.
+    </para>
+
+    <para>
+      <command>sed -i "s@json >= 0.9@json-c >= 0.11@g" configure</command>:
+      This sed fixes building with <application>JSON-C</application> 0.11.
     </para>
 
Index: postlfs/security/polkit.xml
===================================================================
--- postlfs/security/polkit.xml	(revision 4849cdc412bcdd44bbddd037f68ff26a6fc55b00)
+++ postlfs/security/polkit.xml	(revision 23d3543cc8c665f26aba0bf01604687b435e22b6)
@@ -77,6 +77,7 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="glib2"/> and
-      <xref linkend="intltool"/>
+      <xref linkend="glib2"/>,
+      <xref linkend="intltool"/> and
+      <xref linkend="SpiderMonkey"/>
     </para>
 
@@ -93,9 +94,4 @@
       <xref linkend="libxslt"/> and
       <xref linkend="linux-pam"/>
-    </para>
-
-    <bridgehead renderas="sect4">Required (Runtime)</bridgehead>
-    <para role="required">
-      <xref linkend="SpiderMonkey"/>
     </para>
 
Index: x/installing/x7driver.xml
===================================================================
--- x/installing/x7driver.xml	(revision 4849cdc412bcdd44bbddd037f68ff26a6fc55b00)
+++ x/installing/x7driver.xml	(revision 23d3543cc8c665f26aba0bf01604687b435e22b6)
@@ -26,9 +26,9 @@
   <!ENTITY xorg-evdev-driver-time          "less than 0.1 SBU">
 
-  <!ENTITY xorg-synaptics-driver-version "1.7.0">
+  <!ENTITY xorg-synaptics-driver-version "1.7.1">
 
   <!ENTITY xorg-synaptics-driver-download-http "&xorg-download-http;/driver/xf86-input-synaptics-&xorg-synaptics-driver-version;.tar.bz2">
   <!ENTITY xorg-synaptics-driver-download-ftp  "&xorg-download-ftp;/driver/xf86-input-synaptics-&xorg-synaptics-driver-version;.tar.bz2">
-  <!ENTITY xorg-synaptics-driver-md5sum        "5e4f232a18a1741e4c34895d28238f8d">
+  <!ENTITY xorg-synaptics-driver-md5sum        "6505de717972b6a24b8eb13e69eb996c">
   <!ENTITY xorg-synaptics-driver-size          "432 KB">
   <!ENTITY xorg-synaptics-driver-buildsize     "5.6 MB">
Index: x/lib/xulrunner.xml
===================================================================
--- x/lib/xulrunner.xml	(revision 4849cdc412bcdd44bbddd037f68ff26a6fc55b00)
+++ x/lib/xulrunner.xml	(revision 23d3543cc8c665f26aba0bf01604687b435e22b6)
@@ -9,8 +9,8 @@
   <!ENTITY xulrunner-download-ftp
            "ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/&firefox-version;/source/firefox-&firefox-version;.source.tar.bz2">
-  <!ENTITY xulrunner-md5sum        "b822ff4b2348410587dec563235d9320">
-  <!ENTITY xulrunner-size          "96 MB">
-  <!ENTITY xulrunner-buildsize     "3.9 GB (121 MB installed)">
-  <!ENTITY xulrunner-time          "29 SBU">
+  <!ENTITY xulrunner-md5sum        "6e2510e9466b280c367de0e4c05a8840">
+  <!ENTITY xulrunner-size          "101 MB">
+  <!ENTITY xulrunner-buildsize     "4.1 GB (125 MB installed)">
+  <!ENTITY xulrunner-time          "35 SBU">
 ]>
 
@@ -40,5 +40,5 @@
     </para>
 
-    &lfs72_checked;
+    &lfs73_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -108,4 +108,5 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
+      <xref linkend="curl"/>,
       <xref linkend="dbus-glib"/>,
       <xref linkend="doxygen"/>,
Index: xfce/apps/midori.xml
===================================================================
--- xfce/apps/midori.xml	(revision 4849cdc412bcdd44bbddd037f68ff26a6fc55b00)
+++ xfce/apps/midori.xml	(revision 23d3543cc8c665f26aba0bf01604687b435e22b6)
@@ -8,5 +8,5 @@
            "http://archive.xfce.org/src/apps/midori/0.5/midori-&midori-version;.tar.bz2">
   <!ENTITY midori-download-ftp  " ">
-  <!ENTITY midori-md5sum        "ad11685633e23f8173e2cd947d945cce">
+  <!ENTITY midori-md5sum        "be022fbe9e47d6f50bddffa768468828">
   <!ENTITY midori-size          "1.1 MB">
   <!ENTITY midori-buildsize     "50 MB (9 MB installed)">
Index: xsoft/graphweb/firefox.xml
===================================================================
--- xsoft/graphweb/firefox.xml	(revision 4849cdc412bcdd44bbddd037f68ff26a6fc55b00)
+++ xsoft/graphweb/firefox.xml	(revision 23d3543cc8c665f26aba0bf01604687b435e22b6)
@@ -9,8 +9,8 @@
   <!ENTITY firefox-download-ftp
            "ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/&firefox-version;/source/firefox-&firefox-version;.source.tar.bz2">
-  <!ENTITY firefox-md5sum        "b822ff4b2348410587dec563235d9320">
-  <!ENTITY firefox-size          "95 MB">
-  <!ENTITY firefox-buildsize     "3.8 GB (44 MB installed) (or 700 MB and 4.0 MB if using Xulrunner)">
-  <!ENTITY firefox-time          "29 SBU (0.4 SBU if using Xulrunner)">
+  <!ENTITY firefox-md5sum        "6e2510e9466b280c367de0e4c05a8840">
+  <!ENTITY firefox-size          "101 MB">
+  <!ENTITY firefox-buildsize     "4.1 GB (45 MB installed) (or 730 MB and 4.0 MB if using Xulrunner)">
+  <!ENTITY firefox-time          "35 SBU (0.4 SBU if using Xulrunner)">
 ]>
 
@@ -223,5 +223,6 @@
     </para>
 
-<screen><userinput>sed -i 's# ""##' browser/base/Makefile.in &amp;&amp;
+<screen><userinput>sed -i 's@ ""@@' browser/base/Makefile.in &amp;&amp;
+sed -i "/gre_path/s@DIST'\]@&amp; + '/bin'@" toolkit/mozapps/installer/packager.py &amp;&amp;
 make -f client.mk</userinput></screen>
 
@@ -301,6 +302,11 @@
 
     <para>
-      <command>sed -i 's# ""##' browser/base/Makefile.in</command>: This sed
+      <command>sed -i 's@ ""@@' browser/base/Makefile.in</command>: This sed
       removes an unprintable control character from the title bar.
+    </para>
+
+    <para>
+      <command>sed -i "/gre_path/s@DIST'\]@&amp; + '/bin'@" ...</command>: This
+      sed fixes build with <application>Xulrunner</application>.
     </para>
 
Index: xsoft/other/thunderbird.xml
===================================================================
--- xsoft/other/thunderbird.xml	(revision 4849cdc412bcdd44bbddd037f68ff26a6fc55b00)
+++ xsoft/other/thunderbird.xml	(revision 23d3543cc8c665f26aba0bf01604687b435e22b6)
@@ -9,8 +9,8 @@
   <!ENTITY thunderbird-download-ftp
            "&mozilla-ftp;/thunderbird/releases/&thunderbird-version;/source/thunderbird-&thunderbird-version;.source.tar.bz2">
-  <!ENTITY thunderbird-md5sum            "609a11ce7bb246cebf67d993a035ca52">
+  <!ENTITY thunderbird-md5sum            "e3be03513d038bbbcf8cca8a3652170b">
   <!ENTITY thunderbird-size              "109 MB">
-  <!ENTITY thunderbird-buildsize         "3.1 GB (47 MB installed)">
-  <!ENTITY thunderbird-time              "30 SBU">
+  <!ENTITY thunderbird-buildsize         "3.2 GB (90 MB installed)">
+  <!ENTITY thunderbird-time              "35 SBU">
 ]>
 
@@ -107,4 +107,5 @@
     <para role="optional">
       <xref linkend="curl"/>,
+      <xref linkend="cyrus-sasl"/>,
       <xref linkend="dbus-glib"/>,
       <xref linkend="doxygen"/>,
