Author: renodr
Date: Fri May  6 18:40:16 2016
New Revision: 17328

Log:
Sync to trunk r17213
Added entity for GNOME-3.20

Modified:
   branches/systemd/general.ent
   branches/systemd/general/genlib/exempi.xml
   branches/systemd/general/genlib/glib2.xml
   branches/systemd/general/genlib/glibmm.xml
   branches/systemd/general/genlib/gobject-introspection.xml
   branches/systemd/general/genlib/icu.xml
   branches/systemd/general/genlib/json-glib.xml
   branches/systemd/general/genlib/libgusb.xml
   branches/systemd/general/genlib/libsigc++.xml
   branches/systemd/general/genlib/xapian.xml
   branches/systemd/general/genutils/gtk-doc.xml
   branches/systemd/general/graphlib/giflib.xml
   branches/systemd/general/graphlib/graphite2.xml
   branches/systemd/general/graphlib/newt.xml
   branches/systemd/general/prog/elfutils.xml
   branches/systemd/general/prog/gcc-ada.xml
   branches/systemd/general/prog/gcc-java.xml
   branches/systemd/general/prog/gcc.xml
   branches/systemd/general/prog/java.xml
   branches/systemd/general/prog/openjdk.xml
   branches/systemd/general/prog/perl-modules.xml
   branches/systemd/general/prog/pygobject3.xml
   branches/systemd/general/sysutils/udisks2.xml
   branches/systemd/gnome.ent
   branches/systemd/introduction/welcome/changelog.xml
   branches/systemd/multimedia/audioutils/audacious.xml
   branches/systemd/multimedia/audioutils/mpg123.xml
   branches/systemd/multimedia/libdriv/alsa-lib.xml
   branches/systemd/multimedia/libdriv/alsa-plugins.xml
   branches/systemd/multimedia/libdriv/alsa-utils.xml
   branches/systemd/multimedia/libdriv/alsa.xml
   branches/systemd/multimedia/libdriv/gst10-plugins-bad.xml
   branches/systemd/multimedia/libdriv/gst10-plugins-good.xml
   branches/systemd/multimedia/libdriv/mlt.xml
   branches/systemd/networking/netlibs/curl.xml
   branches/systemd/networking/netlibs/glib-networking.xml
   branches/systemd/networking/netlibs/libsoup.xml
   branches/systemd/networking/netutils/avahi.xml
   branches/systemd/networking/netutils/nmap.xml
   branches/systemd/networking/netutils/whois.xml
   branches/systemd/packages.ent
   branches/systemd/postlfs/filesystems/lvm2.xml
   branches/systemd/postlfs/filesystems/ntfs-3g.xml
   branches/systemd/postlfs/security/openssl.xml
   branches/systemd/postlfs/virtualization/qemu.xml
   branches/systemd/pst/printing/cups-filters.xml
   branches/systemd/server/databases/mariadb.xml
   branches/systemd/server/major/bind.xml
   branches/systemd/server/major/proftpd.xml
   branches/systemd/x/lib/at-spi2-atk.xml
   branches/systemd/x/lib/at-spi2-core.xml
   branches/systemd/x/lib/atk.xml
   branches/systemd/x/lib/clutter-gst.xml
   branches/systemd/x/lib/clutter-gtk.xml
   branches/systemd/x/lib/clutter.xml
   branches/systemd/x/lib/gdk-pixbuf.xml
   branches/systemd/x/lib/goffice010.xml
   branches/systemd/x/lib/gtk3.xml
   branches/systemd/x/lib/pango.xml
   branches/systemd/xfce/core/xfce4-settings.xml
   branches/systemd/xsoft/graphweb/seamonkey.xml
   branches/systemd/xsoft/other/fontforge.xml
   branches/systemd/xsoft/other/pidgin.xml
   branches/systemd/xsoft/other/transmission.xml

Modified: branches/systemd/general.ent
==============================================================================
--- branches/systemd/general.ent        Fri May  6 15:54:06 2016        (r17327)
+++ branches/systemd/general.ent        Fri May  6 18:40:16 2016        (r17328)
@@ -1,12 +1,12 @@
 <!-- $LastChangedBy$ $Date$ -->
 
-<!ENTITY day          "06">                   <!-- Always 2 digits -->
+<!ENTITY day          "07">                   <!-- Always 2 digits -->
 <!ENTITY month        "05">                   <!-- Always 2 digits -->
 <!ENTITY year         "2016">
 <!ENTITY copyrightdate "2001-&year;">
 <!ENTITY copyholder   "The BLFS systemd Development Team">
 <!ENTITY version      "&year;-&month;-&day;">
-<!ENTITY releasedate  "May 6th, &year;">
+<!ENTITY releasedate  "May 7th, &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/exempi.xml
==============================================================================
--- branches/systemd/general/genlib/exempi.xml  Fri May  6 15:54:06 2016        
(r17327)
+++ branches/systemd/general/genlib/exempi.xml  Fri May  6 18:40:16 2016        
(r17328)
@@ -6,10 +6,10 @@
 
   <!ENTITY exempi-download-http 
"http://libopenraw.freedesktop.org/download/exempi-&exempi-version;.tar.bz2";>
   <!ENTITY exempi-download-ftp  " ">
-  <!ENTITY exempi-md5sum        "b55db1031a3b4609c2241f7fc870ce32">
+  <!ENTITY exempi-md5sum        "1cc8c7f005fd4ef631e9000b3d5433a8">
   <!ENTITY exempi-size          "3.3 MB">
   <!ENTITY exempi-buildsize     "123 MB (additional 13 MB for the tests)">
-  <!ENTITY exempi-time          "less than 0.1 SBU (additional 0.3 SBU for the 
tests)">
+  <!ENTITY exempi-time          "0.7 SBU (additional 0.3 SBU for the tests)">
 ]>
 
 <sect1 id="exempi" xreflabel="Exempi-&exempi-version;">

Modified: branches/systemd/general/genlib/glib2.xml
==============================================================================
--- branches/systemd/general/genlib/glib2.xml   Fri May  6 15:54:06 2016        
(r17327)
+++ branches/systemd/general/genlib/glib2.xml   Fri May  6 18:40:16 2016        
(r17328)
@@ -4,12 +4,12 @@
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
 
-  <!ENTITY glib2-download-http 
"&gnome-download-http;/glib/2.46/glib-&glib2-version;.tar.xz">
-  <!ENTITY glib2-download-ftp  
"&gnome-download-ftp;/glib/2.46/glib-&glib2-version;.tar.xz">
-  <!ENTITY glib2-md5sum        "7f815d6e46df68e070cb421ed7f1139e">
+  <!ENTITY glib2-download-http 
"&gnome-download-http;/glib/2.48/glib-&glib2-version;.tar.xz">
+  <!ENTITY glib2-download-ftp  
"&gnome-download-ftp;/glib/2.48/glib-&glib2-version;.tar.xz">
+  <!ENTITY glib2-md5sum        "093a586f37d2853bdb129231e1b350e0">
   <!ENTITY glib2-size          "7.1 MB">
-  <!ENTITY glib2-buildsize     "187 MB (additional 74 MB for tests)">
-  <!ENTITY glib2-time          "0.8 SBU (additional 3.3 SBU for tests)">
+  <!ENTITY glib2-buildsize     "143 MB (additional 71 MB for tests)">
+  <!ENTITY glib2-time          "1.1 SBU (additional 4.4 SBU for tests)">
 ]>
 
 <sect1 id="glib2" xreflabel="GLib-&glib2-version;">
@@ -141,7 +141,7 @@
 
     <para>
       To test the results, after having installed the package, issue:
-      <command>make -k check</command>. Two tests produce errors.
+      <command>make -k check</command>.
     </para>
 
   </sect2>

Modified: branches/systemd/general/genlib/glibmm.xml
==============================================================================
--- branches/systemd/general/genlib/glibmm.xml  Fri May  6 15:54:06 2016        
(r17327)
+++ branches/systemd/general/genlib/glibmm.xml  Fri May  6 18:40:16 2016        
(r17328)
@@ -4,12 +4,12 @@
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
 
-  <!ENTITY glibmm-download-http 
"&gnome-download-http;/glibmm/2.46/glibmm-&glibmm-version;.tar.xz">
-  <!ENTITY glibmm-download-ftp  
"&gnome-download-ftp;/glibmm/2.46/glibmm-&glibmm-version;.tar.xz">
-  <!ENTITY glibmm-md5sum        "6879e56997aed47816fafe9a7a822a87">
-  <!ENTITY glibmm-size          "6.2 MB">
-  <!ENTITY glibmm-buildsize     "241 MB (with tests)">
-  <!ENTITY glibmm-time          "2.7 SBU (with tests)">
+  <!ENTITY glibmm-download-http 
"&gnome-download-http;/glibmm/2.48/glibmm-&glibmm-version;.tar.xz">
+  <!ENTITY glibmm-download-ftp  
"&gnome-download-ftp;/glibmm/2.48/glibmm-&glibmm-version;.tar.xz">
+  <!ENTITY glibmm-md5sum        "f08b2c7f09b984b0df05f0bf4d20ad11">
+  <!ENTITY glibmm-size          "6.0 MB">
+  <!ENTITY glibmm-buildsize     "182 MB (with tests)">
+  <!ENTITY glibmm-time          "3.2 SBU (with tests)">
 ]>
 
 <sect1 id="glibmm" xreflabel="GLibmm-&glibmm-version;">
@@ -74,14 +74,15 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="glib2"/>,
-      <xref linkend="gnutls"/> (for the tests), and
+      <xref linkend="glib2"/> and
       <xref linkend="libsigc"/>
     </para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="doxygen"/> and
+      <xref linkend="doxygen"/>,
+      <xref linkend="glib-networking"/> (for tests),
+      <xref linkend="gnutls"/> (for tests), and
       <xref linkend="libxslt"/>
     </para>
 

Modified: branches/systemd/general/genlib/gobject-introspection.xml
==============================================================================
--- branches/systemd/general/genlib/gobject-introspection.xml   Fri May  6 
15:54:06 2016        (r17327)
+++ branches/systemd/general/genlib/gobject-introspection.xml   Fri May  6 
18:40:16 2016        (r17328)
@@ -5,13 +5,13 @@
   %general-entities;
 
   <!ENTITY gobject-introspection-download-http
-    
"&gnome-download-http;/gobject-introspection/1.46/gobject-introspection-&gobject-introspection-version;.tar.xz">
+    
"&gnome-download-http;/gobject-introspection/1.48/gobject-introspection-&gobject-introspection-version;.tar.xz">
   <!ENTITY gobject-introspection-download-ftp
-    
"&gnome-download-ftp;/gobject-introspection/1.46/gobject-introspection-&gobject-introspection-version;.tar.xz">
-  <!ENTITY gobject-introspection-md5sum        
"adb40a31c7c80b65b0f4c8fd71b493dc">
+    
"&gnome-download-ftp;/gobject-introspection/1.48/gobject-introspection-&gobject-introspection-version;.tar.xz">
+  <!ENTITY gobject-introspection-md5sum        
"01301fa9019667d48e927353e08bc218">
   <!ENTITY gobject-introspection-size          "1.3 MB">
-  <!ENTITY gobject-introspection-buildsize     "52 MB (with documentation, add 
6 MB for tests)">
-  <!ENTITY gobject-introspection-time          "0.2 SBU (additional 0.5 SBU 
for documentation and 0.4 SBU for the tests)">
+  <!ENTITY gobject-introspection-buildsize     "39 MB (with documentation, add 
6 MB for tests)">
+  <!ENTITY gobject-introspection-time          "0.3 SBU (additional 0.5 SBU 
for documentation and 0.4 SBU for the tests)">
 ]>
 
 <sect1 id="gobject-introspection" 
xreflabel="gobject-introspection-&gobject-introspection-version;">

Modified: branches/systemd/general/genlib/icu.xml
==============================================================================
--- branches/systemd/general/genlib/icu.xml     Fri May  6 15:54:06 2016        
(r17327)
+++ branches/systemd/general/genlib/icu.xml     Fri May  6 18:40:16 2016        
(r17328)
@@ -7,8 +7,8 @@
   <!ENTITY icu-download-http
            
"http://download.icu-project.org/files/icu4c/&icu-version;/icu4c-&icu-dl-version;-src.tgz";>
   <!ENTITY icu-download-ftp  " ">
-  <!ENTITY icu-md5sum        "c4a2d71ff56aec5ebfab2a3f059be99d">
-  <!ENTITY icu-size          "25 MB">
+  <!ENTITY icu-md5sum        "976734806026a4ef8bdd17937c8898b9">
+  <!ENTITY icu-size          "21 MB">
   <!ENTITY icu-buildsize     "302 MB (additional 67 MB for the tests)">
   <!ENTITY icu-time          "1.5 SBU (additional 1.9 SBU for the tests)">
 ]>

Modified: branches/systemd/general/genlib/json-glib.xml
==============================================================================
--- branches/systemd/general/genlib/json-glib.xml       Fri May  6 15:54:06 
2016        (r17327)
+++ branches/systemd/general/genlib/json-glib.xml       Fri May  6 18:40:16 
2016        (r17328)
@@ -4,12 +4,12 @@
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
 
-  <!ENTITY json-glib-download-http 
"&gnome-download-http;/json-glib/1.0/json-glib-&json-glib-version;.tar.xz">
-  <!ENTITY json-glib-download-ftp  
"&gnome-download-ftp;/json-glib/1.0/json-glib-&json-glib-version;.tar.xz">
-  <!ENTITY json-glib-md5sum        "3131b0417ecde3da1ae72acceaa375cf">
-  <!ENTITY json-glib-size          "548 KB">
-  <!ENTITY json-glib-buildsize     "9.7 MB (additional 2 MB for the tests)">
-  <!ENTITY json-glib-time          "less than 0.1 SBU">
+  <!ENTITY json-glib-download-http 
"&gnome-download-http;/json-glib/1.2/json-glib-&json-glib-version;.tar.xz">
+  <!ENTITY json-glib-download-ftp  
"&gnome-download-ftp;/json-glib/1.2/json-glib-&json-glib-version;.tar.xz">
+  <!ENTITY json-glib-md5sum        "efe14b6b8e7aa95ee3240cc60627dc9f">
+  <!ENTITY json-glib-size          "572 KB">
+  <!ENTITY json-glib-buildsize     "12 MB (with tests)">
+  <!ENTITY json-glib-time          "0.2 SBU">
 ]>
 
 <sect1 id="json-glib" xreflabel="JSON-GLib-&json-glib-version;">

Modified: branches/systemd/general/genlib/libgusb.xml
==============================================================================
--- branches/systemd/general/genlib/libgusb.xml Fri May  6 15:54:06 2016        
(r17327)
+++ branches/systemd/general/genlib/libgusb.xml Fri May  6 18:40:16 2016        
(r17328)
@@ -6,9 +6,9 @@
 
   <!ENTITY libgusb-download-http 
"http://people.freedesktop.org/~hughsient/releases/libgusb-&libgusb-version;.tar.xz";>
   <!ENTITY libgusb-download-ftp  " ">
-  <!ENTITY libgusb-md5sum        "d0e4c970e2386900c99cab41d9b17e23">
-  <!ENTITY libgusb-size          "284 KB">
-  <!ENTITY libgusb-buildsize     "5.4 MB (with tests))">
+  <!ENTITY libgusb-md5sum        "d4251e958aee7d19e39f8021e457942f">
+  <!ENTITY libgusb-size          "288 KB">
+  <!ENTITY libgusb-buildsize     "4.6 MB (with tests))">
   <!ENTITY libgusb-time          "less than 0.1 SBU (with tests)">
 ]>
 

Modified: branches/systemd/general/genlib/libsigc++.xml
==============================================================================
--- branches/systemd/general/genlib/libsigc++.xml       Fri May  6 15:54:06 
2016        (r17327)
+++ branches/systemd/general/genlib/libsigc++.xml       Fri May  6 18:40:16 
2016        (r17328)
@@ -4,12 +4,12 @@
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
 
-  <!ENTITY libsigc-download-http 
"&gnome-download-http;/libsigc++/2.6/libsigc++-&libsigc-version;.tar.xz">
-  <!ENTITY libsigc-download-ftp  
"&gnome-download-ftp;/libsigc++/2.6/libsigc++-&libsigc-version;.tar.xz">
-  <!ENTITY libsigc-md5sum        "d2f33ca0b4b012ef60669e3b3cebe956">
+  <!ENTITY libsigc-download-http 
"&gnome-download-http;/libsigc++/2.8/libsigc++-&libsigc-version;.tar.xz">
+  <!ENTITY libsigc-download-ftp  
"&gnome-download-ftp;/libsigc++/2.8/libsigc++-&libsigc-version;.tar.xz">
+  <!ENTITY libsigc-md5sum        "3d26acbc813fa54edd4401ce1a981677">
   <!ENTITY libsigc-size          "3.3 MB">
-  <!ENTITY libsigc-buildsize     "57 MB (with tests)">
-  <!ENTITY libsigc-time          "0.2 SBU (with tests)">
+  <!ENTITY libsigc-buildsize     "56 MB (with tests)">
+  <!ENTITY libsigc-time          "0.3 SBU (with tests)">
 ]>
 
 <sect1 id="libsigc" xreflabel="libsigc++-&libsigc-version;">

Modified: branches/systemd/general/genlib/xapian.xml
==============================================================================
--- branches/systemd/general/genlib/xapian.xml  Fri May  6 15:54:06 2016        
(r17327)
+++ branches/systemd/general/genlib/xapian.xml  Fri May  6 18:40:16 2016        
(r17328)
@@ -7,7 +7,7 @@
   <!ENTITY xapian-download-http
            
"http://oligarchy.co.uk/xapian/&xapian-version;/xapian-core-&xapian-version;.tar.xz";>
   <!ENTITY xapian-download-ftp  " ">
-  <!ENTITY xapian-md5sum        "09c59290aa8f6b4ea73c3788636e44a5">
+  <!ENTITY xapian-md5sum        "513b10125090265b5aeb7fb57fd3a708">
   <!ENTITY xapian-size          "3.1 MB">
   <!ENTITY xapian-buildsize     "189 MB (additional 128 MB for tests)">
   <!ENTITY xapian-time          "1.2 SBU (additional 20 SBU for tests)">

Modified: branches/systemd/general/genutils/gtk-doc.xml
==============================================================================
--- branches/systemd/general/genutils/gtk-doc.xml       Fri May  6 15:54:06 
2016        (r17327)
+++ branches/systemd/general/genutils/gtk-doc.xml       Fri May  6 18:40:16 
2016        (r17328)
@@ -6,10 +6,10 @@
 
   <!ENTITY gtk-doc-download-http 
"&gnome-download-http;/gtk-doc/&gtk-doc-version;/gtk-doc-&gtk-doc-version;.tar.xz">
   <!ENTITY gtk-doc-download-ftp  
"&gnome-download-ftp;/gtk-doc/&gtk-doc-version;/gtk-doc-&gtk-doc-version;.tar.xz">
-  <!ENTITY gtk-doc-md5sum        "a8b96bacaba04e83531abf8e36d4e476">
-  <!ENTITY gtk-doc-size          "656 KB">
-  <!ENTITY gtk-doc-buildsize     "13 MB">
-  <!ENTITY gtk-doc-time          "0.1 SBU">
+  <!ENTITY gtk-doc-md5sum        "0dc6570953112a464a409fb99258ccbc">
+  <!ENTITY gtk-doc-size          "660 KB">
+  <!ENTITY gtk-doc-buildsize     "12.2 MB (with tests)">
+  <!ENTITY gtk-doc-time          "0.3 SBU (with tests)">
 ]>
 
 <sect1 id="gtk-doc" xreflabel="GTK-Doc-&gtk-doc-version;">

Modified: branches/systemd/general/graphlib/giflib.xml
==============================================================================
--- branches/systemd/general/graphlib/giflib.xml        Fri May  6 15:54:06 
2016        (r17327)
+++ branches/systemd/general/graphlib/giflib.xml        Fri May  6 18:40:16 
2016        (r17328)
@@ -6,8 +6,8 @@
 
   <!ENTITY giflib-download-http 
"&sourceforge-repo;/giflib/giflib-&giflib-version;.tar.bz2">
   <!ENTITY giflib-download-ftp  " ">
-  <!ENTITY giflib-http-md5sum   "323a9f11ab56c8a2d1715376410ce376">
-  <!ENTITY giflib-http-size     "624 KB">
+  <!ENTITY giflib-http-md5sum   "2c171ced93c0e83bb09e6ccad8e3ba2b">
+  <!ENTITY giflib-http-size     "625 KB">
   <!ENTITY giflib-buildsize     "7.6 MB (with documentation and tests)">
   <!ENTITY giflib-time          "0.1 SBU (with documentation and tests)">
 ]>

Modified: branches/systemd/general/graphlib/graphite2.xml
==============================================================================
--- branches/systemd/general/graphlib/graphite2.xml     Fri May  6 15:54:06 
2016        (r17327)
+++ branches/systemd/general/graphlib/graphite2.xml     Fri May  6 18:40:16 
2016        (r17328)
@@ -7,7 +7,7 @@
   <!ENTITY graphite2-download-http
            
"https://github.com/silnrsi/graphite/releases/download/&graphite2-version;/graphite2-&graphite2-version;.tgz";>
   <!ENTITY graphite2-download-ftp  " ">
-  <!ENTITY graphite2-md5sum        "5b8d22a8bbf031838e31432868c0109c">
+  <!ENTITY graphite2-md5sum        "236d2cb1f831fe33083112afbb555f0e">
   <!ENTITY graphite2-size          "3.8 MB">
   <!ENTITY graphite2-buildsize     "27 MB (with docs and tests)">
   <!ENTITY graphite2-time          "0.3 SBU (with docs and tests)">

Modified: branches/systemd/general/graphlib/newt.xml
==============================================================================
--- branches/systemd/general/graphlib/newt.xml  Fri May  6 15:54:06 2016        
(r17327)
+++ branches/systemd/general/graphlib/newt.xml  Fri May  6 18:40:16 2016        
(r17328)
@@ -6,9 +6,9 @@
 
   <!ENTITY newt-download-http 
"http://fedorahosted.org/releases/n/e/newt/newt-&newt-version;.tar.gz";>
   <!ENTITY newt-download-ftp  " ">
-  <!ENTITY newt-md5sum        "685721bee1a318570704b19dcf31d268">
+  <!ENTITY newt-md5sum        "e4aa0f7943edd39c52481a87f68f412a">
   <!ENTITY newt-size          "180 KB">
-  <!ENTITY newt-buildsize     "4.8 MB">
+  <!ENTITY newt-buildsize     "7.2 MB">
   <!ENTITY newt-time          "0.1 SBU">
 ]>
 
@@ -129,7 +129,7 @@
     <title>Command Explanations</title>
 
     <para>
-      <command>sed -e ... -i Makefile.in</command>: Disables installation of an
+      <command>sed -e ... -i Makefile.in</command>: Disables installation of a
       static library.
     </para>
 

Modified: branches/systemd/general/prog/elfutils.xml
==============================================================================
--- branches/systemd/general/prog/elfutils.xml  Fri May  6 15:54:06 2016        
(r17327)
+++ branches/systemd/general/prog/elfutils.xml  Fri May  6 18:40:16 2016        
(r17328)
@@ -7,10 +7,10 @@
   <!ENTITY elfutils-download-http
           
"https://fedorahosted.org/releases/e/l/elfutils/&elfutils-version;/elfutils-&elfutils-version;.tar.bz2";>
   <!ENTITY elfutils-download-ftp  " ">
-  <!ENTITY elfutils-md5sum        "c37fdbe18e848002b451562cba964679">
+  <!ENTITY elfutils-md5sum        "d4e462b7891915dc5326bccefa2024ff">
   <!ENTITY elfutils-size          "6.2 MB">
-  <!ENTITY elfutils-buildsize     "107 MB (with tests)">
-  <!ENTITY elfutils-time          "1 SBU (with tests)">
+  <!ENTITY elfutils-buildsize     "88 MB (with tests)">
+  <!ENTITY elfutils-time          "1.0 SBU (with tests)">
 ]>
 
 <sect1 id="elfutils" xreflabel="elfutils-&elfutils-version;">

Modified: branches/systemd/general/prog/gcc-ada.xml
==============================================================================
--- branches/systemd/general/prog/gcc-ada.xml   Fri May  6 15:54:06 2016        
(r17327)
+++ branches/systemd/general/prog/gcc-ada.xml   Fri May  6 18:40:16 2016        
(r17328)
@@ -236,10 +236,10 @@
       following commands:
     </para>
 
-<screen><userinput>mkdir ../gcc-build &amp;&amp;
-cd    ../gcc-build &amp;&amp;
+<screen><userinput>mkdir build &amp;&amp;
+cd     build &amp;&amp;
 
-../gcc-&gcc-ada-version;/configure          \
+../configure                    \
     --prefix=/usr               \
     --disable-multilib          \
     --with-system-zlib          \
@@ -265,7 +265,7 @@
       of the tests with:
     </para>
 
-<screen><userinput>../gcc-&gcc-ada-version;/contrib/test_summary</userinput></screen>
+<screen><userinput>../contrib/test_summary</userinput></screen>
 
     <para>
       Now, as the <systemitem class="username">root</systemitem> user:
@@ -301,7 +301,7 @@
     <title>Command Explanations</title>
 
     <para>
-      <command>mkdir ../gcc-build; cd ../gcc-build</command>: The
+      <command>mkdir build; cd build</command>: The
       <application>GCC</application> documentation recommends
       building the package in a dedicated build directory.
     </para>
@@ -327,9 +327,9 @@
     </para>
 
     <para>
-      <option>--with-default-libstdcxx-abi=c++98</option>: Use this switch if 
you
-      are building <application>GNAT</application> tools using a
-      <application>GCC</application> version prior to 5.1.0,
+      <option>--with-default-libstdcxx-abi=gcc4-compatible</option>: 
+      Use this switch if you are building <application>GNAT</application> 
+      tools using a <application>GCC</application> version prior to 5.1.0,
       and you do not want to recompile all the libraries written in C++.
     </para>
 
@@ -344,7 +344,7 @@
     </para>
 
     <para>
-      <command>../gcc-&gcc-ada-version;/contrib/test_summary</command>: This
+      <command>../contrib/test_summary</command>: This
       command will produce a summary of the test suite results. You can append
       <command>| grep -A7 Summ</command> to the command to produce an even more
       condensed version of the summary. You may also wish to redirect the 
output

Modified: branches/systemd/general/prog/gcc-java.xml
==============================================================================
--- branches/systemd/general/prog/gcc-java.xml  Fri May  6 15:54:06 2016        
(r17327)
+++ branches/systemd/general/prog/gcc-java.xml  Fri May  6 18:40:16 2016        
(r17328)
@@ -159,17 +159,17 @@
 
 cp ../ecj-latest.jar ./ecj.jar &amp;&amp;
 
-mkdir ../gcc-build &amp;&amp;
-cd    ../gcc-build &amp;&amp;
+mkdir build &amp;&amp;
+cd    build &amp;&amp;
 
-../gcc-&gcc-java-version;/configure           \
+../configure                     \
     --prefix=/usr                \
     --disable-multilib           \
     --with-system-zlib           \
     --disable-bootstrap          \
     --enable-java-home           \
     --with-jvm-root-dir=/opt/gcj \
-    --with-antlr-jar=$(pwd)/../antlr-&antlr-version;-complete.jar \
+    --with-antlr-jar=$(pwd)/../../antlr-&antlr-version;-complete.jar \
     --enable-languages=java &amp;&amp;
 make</userinput></screen>
 
@@ -192,7 +192,7 @@
       of the tests with:
     </para>
 
-<screen><userinput>../gcc-&gcc-java-version;/contrib/test_summary</userinput></screen>
+<screen><userinput>../contrib/test_summary</userinput></screen>
 
     <para>
       Now, as the <systemitem class="username">root</systemitem> user:
@@ -206,7 +206,7 @@
 chown -v -R root:root \
     /usr/lib/gcc/*linux-gnu/&gcc-java-version;/include{,-fixed} &amp;&amp;
 
-gcj -o ecj ../ecj-latest.jar \
+gcj -o ecj ../../ecj-latest.jar \
     --main=org.eclipse.jdt.internal.compiler.batch.Main &amp;&amp;
 mv ecj /usr/bin &amp;&amp;
 ln -sfv ../../../usr/bin/ecj /opt/gcj/bin/javac</userinput></screen>
@@ -224,7 +224,7 @@
     </para>
 
     <para>
-      <command>mkdir ../gcc-build; cd ../gcc-build</command>: The
+      <command>mkdir build; cd build</command>: The
       <application>GCC</application> documentation recommends
       building the package in a dedicated build directory.
     </para>
@@ -286,7 +286,7 @@
     </para>
 
     <para>
-      <command>../gcc-&gcc-java-version;/contrib/test_summary</command>: This
+      <command>../contrib/test_summary</command>: This
       command will produce a summary of the test suite results. You can append
       <command>| grep -A7 Summ</command> to the command to produce an even more
       condensed version of the summary. You may also wish to redirect the 
output

Modified: branches/systemd/general/prog/gcc.xml
==============================================================================
--- branches/systemd/general/prog/gcc.xml       Fri May  6 15:54:06 2016        
(r17327)
+++ branches/systemd/general/prog/gcc.xml       Fri May  6 18:40:16 2016        
(r17328)
@@ -168,10 +168,10 @@
       Install <application>GCC</application> by running the following commands:
     </para>
 
-<screen><userinput>mkdir ../gcc-build                                   
&amp;&amp;
-cd    ../gcc-build                                   &amp;&amp;
+<screen><userinput>mkdir build                                   &amp;&amp;
+cd    build                                   &amp;&amp;
 
-../gcc-&gcc-version;/configure                               \
+../configure                                         \
     --prefix=/usr                                    \
     --disable-multilib                               \
     --with-system-zlib                               \
@@ -197,7 +197,7 @@
       of the tests with:
     </para>
 
-<screen><userinput>../gcc-&gcc-version;/contrib/test_summary</userinput></screen>
+<screen><userinput>../contrib/test_summary</userinput></screen>
 
     <para>
       Now, as the <systemitem class="username">root</systemitem> user:
@@ -231,7 +231,7 @@
     <title>Command Explanations</title>
 
     <para>
-      <command>mkdir ../gcc-build; cd ../gcc-build</command>: The
+      <command>mkdir build; cd build</command>: The
       <application>GCC</application> documentation recommends
       building the package in a dedicated build directory.
     </para>
@@ -256,9 +256,10 @@
     </para>
 
     <para>
-      <option>--with-default-libstdcxx-abi=gcc4-compatible</option>: Use this 
switch if you
-      are upgrading from a <application>GCC</application> version prior to 
5.1.0,
-      and you do not want to recompile all the libraries written in C++.
+      <option>--with-default-libstdcxx-abi=gcc4-compatible</option>: Use this 
+      switch if you are upgrading from a <application>GCC</application> version
+      prior to 5.1.0, and you do not want to recompile all the libraries 
+      written in C++.
     </para>
 
     <para>
@@ -272,7 +273,7 @@
     </para>
 
     <para>
-      <command>../gcc-&gcc-version;/contrib/test_summary</command>: This
+      <command>../contrib/test_summary</command>: This
       command will produce a summary of the test suite results. You can append
       <command>| grep -A7 Summ</command> to the command to produce an even more
       condensed version of the summary. You may also wish to redirect the 
output

Modified: branches/systemd/general/prog/java.xml
==============================================================================
--- branches/systemd/general/prog/java.xml      Fri May  6 15:54:06 2016        
(r17327)
+++ branches/systemd/general/prog/java.xml      Fri May  6 18:40:16 2016        
(r17328)
@@ -6,12 +6,12 @@
 
   <!ENTITY anduin-download             
"&sources-anduin-http;/OpenJDK/OpenJDK-&openjdk-version;">
   <!ENTITY openjdk-download-binary-x86 
"&anduin-download;/OpenJDK-&openjdk-version;-i686-bin.tar.xz">
-  <!ENTITY openjdk-bin-md5sum-x86      "b432e59182192023aae79e63af47d60f">
+  <!ENTITY openjdk-bin-md5sum-x86      "41f3f4f87573e92ca4ab0350f0ff0d2f">
   <!ENTITY openjdk-bin-size-x86        "57 MB">
   <!ENTITY openjdk-bin-buildsize-x86   "166 MB">
 
   <!ENTITY openjdk-download-binary-x64 
"&anduin-download;/OpenJDK-&openjdk-version;-x86_64-bin.tar.xz">
-  <!ENTITY openjdk-bin-md5sum-x64      "8d88c3dfdc06216f8fffe34b2f97e949">
+  <!ENTITY openjdk-bin-md5sum-x64      "5a9b1b6d2e105eef2fbb1a965b17b3e9">
   <!ENTITY openjdk-bin-size-x64        "58 MB">
   <!ENTITY openjdk-bin-buildsize-x64   "169 MB">
 ]>

Modified: branches/systemd/general/prog/openjdk.xml
==============================================================================
--- branches/systemd/general/prog/openjdk.xml   Fri May  6 15:54:06 2016        
(r17327)
+++ branches/systemd/general/prog/openjdk.xml   Fri May  6 18:40:16 2016        
(r17328)
@@ -4,25 +4,25 @@
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
 
-  <!ENTITY ojdk-upd                  "72">
-  <!ENTITY ojdk-bd                   "b15">
+  <!ENTITY ojdk-upd                  "77">
+  <!ENTITY ojdk-bd                   "b03">
   <!ENTITY ojdk-tarball              "jdk8u&ojdk-upd;-&ojdk-bd;.tar.bz2">
   <!ENTITY ojdk-repo                 "http://hg.openjdk.java.net/jdk8u/jdk8u";>
   <!ENTITY ojdk-download             "&ojdk-repo;/archive/&ojdk-tarball;">
 
   <!ENTITY anduin-download           
"&sources-anduin-http;/OpenJDK/OpenJDK-&openjdk-version;">
 
-  <!ENTITY ojdk-md5sum               "161dfcff6fbf49649b35c86fa5bbc2b4">
+  <!ENTITY ojdk-md5sum               "1954ffeb123a7f4552472ba9f9e38b0d">
   <!ENTITY ojdk-size                 "398 KB">
 
-  <!ENTITY corba-md5sum              "c822b9ac498d5bfbaa82ce6fa1c126a4">
-  <!ENTITY hotspot-md5sum            "67a98eef6eed6fde18ec5e422bbdd074">
-  <!ENTITY jaxp-md5sum               "fc20a017e3d3598de65240bc9a2ffbbc">
-  <!ENTITY jaxws-md5sum              "669f95ee39534dcbbe538cb59bc78742">
-  <!ENTITY jdk-md5sum                "58fa5f03c7da51a07c000881ca8e1b1b">
-  <!ENTITY langtools-md5sum          "b85df8468b42a7c14c5d55e84339a2dd">
-  <!ENTITY nashorn-md5sum            "1f9358090dc4ba710a14f31115de7c5f">
-  <!ENTITY total-download-size       "62 MB">
+  <!ENTITY corba-md5sum              "eb7695323d3340214792114ad8e3bdce">
+  <!ENTITY hotspot-md5sum            "434e3dd4272d39b255ba9269838647b9">
+  <!ENTITY jaxp-md5sum               "fcc49430937eba2c64f8a53475edf99d">
+  <!ENTITY jaxws-md5sum              "f05a009f2e0fdb710c3405723ed42199">
+  <!ENTITY jdk-md5sum                "ffe70c01fc0fe513e329f170f4c922c1">
+  <!ENTITY langtools-md5sum          "a7e0ff3378d02e075284db7fe4a8dfbf">
+  <!ENTITY nashorn-md5sum            "1dee0e478002e80f87b235ae982edf6e">
+  <!ENTITY total-download-size       "63 MB">
 
   <!ENTITY jtreg-version             "4.1-b12-496">
   <!ENTITY jtreg-download            
"&anduin-download;/jtreg-&jtreg-version;.tar.gz">
@@ -32,7 +32,7 @@
   <!ENTITY icedtea-web-download      
"http://icedtea.classpath.org/download/source/icedtea-web-&icedtea-web-version;.tar.gz";>
 
   <!ENTITY ojdk-buildsize           "3.7 GB (additional 547 MB for tests)">
-  <!ENTITY ojdk-time                "11 SBU (additional 110 SBU for tests)">
+  <!ENTITY ojdk-time                "11 SBU (additional 108 SBU for tests)">
 ]>
 
 <sect1 id="openjdk"

Modified: branches/systemd/general/prog/perl-modules.xml
==============================================================================
--- branches/systemd/general/prog/perl-modules.xml      Fri May  6 15:54:06 
2016        (r17327)
+++ branches/systemd/general/prog/perl-modules.xml      Fri May  6 18:40:16 
2016        (r17328)
@@ -7,13 +7,13 @@
   <!ENTITY perl_authors  "http://cpan.metacpan.org/authors";>
 
   <!ENTITY Archive-Zip-download-http 
"http://cpan.metacpan.org/authors/id/P/PH/PHRED/Archive-Zip-&Archive-Zip-version;.tar.gz";>
-  <!ENTITY Archive-Zip-md5sum "cc401416dc80e3b268173fa884715822">
+  <!ENTITY Archive-Zip-md5sum "d4ca4b60bcd3bc8c3aa67545163d2128">
 
   <!ENTITY autovivification-download-http 
"http://www.cpan.org/authors/id/V/VP/VPIT/autovivification-&autovivification-version;.tar.gz";>
   <!ENTITY autovivification-md5sum "7e20817f6034910c1bc23351d81a0658">
 
   <!ENTITY Business-ISBN-download-http 
"http://www.cpan.org/authors/id/B/BD/BDFOY/Business-ISBN-&Business-ISBN-version;.tar.gz";>
-  <!ENTITY Business-ISBN-md5sum "5ebf339c409d99cdfa6f96974ef96780">
+  <!ENTITY Business-ISBN-md5sum "2fd4f8282e81086836ce235550988b75">
 
   <!ENTITY Business-ISMN-download-http 
"http://search.cpan.org/CPAN/authors/id/B/BD/BDFOY/Business-ISMN-&Business-ISMN-version;.tar.gz";>
   <!ENTITY Business-ISMN-md5sum "e8696a78b4aa8a99869fbb0625c5cc13">
@@ -67,7 +67,7 @@
   <!ENTITY List-MoreUtils-md5sum "bc577c86455e2d1397187bce286a53b9">
 
   <!ENTITY Log-Log4perl-download-http 
"http://www.cpan.org/authors/id/M/MS/MSCHILLI/Log-Log4perl-&Log-Log4perl-version;.tar.gz";>
-  <!ENTITY Log-Log4perl-md5sum "d247d2327d7f32dca09cbeb51a953fc5">
+  <!ENTITY Log-Log4perl-md5sum "53a0a2e68da51fa445c3557e4852d3a4">
 
   <!ENTITY LWP-Protocol-https-download-http 
"http://www.cpan.org/authors/id/M/MS/MSCHILLI/LWP-Protocol-https-&LWP-Protocol-https-version;.tar.gz";>
   <!ENTITY LWP-Protocol-https-md5sum "06f5dfd33b07f6594a429dbbd5e6a2d1">
@@ -111,7 +111,7 @@
   <!ENTITY Unicode-Collate-md5sum "c486b31f87bfa3875883f3c9fad9fd99">
 
   <!ENTITY Unicode-LineBreak-download-http 
"http://www.cpan.org/authors/id/N/NE/NEZUMI/Unicode-LineBreak-&Unicode-LineBreak-version;.tar.gz";>
-  <!ENTITY Unicode-LineBreak-md5sum "44d8d9291f90fb8c3359d37fcf00bee5">
+  <!ENTITY Unicode-LineBreak-md5sum "57dc12ff0511f9db95a2dbb6304342ca">
 
   <!ENTITY Unicode-Normalize-download-http 
"http://www.cpan.org/authors/id/K/KH/KHW/Unicode-Normalize-&Unicode-Normalize-version;.tar.gz";>
   <!ENTITY Unicode-Normalize-md5sum "8f25327bbccc33717b7d85433e1083bd">

Modified: branches/systemd/general/prog/pygobject3.xml
==============================================================================
--- branches/systemd/general/prog/pygobject3.xml        Fri May  6 15:54:06 
2016        (r17327)
+++ branches/systemd/general/prog/pygobject3.xml        Fri May  6 18:40:16 
2016        (r17328)
@@ -5,13 +5,13 @@
   %general-entities;
 
   <!ENTITY pygobject3-download-http
-           
"&gnome-download-http;/pygobject/&gnome-minor-18;/pygobject-&pygobject3-version;.tar.xz">
+           
"&gnome-download-http;/pygobject/&gnome-minor20;/pygobject-&pygobject3-version;.tar.xz">
   <!ENTITY pygobject3-download-ftp
-           
"&gnome-download-ftp;/pygobject/&gnome-minor-18;/pygobject-&pygobject3-version;.tar.xz">
-  <!ENTITY pygobject3-md5sum        "0a956f3e785e23b0f136832f2e57a862">
-  <!ENTITY pygobject3-size          "716 KB">
-  <!ENTITY pygobject3-buildsize     "29 MB (both modules, with tests)">
-  <!ENTITY pygobject3-time          "0.5 SBU (both modules, with tests)">
+           
"&gnome-download-ftp;/pygobject/&gnome-minor20;/pygobject-&pygobject3-version;.tar.xz">
+  <!ENTITY pygobject3-md5sum        "ebb9e5c75ff6405a4f6d017a5766c205">
+  <!ENTITY pygobject3-size          "732 KB">
+  <!ENTITY pygobject3-buildsize     "25 MB (both modules, with tests)">
+  <!ENTITY pygobject3-time          "0.6 SBU (both modules, with tests)">
 ]>
 
  <!-- Begin PyGObject3 -->

Modified: branches/systemd/general/sysutils/udisks2.xml
==============================================================================
--- branches/systemd/general/sysutils/udisks2.xml       Fri May  6 15:54:06 
2016        (r17327)
+++ branches/systemd/general/sysutils/udisks2.xml       Fri May  6 18:40:16 
2016        (r17328)
@@ -6,10 +6,10 @@
 
   <!ENTITY udisks2-download-http 
"http://udisks.freedesktop.org/releases/udisks-&udisks2-version;.tar.bz2";>
   <!ENTITY udisks2-download-ftp  " ">
-  <!ENTITY udisks2-md5sum        "ea181c13c43af039fded88f0ef546e24">
-  <!ENTITY udisks2-size          "888 KB">
-  <!ENTITY udisks2-buildsize     "35 MB ">
-  <!ENTITY udisks2-time          "0.2 SBU">
+  <!ENTITY udisks2-md5sum        "8bccd36573b75286538bd5bd2c424f45">
+  <!ENTITY udisks2-size          "900 KB">
+  <!ENTITY udisks2-buildsize     "25 MB (with tests)">
+  <!ENTITY udisks2-time          "0.2 SBU (with tests)">
 ]>
 
 <sect1 id="udisks2" xreflabel="UDisks-&udisks2-version;">

Modified: branches/systemd/gnome.ent
==============================================================================
--- branches/systemd/gnome.ent  Fri May  6 15:54:06 2016        (r17327)
+++ branches/systemd/gnome.ent  Fri May  6 18:40:16 2016        (r17328)
@@ -4,6 +4,7 @@
 <!ENTITY gnome-minor14                "3.14">
 <!ENTITY gnome-minor16                "3.16">
 <!ENTITY gnome-minor18                "3.18">
+<!ENTITY gnome-minor20                "3.20">
 
 <!-- Part VIII -->
 <!-- GNOME Libraries and Utilities -->

Modified: branches/systemd/introduction/welcome/changelog.xml
==============================================================================
--- branches/systemd/introduction/welcome/changelog.xml Fri May  6 15:54:06 
2016        (r17327)
+++ branches/systemd/introduction/welcome/changelog.xml Fri May  6 18:40:16 
2016        (r17328)
@@ -45,6 +45,231 @@
 -->
 
     <listitem>
+      <para>May 7th, 2016</para>
+      <itemizedlist>
+        <listitem>
+          <para>[renodr] - Added entity for GNOME 3.20.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Sync to trunk r17212.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to ATK-2.20.0. Merged from trunk
+          r17151.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update MLT dependencies. Merged from trunk
+          r17154.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to mpg123-1.23.3. Merged from trunk
+          r17156.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to curl-7.48.0. Merged from trunk
+          r17161.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to gdk-pixbuf-2.34.0. Merged from trunk
+          r17165.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to gobject-introspection-1.48.0.
+          Merged from trunk r17170.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to glib-48.0. Merged from trunk
+          r17170.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to icu-57.1. Merged from trunk r17171.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Add libinput as an optional dependency in
+          xfce4-settings. Merged from trunk r17172.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to libsigc++-2.8.0. Merged from trunk
+          r17173.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to proftpd-1.3.5b. Merged from trunk
+          r17173.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to seamonkey-2.40. Merged from trunk
+          r17173.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to goffice-0.10.28. Merged from trunk
+          r17175.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to libgusb-0.2.9. Merged from trunk
+          r17175.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to gtk-doc-1.25. Merged from trunk
+          r17175.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Add "make depend" to OpenSSL as recommended by
+          config.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to Business-ISBN-2.010. Merged from trunk
+          r17185.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to Log-Log4perl-1.47. Merged from trunk
+          r17185.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to Unicode-LineBreak-2016.003. Merged from
+          trunk r17185.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Updated glibmm dependencies. Merged from trunk
+          r17186.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Updated to pango-1.40.0. Merged from trunk
+          r17186.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Updated to clutter-gtk-1.8.0. Merged from trunk
+          r17187.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Updated to clutter-gst-3.0.18. Merged from trunk
+          r17187.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Updated to clutter-1.26.0. Merged from trunk
+          r17187.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Updated to newt-0.52.19. Merged from trunk
+          r17187.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Updated to json-glib-1.2.0. Merged from trunk
+          r17187.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to exempi-2.3.0. Merged from trunk
+          r17189.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to udisks-2.1.7. Merged from trunk
+          r17189.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to pidgin-2.10.12. Merged from trunk
+          r17189.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to avahi-0.6.32. Merged from trunk
+          r17189.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to ntfs-3g_ntfsprogs-2016.2.22. Merged from
+          trunk r17190.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to pygobject-3.20.0. Merged from trunk
+          r17190.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to transmission-2.92. Merged from trunk
+          r17190.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to nmap-7.12. Merged from trunk
+          r17194.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to whois-5.2.12. Merged from trunk
+          r17194.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Remove obsolete pidgin patch. Merged from trunk
+          r17195.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to graphite2-1.3.8 Merged from trunk
+          r17197.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to OpenJDK-1.8.0.77. Merged from trunk
+          r17198.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to cups-filters-1.8.3. Merged from trunk
+          r17203.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Add desktop-file-utils and shared-mime-info
+          as recommended dependencies for fontforge. Merged from trunk
+          r17204.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Change the command explanations in GCC for the new
+          switch "gcc4-compatible" and change the instructions to use an
+          in-tree build directory. Merged from trunk r17206.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to elfutils-0.166. Merged from trunk
+          r17207.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to mariadb-10.1.13. Merged from trunk
+          r17207.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to glibmm-2.48.1. Merged from trunk
+          r17207.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to alsa-lib-1.1.1. Merged from trunk
+          r17207.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to alsa-plugins-1.1.1. Merged from trunk
+          r17207.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to alsa-utils-1.1.1. Merged from trunk
+          r17207.</para>
+        </listitem> 
+        <listitem>
+          <para>[renodr] - Update to Archive-Zip-1.57. Merged from trunk
+          r17208.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to xapian-core-1.2.23. Merged from trunk
+          r17208.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to qemu-2.5.1. Merged from trunk
+          r17208.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to audacious-3.7.1. Merged from trunk
+          r17208.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to audacious-plugins-3.7.1. Merged from trunk
+          r17208.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to giflib-5.1.4. Merged from trunk
+          r17209.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>May 6th, 2016</para>
       <itemizedlist>
         <listitem>

Modified: branches/systemd/multimedia/audioutils/audacious.xml
==============================================================================
--- branches/systemd/multimedia/audioutils/audacious.xml        Fri May  6 
15:54:06 2016        (r17327)
+++ branches/systemd/multimedia/audioutils/audacious.xml        Fri May  6 
18:40:16 2016        (r17328)
@@ -7,17 +7,17 @@
   <!ENTITY audacious-download-http
            
"http://distfiles.audacious-media-player.org/audacious-&audacious-version;.tar.bz2";>
   <!ENTITY audacious-download-ftp         " ">
-  <!ENTITY audacious-md5sum               "093208db6d22e9fa225cb8d83b981907">
+  <!ENTITY audacious-md5sum               "1e7fe437d7e975da36f98c3e1fbf51e5">
   <!ENTITY audacious-size                 "560 KB">
-  <!ENTITY audacious-buildsize            "47 MB (with Gtk and Qt5 user 
interfaces)">
-  <!ENTITY audacious-time                 "0.5 SBU (with Gtk and Qt5 user 
interfaces)">
+  <!ENTITY audacious-buildsize            "19 MB (with Gtk and Qt5 user 
interfaces)">
+  <!ENTITY audacious-time                 "0.3 SBU (with Gtk and Qt5 user 
interfaces)">
 
   <!ENTITY audacious-plugins-download
            
"http://distfiles.audacious-media-player.org/audacious-plugins-&audacious-plugins-version;.tar.bz2";>
-  <!ENTITY audacious-plugins-md5sum       "1cbf90fa8a3a9f30f8e68333399f68c2">
+  <!ENTITY audacious-plugins-md5sum       "6ae2f17885897e717b8bbafc32858e2f">
   <!ENTITY audacious-plugins-size         "1.8 MB">
-  <!ENTITY audacious-plugins-buildsize    "139 MB (with Gtk and Qt5 user 
interfaces)">
-  <!ENTITY audacious-plugins-time         "1.5 SBU (with Gtk and Qt5 user 
interfaces)">
+  <!ENTITY audacious-plugins-buildsize    "61 MB (with Gtk and Qt5 user 
interfaces)">
+  <!ENTITY audacious-plugins-time         "1.0 SBU (with Gtk and Qt5 user 
interfaces)">
 ]>
 
 <sect1 id="audacious" xreflabel="Audacious-&audacious-version;">

Modified: branches/systemd/multimedia/audioutils/mpg123.xml
==============================================================================
--- branches/systemd/multimedia/audioutils/mpg123.xml   Fri May  6 15:54:06 
2016        (r17327)
+++ branches/systemd/multimedia/audioutils/mpg123.xml   Fri May  6 18:40:16 
2016        (r17328)
@@ -6,8 +6,8 @@
 
   <!ENTITY mpg123-download-http 
"&sourceforge-repo;/mpg123/mpg123-&mpg123-version;.tar.bz2">
   <!ENTITY mpg123-download-ftp  " ">
-  <!ENTITY mpg123-md5sum        "a489e1e54de58cb1509582ffc28cf582">
-  <!ENTITY mpg123-size          "872 KB">
+  <!ENTITY mpg123-md5sum        "84e838650c4c593f4e66d1256e0468db">
+  <!ENTITY mpg123-size          "870 KB">
   <!ENTITY mpg123-buildsize     "15 MB">
   <!ENTITY mpg123-time          "0.2 SBU">
 ]>

Modified: branches/systemd/multimedia/libdriv/alsa-lib.xml
==============================================================================
--- branches/systemd/multimedia/libdriv/alsa-lib.xml    Fri May  6 15:54:06 
2016        (r17327)
+++ branches/systemd/multimedia/libdriv/alsa-lib.xml    Fri May  6 18:40:16 
2016        (r17328)
@@ -6,10 +6,10 @@
 
   <!ENTITY alsa-lib-download-http 
"&alsa-download-http;/lib/alsa-lib-&alsa-lib-version;.tar.bz2">
   <!ENTITY alsa-lib-download-ftp  
"&alsa-download-ftp;/lib/alsa-lib-&alsa-lib-version;.tar.bz2">
-  <!ENTITY alsa-lib-md5sum        "69515ca73c3c4a212ef45160dea846c1">
+  <!ENTITY alsa-lib-md5sum        "881060d2c568f7f49db82c58df2f9ddc">
   <!ENTITY alsa-lib-size          "912 KB">
-  <!ENTITY alsa-lib-buildsize     "32 MB (additional 36 MB for tests)">
-  <!ENTITY alsa-lib-time          "0.3 SBU (less than 0.1 SBU for tests)">
+  <!ENTITY alsa-lib-buildsize     "33 MB (with tests)">
+  <!ENTITY alsa-lib-time          "0.3 SBU (with tests)">
 ]>
 
 <sect1 id="alsa-lib" xreflabel="alsa-lib-&alsa-lib-version;">

Modified: branches/systemd/multimedia/libdriv/alsa-plugins.xml
==============================================================================
--- branches/systemd/multimedia/libdriv/alsa-plugins.xml        Fri May  6 
15:54:06 2016        (r17327)
+++ branches/systemd/multimedia/libdriv/alsa-plugins.xml        Fri May  6 
18:40:16 2016        (r17328)
@@ -6,7 +6,7 @@
 
   <!ENTITY alsa-plugins-download-http 
"&alsa-download-http;/plugins/alsa-plugins-&alsa-plugins-version;.tar.bz2">
   <!ENTITY alsa-plugins-download-ftp  
"&alsa-download-ftp;/plugins/alsa-plugins-&alsa-plugins-version;.tar.bz2">
-  <!ENTITY alsa-plugins-md5sum        "b123e42ed881b9adbc99e4040f257c39">
+  <!ENTITY alsa-plugins-md5sum        "69f9f3e2de3c97fc71d496e91e271fe5">
   <!ENTITY alsa-plugins-size          "360 KB">
   <!ENTITY alsa-plugins-buildsize     "4.8 MB">
   <!ENTITY alsa-plugins-time          "less than 0.1 SBU">
@@ -100,8 +100,7 @@
       running the following commands:
     </para>
 
-<screen><userinput>sed -i "/speex_preprocess.h/i#include &lt;stdint.h&gt;" 
speex/pcm_speex.c &amp;&amp;
-./configure &amp;&amp;
+<screen><userinput>./configure &amp;&amp;
 make</userinput></screen>
 
     <para>
@@ -116,6 +115,7 @@
 
   </sect2>
 
+<!--
   <sect2 role="commands">
     <title>Command Explanations</title>
 
@@ -125,6 +125,7 @@
     </para>
 
   </sect2>
+-->
 
   <sect2 role="content">
     <title>Contents</title>

Modified: branches/systemd/multimedia/libdriv/alsa-utils.xml
==============================================================================
--- branches/systemd/multimedia/libdriv/alsa-utils.xml  Fri May  6 15:54:06 
2016        (r17327)
+++ branches/systemd/multimedia/libdriv/alsa-utils.xml  Fri May  6 18:40:16 
2016        (r17328)
@@ -6,9 +6,9 @@
 
   <!ENTITY alsa-utils-download-http 
"&alsa-download-http;/utils/alsa-utils-&alsa-utils-version;.tar.bz2">
   <!ENTITY alsa-utils-download-ftp  
"&alsa-download-ftp;/utils/alsa-utils-&alsa-utils-version;.tar.bz2">
-  <!ENTITY alsa-utils-md5sum        "b9d6102fbbd0b68040bb77023ed30c0c">
+  <!ENTITY alsa-utils-md5sum        "f8d00ad5fba757b4c3735d066cc288e2">
   <!ENTITY alsa-utils-size          "1.1 MB">
-  <!ENTITY alsa-utils-buildsize     "9.3 MB">
+  <!ENTITY alsa-utils-buildsize     "9.4 MB">
   <!ENTITY alsa-utils-time          "0.1 SBU">
 ]>
 

Modified: branches/systemd/multimedia/libdriv/alsa.xml
==============================================================================
--- branches/systemd/multimedia/libdriv/alsa.xml        Fri May  6 15:54:06 
2016        (r17327)
+++ branches/systemd/multimedia/libdriv/alsa.xml        Fri May  6 18:40:16 
2016        (r17328)
@@ -21,8 +21,8 @@
 
   <para>The Linux kernel now provides ALSA support by
   default.  However, applications need to interface to that capability.  The
-  following five sections of the book deal with the five separate components of
-  ALSA: the libraries, the utilities, the tools, the firmware
+  following six sections of the book deal with the five separate components of
+  ALSA: the libraries, the plugins, the utilities, the tools, the firmware
   and the OSS compatibility libraries.</para>
 
 </sect1>

Modified: branches/systemd/multimedia/libdriv/gst10-plugins-bad.xml
==============================================================================
--- branches/systemd/multimedia/libdriv/gst10-plugins-bad.xml   Fri May  6 
15:54:06 2016        (r17327)
+++ branches/systemd/multimedia/libdriv/gst10-plugins-bad.xml   Fri May  6 
18:40:16 2016        (r17328)
@@ -185,6 +185,16 @@
 <screen role="root"><userinput>make install</userinput></screen>
   </sect2>
 
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+    
+    <para>
+      <option>--disable-wayland</option>: This option is required
+      without a full wayland-based desktop environment.
+    </para>
+
+  </sect2>
+
   <sect2 role="content">
     <title>Contents</title>
 

Modified: branches/systemd/multimedia/libdriv/gst10-plugins-good.xml
==============================================================================
--- branches/systemd/multimedia/libdriv/gst10-plugins-good.xml  Fri May  6 
15:54:06 2016        (r17327)
+++ branches/systemd/multimedia/libdriv/gst10-plugins-good.xml  Fri May  6 
18:40:16 2016        (r17328)
@@ -137,15 +137,7 @@
       following commands:
     </para>
 
-<screen><userinput>sed -e '/smgradio/ {
-    a \  \/* Radionomy Hot40Music shoutcast stream *\/
-    a \  g_object_set (src, "location",
-    a \      "http://streaming.radionomy.com:80/Hot40Music";, NULL);
-  }'  \
-    -e '/Virgin/,/smgradio/d' \
-    -i tests/check/elements/souphttpsrc.c &amp;&amp;
-
-./configure --prefix=/usr \
+<screen><userinput>./configure --prefix=/usr \
             --with-package-name="GStreamer Good Plugins 
&gst10-plugins-good-version; BLFS" \
             
--with-package-origin="http://www.linuxfromscratch.org/blfs/view/svn/";  
&amp;&amp;
 make</userinput></screen>
@@ -159,19 +151,6 @@
     </para>
 
 <screen role="root"><userinput>make install</userinput></screen>
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para><command>sed -e '/smgradio/ ...
-                       -i tests/check/elements/souphttpsrc.c</command>: Fixes
-    failing ICY test. Previous provider has streaming disabled outside UK.<!--
-    To be removed at release 1.6.3.
-    tests: souphttpsrc test_icy_stream:0: Assertion 'caps != NULL' failed
-    https://bugzilla.gnome.org/show_bug.cgi?id=758114
-    
https://bug758114.bugzilla-attachments.gnome.org/attachment.cgi?id=316570-->
-    </para>
 
   </sect2>
 

Modified: branches/systemd/multimedia/libdriv/mlt.xml
==============================================================================
--- branches/systemd/multimedia/libdriv/mlt.xml Fri May  6 15:54:06 2016        
(r17327)
+++ branches/systemd/multimedia/libdriv/mlt.xml Fri May  6 18:40:16 2016        
(r17328)
@@ -72,11 +72,12 @@
       <xref linkend='doxygen'/>,
       <xref linkend="libexif"/>,
       <xref linkend="sdl"/>,
+      <ulink url="http://www.fftw.org/";>FFTW</ulink>,
       <ulink url="http://jackaudio.org";>JACK</ulink>,
-      <!--<ulink url="http://www.ladspa.org/";>LADSPA</ulink>,-->
       <ulink 
url="http://www.ipswitchft.com/moveit-managed-file-transfer/";>MOVEit</ulink>,
-      <ulink url="http://sox.sourceforge.net/";>SoX</ulink>, and
-      <ulink url="http://swfdec.freedesktop.org/wiki/";>Swfdec</ulink>
+      <ulink url="http://sox.sourceforge.net/";>SoX</ulink>,
+      <ulink url="http://swfdec.freedesktop.org/wiki/";>Swfdec</ulink>, and
+      <ulink url="http://public.hronopik.de/vid.stab/";>vid.stab</ulink>
     </para>
 
     <para condition="html" role="usernotes">User Notes:

Modified: branches/systemd/networking/netlibs/curl.xml
==============================================================================
--- branches/systemd/networking/netlibs/curl.xml        Fri May  6 15:54:06 
2016        (r17327)
+++ branches/systemd/networking/netlibs/curl.xml        Fri May  6 18:40:16 
2016        (r17328)
@@ -6,8 +6,8 @@
 
   <!ENTITY curl-download-http 
"https://curl.haxx.se/download/curl-&curl-version;.tar.lzma";>
   <!ENTITY curl-download-ftp  " ">
-  <!ENTITY curl-md5sum        "8242c073d8e5fc1c2a1aa946f1e903a4">
-  <!ENTITY curl-size          "2.8 MB">
+  <!ENTITY curl-md5sum        "de75665721e3adb0a1d7e03b90c3d7a2">
+  <!ENTITY curl-size          "5.6 MB">
   <!ENTITY curl-buildsize     "56 MB (with tests)">
   <!ENTITY curl-time          "0.4 SBU (additional 8.8 SBU for tests, with 
parallelism = 4)">
 ]>

Modified: branches/systemd/networking/netlibs/glib-networking.xml
==============================================================================
--- branches/systemd/networking/netlibs/glib-networking.xml     Fri May  6 
15:54:06 2016        (r17327)
+++ branches/systemd/networking/netlibs/glib-networking.xml     Fri May  6 
18:40:16 2016        (r17328)
@@ -5,9 +5,9 @@
   %general-entities;
 
   <!ENTITY glib-networking-download-http
-    
"&gnome-download-http;/glib-networking/2.46/glib-networking-&glib-networking-version;.tar.xz">
+    
"&gnome-download-http;/glib-networking/2.48/glib-networking-&glib-networking-version;.tar.xz">
   <!ENTITY glib-networking-download-ftp
-    
"&gnome-download-ftp;/glib-networking/2.46/glib-networking-&glib-networking-version;.tar.xz">
+    
"&gnome-download-ftp;/glib-networking/2.48/glib-networking-&glib-networking-version;.tar.xz">
   <!ENTITY glib-networking-md5sum        "c000e0b579f5d8fd48efebc7ac4d95dc">
   <!ENTITY glib-networking-size          "372 KB">
   <!ENTITY glib-networking-buildsize     "10 MB">

Modified: branches/systemd/networking/netlibs/libsoup.xml
==============================================================================
--- branches/systemd/networking/netlibs/libsoup.xml     Fri May  6 15:54:06 
2016        (r17327)
+++ branches/systemd/networking/netlibs/libsoup.xml     Fri May  6 18:40:16 
2016        (r17328)
@@ -5,9 +5,9 @@
   %general-entities;
 
   <!ENTITY libsoup-download-http
-           
"&gnome-download-http;/libsoup/2.52/libsoup-&libsoup-version;.tar.xz">
+           
"&gnome-download-http;/libsoup/2.54/libsoup-&libsoup-version;.tar.xz">
   <!ENTITY libsoup-download-ftp
-           
"&gnome-download-ftp;/libsoup/2.52/libsoup-&libsoup-version;.tar.xz">
+           
"&gnome-download-ftp;/libsoup/2.54/libsoup-&libsoup-version;.tar.xz">
   <!ENTITY libsoup-md5sum        "e4757d09012ed93822b1ee41435fec24">
   <!ENTITY libsoup-size          "1.7 MB">
   <!ENTITY libsoup-buildsize     "45 MB (with tests)">

Modified: branches/systemd/networking/netutils/avahi.xml
==============================================================================
--- branches/systemd/networking/netutils/avahi.xml      Fri May  6 15:54:06 
2016        (r17327)
+++ branches/systemd/networking/netutils/avahi.xml      Fri May  6 18:40:16 
2016        (r17328)
@@ -4,12 +4,12 @@
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
 
-  <!ENTITY avahi-download-http 
"http://avahi.org/download/avahi-&avahi-version;.tar.gz";>
+  <!ENTITY avahi-download-http 
"https://github.com/lathiat/avahi/releases/download/v&avahi-version;/avahi-&avahi-version;.tar.gz";>
   <!ENTITY avahi-download-ftp  " ">
-  <!ENTITY avahi-md5sum        "2f22745b8f7368ad5a0a3fddac343f2d">
-  <!ENTITY avahi-size          "1.3 MB">
+  <!ENTITY avahi-md5sum        "22b5e705d3eabb31d26f2e1e7b074013">
+  <!ENTITY avahi-size          "1.2 MB">
   <!ENTITY avahi-buildsize     "23 MB">
-  <!ENTITY avahi-time          "0.4 SBU">
+  <!ENTITY avahi-time          "0.3 SBU">
 ]>
 
 <sect1 id="avahi" xreflabel="Avahi-&avahi-version;">
@@ -124,13 +124,7 @@
     commands:</para>
 
 <!-- final part of sed removes " -DGDK_DISABLE_DEPRECATED=1 
-DGTK_DISABLE_DEPRECATED=1 \" -->
-<screen><userinput>sed -i 's/\(CFLAGS=.*\)-Werror \(.*\)/\1\2/' configure 
&amp;&amp;
-
-sed -e 's/-DG_DISABLE_DEPRECATED=1//' \
-    -e '/-DGDK_DISABLE_DEPRECATED/d'  \
-    -i avahi-ui/Makefile.in &amp;&amp;
-
-./configure --prefix=/usr        \
+<screen><userinput>./configure --prefix=/usr        \
             --sysconfdir=/etc    \
             --localstatedir=/var \
             --disable-static     \
@@ -157,13 +151,6 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
 
-    <para>
-      <command>sed -i ...</command>: These seds allow the package to build 
after
-      the deprecation of symbols in <literal>gtkstock.h</literal> by current
-      <application>gtk+-3</application> by removing <literal>-Werror</literal>
-      and by removing the defines for G{,DK,TK}_DISABLE_DEPRECATED.
-    </para>
-
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
       href="../../xincludes/static-libraries.xml"/>
 

Modified: branches/systemd/networking/netutils/nmap.xml
==============================================================================
--- branches/systemd/networking/netutils/nmap.xml       Fri May  6 15:54:06 
2016        (r17327)
+++ branches/systemd/networking/netutils/nmap.xml       Fri May  6 18:40:16 
2016        (r17328)
@@ -7,8 +7,8 @@
   <!ENTITY nmap-download-http 
"http://nmap.org/dist/nmap-&nmap-version;.tar.bz2";>
 <!--  <!ENTITY nmap-download-ftp  
"&gentoo-ftp-repo;/nmap-&nmap-version;.tar.bz2">-->
   <!ENTITY nmap-download-ftp  " ">
-  <!ENTITY nmap-md5sum        "7fa4edc592184c7addc14f5acb3fe6f7">
-  <!ENTITY nmap-size          "8.6 MB">
+  <!ENTITY nmap-md5sum        "0764f4dabe7cccda3c49fc3990b62a8a">
+  <!ENTITY nmap-size          "8.5 MB">
   <!ENTITY nmap-buildsize     "158 MB (with tests)">
   <!ENTITY nmap-time          "0.8 SBU (with tests)">
 ]>

Modified: branches/systemd/networking/netutils/whois.xml
==============================================================================
--- branches/systemd/networking/netutils/whois.xml      Fri May  6 15:54:06 
2016        (r17327)
+++ branches/systemd/networking/netutils/whois.xml      Fri May  6 18:40:16 
2016        (r17328)
@@ -6,8 +6,8 @@
 
   <!ENTITY whois-download-http 
"http://ftp.debian.org/debian/pool/main/w/whois/whois_&whois-version;.tar.xz";>
   <!ENTITY whois-download-ftp  
"ftp://ftp.debian.org/debian/pool/main/w/whois/whois_&whois-version;.tar.xz";>
-  <!ENTITY whois-md5sum        "df870615563b23e2270ffc4f039290a1">
-  <!ENTITY whois-size          "80 KB">
+  <!ENTITY whois-md5sum        "b8f1482827137788016a418cc1ae364b">
+  <!ENTITY whois-size          "79 KB">
   <!ENTITY whois-buildsize     "1.7 MB">
   <!ENTITY whois-time          "less than 0.1 SBU">
 ]>

Modified: branches/systemd/packages.ent
==============================================================================
--- branches/systemd/packages.ent       Fri May  6 15:54:06 2016        (r17327)
+++ branches/systemd/packages.ent       Fri May  6 18:40:16 2016        (r17328)
@@ -48,7 +48,7 @@
 <!ENTITY jfsutils-version             "1.1.15">
 <!ENTITY lvm2-version                 "2.02.146">
 <!ENTITY mdadm-version                "3.4">
-<!ENTITY ntfs-3g-version              "2015.3.14">
+<!ENTITY ntfs-3g-version              "2016.2.22">
 <!ENTITY gptfdisk-version             "1.0.1">
 <!ENTITY parted-version               "3.2">
 <!ENTITY reiser-version               "3.6.24">
@@ -69,7 +69,7 @@
 <!ENTITY zsh-version                  "5.2">
 
 <!-- Chapter 8 Virtualization -->
-<!ENTITY qemu-version                 "2.5.0">
+<!ENTITY qemu-version                 "2.5.1">
 
 <!-- Part III -->
 <!-- Chapter 9 -->
@@ -86,17 +86,17 @@
 <!ENTITY clucene-version              "2.3.3.4">
 <!ENTITY dbus-glib-version            "0.106">
 <!ENTITY enchant-version              "1.6.0">
-<!ENTITY exempi-version               "2.2.2">
+<!ENTITY exempi-version               "2.3.0">
 <!ENTITY expat-version                "2.1.0">
 <!ENTITY gcab-version                 "0.6">
-<!ENTITY glib2-version                "2.46.2">
-<!ENTITY glibmm-version               "2.46.3">
+<!ENTITY glib2-version                "2.48.0">
+<!ENTITY glibmm-version               "2.48.1">
 <!ENTITY gmime-version                "2.6.20">
-<!ENTITY gobject-introspection-version "1.46.0">
+<!ENTITY gobject-introspection-version "1.48.0">
 <!ENTITY grantlee-version             "0.5.1">
 <!ENTITY gsl-version                  "2.1">
 
-<!ENTITY icu-major                    "56">
+<!ENTITY icu-major                    "57">
 <!ENTITY icu-minor                    "1">
 <!ENTITY icu-patch                    "0">
 <!ENTITY icu-version                  "&icu-major;.&icu-minor;"><!-- 
.&icu-patch;-->
@@ -106,7 +106,7 @@
 <!ENTITY JS-version                   "17.0.0">
 <!ENTITY JS2-version                  "24.2.0">
 <!ENTITY json-c-version               "0.12">
-<!ENTITY json-glib-version            "1.0.4">
+<!ENTITY json-glib-version            "1.2.0">
 <!ENTITY keyutils-version             "1.5.9">
 <!ENTITY libarchive-version           "3.1.2">
 <!ENTITY libassuan-version            "2.4.2">
@@ -125,7 +125,7 @@
 <!ENTITY libgpg-error-version         "1.21">
 <!ENTITY libgsf-version               "1.14.36">
 <!ENTITY libgudev-version             "230">
-<!ENTITY libgusb-version              "0.2.8">
+<!ENTITY libgusb-version              "0.2.9">
 <!ENTITY libical-version              "2.0.0">
 <!ENTITY libidn-version               "1.32">
 <!ENTITY libiodbc-version             "3.52.10">
@@ -137,7 +137,7 @@
 <!ENTITY libpciaccess-version         "0.13.4">
 <!ENTITY libqmi-version               "1.12.6">
 <!ENTITY libpaper-version             "1.1.24+nmu4">
-<!ENTITY libsigc-version              "2.6.2">
+<!ENTITY libsigc-version              "2.8.0">
 <!ENTITY libsigsegv-version           "2.10">
 <!ENTITY libstatgrab-version          "0.91">
 <!ENTITY libtasn1-version             "4.7">
@@ -164,7 +164,7 @@
 <!ENTITY talloc-version               "2.1.6">
 <!ENTITY wayland-version              "1.10.0">
 <!ENTITY wv-version                   "1.2.9">
-<!ENTITY xapian-version               "1.2.22">
+<!ENTITY xapian-version               "1.2.23">
 <!ENTITY yaml-version                 "0.1.6">
 
 <!-- Chapter 10 -->
@@ -175,8 +175,8 @@
 <!ENTITY fontconfig-version           "2.11.1">  <!-- stable lt .90 micro 
version -->
 <!ENTITY fribidi-version              "0.19.7">
 <!ENTITY gegl-version                 "0.2.0">
-<!ENTITY giflib-version               "5.1.2">
-<!ENTITY graphite2-version            "1.3.5">
+<!ENTITY giflib-version               "5.1.4">
+<!ENTITY graphite2-version            "1.3.8">
 <!ENTITY harfbuzz-version             "1.1.3">
 <!ENTITY ijs-version                  "0.35">
 <!ENTITY jasper-version               "1.900.1">
@@ -193,7 +193,7 @@
                                                        svg pixbuf loader. -->
 <!ENTITY libtiff-version              "4.0.6">
 <!ENTITY libwebp-version              "0.5.0">
-<!ENTITY newt-version                 "0.52.18">
+<!ENTITY newt-version                 "0.52.19">
 <!ENTITY opencv-version               "3.1.0">
 <!ENTITY openjpeg-version             "1.5.2">
 <!ENTITY openjpeg2-version            "2.1.0">
@@ -209,7 +209,7 @@
 <!ENTITY desktop-file-utils-version   "0.22">
 <!ENTITY gperf-version                "3.0.4">
 <!ENTITY graphviz-version             "2.38.0">   <!-- Even minors only -->
-<!ENTITY gtk-doc-version              "1.24">
+<!ENTITY gtk-doc-version              "1.25">
 <!ENTITY hd2u-version                 "1.0.3">
 <!ENTITY highlight-version            "3.22">
 <!ENTITY ibus-version                 "1.5.11">
@@ -258,7 +258,7 @@
 <!ENTITY strigi-version               "0.7.8">
 <!ENTITY sysstat-version              "11.2.0">
 <!ENTITY udisks-version               "1.0.5">    <!-- stable lt .90 micro 
version -->
-<!ENTITY udisks2-version              "2.1.6">    <!-- stable lt .90 micro 
version -->
+<!ENTITY udisks2-version              "2.1.7">    <!-- stable lt .90 micro 
version -->
 <!ENTITY upower-version               "0.99.3">
 <!ENTITY unrar-version                "5.3.11">
 <!ENTITY unzip-version                "6.0">
@@ -278,7 +278,7 @@
 <!--<!ENTITY cvs-version                  "1.11.23"> -->
 <!ENTITY dejagnu-version              "1.5.3">
 <!ENTITY doxygen-version              "1.8.11">
-<!ENTITY elfutils-version             "0.165">
+<!ENTITY elfutils-version             "0.166">
 <!ENTITY expect-version               "5.45">
 <!ENTITY gcc-version                  "5.3.0">
 <!ENTITY gcc-java-version             "5.3.0">
@@ -314,15 +314,15 @@
 <!ENTITY apache-ant-version           "1.9.6">
 <!ENTITY junit-version                "4.11">
 <!ENTITY hamcrest-version             "1.3">
-<!ENTITY openjdk-version              "1.8.0.72">
+<!ENTITY openjdk-version              "1.8.0.77">
 
 <!ENTITY python2-majorver             "2.7">
 <!ENTITY python3-majorver             "3.5">
 
 <!-- Perl module versions used in the Perl Modules instructions -->
 <!ENTITY autovivification-version     "0.16">
-<!ENTITY Archive-Zip-version          "1.56">
-<!ENTITY Business-ISBN-version        "2.09">
+<!ENTITY Archive-Zip-version          "1.57">
+<!ENTITY Business-ISBN-version        "2.010">
 <!ENTITY Business-ISMN-version        "1.13">
 <!ENTITY Business-ISSN-version        "1.001">
 <!ENTITY Class-Accessor-version       "0.34">
@@ -340,7 +340,7 @@
 <!ENTITY IPC-Run3-version             "0.048">
 <!ENTITY List-AllUtils-version        "0.09">
 <!ENTITY List-MoreUtils-version       "0.413">
-<!ENTITY Log-Log4perl-version         "1.46">
+<!ENTITY Log-Log4perl-version         "1.47">
 <!ENTITY LWP-version                  "6.15">
 <!ENTITY LWP-Protocol-https-version   "6.06">
 <!ENTITY Module-Build-version         "0.4216">
@@ -352,7 +352,7 @@
 <!ENTITY Text-BibTeX-version          "0.71">
 <!ENTITY Text-Roman-version           "3.5">
 <!ENTITY Unicode-Collate-version      "1.14">
-<!ENTITY Unicode-LineBreak-version    "2015.12">
+<!ENTITY Unicode-LineBreak-version    "2016.003">
 <!ENTITY Unicode-Normalize-version    "1.25">
 <!ENTITY URI-version                  "1.71">
 <!ENTITY XML-LibXML-Simple-version    "0.95">
@@ -369,7 +369,7 @@
 <!ENTITY py2cairo-version             "1.10.0">
 <!ENTITY pycairo-version              "1.10.0">
 <!ENTITY pygobject2-version           "2.28.6">
-<!ENTITY pygobject3-version           "3.18.2">
+<!ENTITY pygobject3-version           "3.20.0">
 <!ENTITY pygtk-version                "2.24.0">
 <!ENTITY pyxdg-version                "0.25">
 <!ENTITY PyYAML-version               "3.11">
@@ -397,21 +397,21 @@
 <!ENTITY wpa_supplicant-version       "2.5">
 
 <!-- Chapter 16 -->
-<!ENTITY avahi-version                "0.6.31">
+<!ENTITY avahi-version                "0.6.32">
 <!ENTITY bind-minor-version           "9.10">
 <!ENTITY bind-version                 "&bind-minor-version;.3-P3">
 <!ENTITY mod_dnssd-version            "0.6">
 <!ENTITY NetworkManager-version       "1.0.10">
-<!ENTITY nmap-version                 "7.01">
+<!ENTITY nmap-version                 "7.12">
 <!ENTITY traceroute-version           "2.1.0">
-<!ENTITY whois-version                "5.2.11">
+<!ENTITY whois-version                "5.2.12">
 <!ENTITY wicd-version                 "1.7.4">
 <!ENTITY wireshark-version            "2.0.1">  <!-- even minors only -->
 
 <!ENTITY wicd-major-version           "1.7">
 
 <!-- Chapter 17 -->
-<!ENTITY curl-version                 "7.47.1">
+<!ENTITY curl-version                 "7.48.0">
 <!ENTITY geoclue-version              "0.12.0">
 <!ENTITY geoclue2-version             "2.2.0">
 <!ENTITY glib-networking-version      "2.46.1">
@@ -443,7 +443,7 @@
 <!-- Part V -->
 <!-- Chapter 20 -->
 <!ENTITY apache-version               "2.4.18">
-<!ENTITY proftpd-version              "1.3.5a">
+<!ENTITY proftpd-version              "1.3.5b">
 <!ENTITY vsftpd-version               "3.0.3">
 
 <!-- Chapter 21 -->
@@ -459,7 +459,7 @@
 <!-- Chapter 22 -->
 <!ENTITY db-version                   "6.1.26">
 <!ENTITY lmdb-version                 "0.9.18">
-<!ENTITY mariadb-version              "10.1.12">
+<!ENTITY mariadb-version              "10.1.13">
 <!ENTITY postgresql-version           "9.5.1">
 <!ENTITY sqlite-version               "3.11.0">
 
@@ -497,7 +497,7 @@
 
 <!-- Chapter 25 -->
 <!ENTITY agg-version                  "2.5">
-<!ENTITY atk-version                  "2.18.0">
+<!ENTITY atk-version                  "2.20.0">
 <!ENTITY atkmm-version                "2.24.2">
 <!ENTITY at-spi2-core-version         "2.18.3">
 <!ENTITY at-spi2-atk-version          "2.18.1">
@@ -505,14 +505,14 @@
 <!ENTITY cairomm-version              "1.12.0">
 <!ENTITY cogl-version                 "1.22.0">
 <!ENTITY colord-gtk-version           "0.1.26">
-<!ENTITY clutter-version              "1.24.2">
-<!ENTITY clutter-gst-version          "3.0.16">
-<!ENTITY clutter-gtk-version          "1.6.6">
+<!ENTITY clutter-version              "1.26.0">
+<!ENTITY clutter-gst-version          "3.0.18">
+<!ENTITY clutter-gtk-version          "1.8.0">
 <!ENTITY fltk-version                 "1.3.3">
 <!ENTITY freeglut-version             "3.0.0">
-<!ENTITY gdk-pixbuf-version           "2.32.3">
+<!ENTITY gdk-pixbuf-version           "2.34.0">
 <!ENTITY glu-version                  "9.0.0">
-<!ENTITY goffice010-version           "0.10.27">
+<!ENTITY goffice010-version           "0.10.28">
 <!ENTITY gtk2-version                 "2.24.30">
 <!ENTITY gtk3-version                 "3.18.6">
 <!ENTITY gtk-engines-version          "2.20.2">
@@ -524,7 +524,7 @@
 <!ENTITY keybinder2-version           "0.3.0">
 <!ENTITY libnotify-version            "0.7.6">
 <!ENTITY libxklavier-version          "5.4">
-<!ENTITY pango-version                "1.38.1">
+<!ENTITY pango-version                "1.40.0">
 <!ENTITY pangomm-version              "2.38.1">
 <!ENTITY qt4-version                  "4.8.7">
 <!ENTITY qt5-version                  "5.5.1">
@@ -673,7 +673,7 @@
 <!ENTITY libreoffice-dlversion        
"&libreoffice-version;&libreoffice-patch;">
 
 <!-- Chapter 44 -->
-<!ENTITY seamonkey-version            "2.39">
+<!ENTITY seamonkey-version            "2.40">
 <!ENTITY firefox-version              "45.0">
 
 <!-- Chapter 45 -->
@@ -688,12 +688,12 @@
 <!ENTITY icedtea-web-version          "1.6.2">
 <!ENTITY inkscape-version             "0.91">
 <!ENTITY pan-version                  "0.133">
-<!ENTITY pidgin-version               "2.10.11">
+<!ENTITY pidgin-version               "2.10.12">
 <!ENTITY rox-filer-version            "2.11">
 <!ENTITY rxvt-unicode-version         "9.22">
 <!ENTITY thunderbird-version          "38.6.0">
 <!ENTITY tigervnc-version             "1.6.0">
-<!ENTITY transmission-version         "2.84">
+<!ENTITY transmission-version         "2.92">
 <!ENTITY xarchiver-version            "0.5.4">
 <!ENTITY xchat-version                "2.8.8">
 <!ENTITY xdg-utils-version            "1.1.1">
@@ -703,10 +703,10 @@
 <!-- Chapter 46 -->
 <!ENTITY alsa-download-http           "http://alsa.cybermirror.org";>
 <!ENTITY alsa-download-ftp            "ftp://ftp.alsa-project.org/pub";>
-<!ENTITY alsa-version                 "1.1.0">
-<!ENTITY alsa-lib-version             "1.1.0">
-<!ENTITY alsa-plugins-version         "1.1.0">
-<!ENTITY alsa-utils-version           "1.1.0">
+<!ENTITY alsa-version                 "1.1.1">
+<!ENTITY alsa-lib-version             "1.1.1">
+<!ENTITY alsa-plugins-version         "1.1.1">
+<!ENTITY alsa-utils-version           "1.1.1">
 <!ENTITY alsa-tools-version           "1.1.0">
 <!ENTITY alsa-firmware-version        "1.0.29">
 <!ENTITY alsa-oss-version             "1.0.28">
@@ -775,13 +775,13 @@
 <!ENTITY xvid-version                 "1.3.3">
 
 <!-- Chapter 47 -->
-<!ENTITY mpg123-version               "1.23.0">
+<!ENTITY mpg123-version               "1.23.3">
 <!ENTITY vorbistools-version          "1.4.0">
 <!ENTITY lame-version                 "3.99.5">
 <!ENTITY CDParanoia-version           "III-10.2">
 <!ENTITY freetts-version              "1.2.2">
-<!ENTITY audacious-version            "3.7.1">
-<!ENTITY audacious-plugins-version    "3.7.1">
+<!ENTITY audacious-version            "3.7.2">
+<!ENTITY audacious-plugins-version    "3.7.2">
 <!ENTITY amarok-version               "2.8.0">
 <!ENTITY pnmixer-version              "0.5.1">
 
@@ -804,7 +804,7 @@
 <!-- Part XII -->
 <!-- Chapter 50 -->
 <!ENTITY cups-version                 "2.1.3">
-<!ENTITY cups-filters-version         "1.8.2">
+<!ENTITY cups-filters-version         "1.8.3">
 <!ENTITY gs-version                   "9.18">
 <!ENTITY gutenprint-version           "5.2.11">
 

Modified: branches/systemd/postlfs/filesystems/lvm2.xml
==============================================================================
--- branches/systemd/postlfs/filesystems/lvm2.xml       Fri May  6 15:54:06 
2016        (r17327)
+++ branches/systemd/postlfs/filesystems/lvm2.xml       Fri May  6 18:40:16 
2016        (r17328)
@@ -176,7 +176,7 @@
       and a small number of test failures is expected by upstream. More
       failures may happen because some kernel options are missing. For example,
       the lack of the <emphasis>dm-delay</emphasis> device mapper target may
-      explain up to 10 failures or so. Some tests are flagged
+      explain some failures. Some tests are flagged
       <quote>warned</quote> if
       <ulink url='https://github.com/jthornber/thin-provisioning-tools'>
       thin-provisioning-tools</ulink> are not installed. A workaround is to

Modified: branches/systemd/postlfs/filesystems/ntfs-3g.xml
==============================================================================
--- branches/systemd/postlfs/filesystems/ntfs-3g.xml    Fri May  6 15:54:06 
2016        (r17327)
+++ branches/systemd/postlfs/filesystems/ntfs-3g.xml    Fri May  6 18:40:16 
2016        (r17328)
@@ -7,10 +7,10 @@
   <!ENTITY ntfs-3g-download-http
            
"https://tuxera.com/opensource/ntfs-3g_ntfsprogs-&ntfs-3g-version;.tgz";>
   <!ENTITY ntfs-3g-download-ftp  " ">
-  <!ENTITY ntfs-3g-md5sum        "8cd57768310e3b2be39b3191d808e241">
-  <!ENTITY ntfs-3g-size          "1.1 MB">
-  <!ENTITY ntfs-3g-buildsize     "19 MB">
-  <!ENTITY ntfs-3g-time          "0.5 SBU">
+  <!ENTITY ntfs-3g-md5sum        "ccbe8672d0f757bd0c975b50aa4c512e">
+  <!ENTITY ntfs-3g-size          "1.2 MB">
+  <!ENTITY ntfs-3g-buildsize     "17 MB">
+  <!ENTITY ntfs-3g-time          "0.2 SBU">
 ]>
 
 <sect1 id="ntfs-3g" xreflabel="ntfs-3g-&ntfs-3g-version;">

Modified: branches/systemd/postlfs/security/openssl.xml
==============================================================================
--- branches/systemd/postlfs/security/openssl.xml       Fri May  6 15:54:06 
2016        (r17327)
+++ branches/systemd/postlfs/security/openssl.xml       Fri May  6 18:40:16 
2016        (r17328)
@@ -119,6 +119,7 @@
          --libdir=lib          \
          shared                \
          zlib-dynamic &amp;&amp;
+make depend           &amp;&amp;
 make</userinput></screen>
 
     <para>

Modified: branches/systemd/postlfs/virtualization/qemu.xml
==============================================================================
--- branches/systemd/postlfs/virtualization/qemu.xml    Fri May  6 15:54:06 
2016        (r17327)
+++ branches/systemd/postlfs/virtualization/qemu.xml    Fri May  6 18:40:16 
2016        (r17328)
@@ -6,10 +6,10 @@
 
   <!ENTITY qemu-download-http 
"http://wiki.qemu.org/download/qemu-&qemu-version;.tar.bz2";>
   <!ENTITY qemu-download-ftp  " ">
-  <!ENTITY qemu-md5sum        "f469f2330bbe76e3e39db10e9ac4f8db">
-  <!ENTITY qemu-size          "25 MB">
-  <!ENTITY qemu-buildsize     "419 MB (with tests)">
-  <!ENTITY qemu-time          "2.4 SBU (with tests)">
+  <!ENTITY qemu-md5sum        "42e73182dea8b9213fa7050e168a4615">
+  <!ENTITY qemu-size          "24 MB">
+  <!ENTITY qemu-buildsize     "397 MB (with tests)">
+  <!ENTITY qemu-time          "2.8 SBU (with tests)">
 ]>
 
 <sect1 id="qemu" xreflabel="qemu-&qemu-version;">
@@ -185,9 +185,7 @@
 
     <para>Now, as the <systemitem class="username">root</systemitem> 
user:</para>
 
-<screen role="root"><userinput>make install &amp;&amp;
-[ -e  /usr/lib/libcacard.so ] &amp;&amp;
-chmod -v 755 /usr/lib/libcacard.so</userinput></screen>
+<screen role="root"><userinput>make install</userinput></screen>
 
     <para>
       You will need a dedicated group that will contain users (other than root)
@@ -212,13 +210,9 @@
 <literal>KERNEL=="kvm", GROUP="kvm", MODE="0660"</literal>
 EOF</userinput></screen>
 
-    <note><!--<para>The main program <command>qemu-system-x86_64</command> 
doesn't
-    make a distinction between i386 and x86_64 so even on an i386 system you
-    should use <emphasis>qemu-system-x86_64</emphasis></para>
-    -->
-
-    <para>For convenience you may want to create a symbolic link to run
-    The installed program. For instance:</para>
+    <note>
+      <para>For convenience you may want to create a symbolic link to run
+      The installed program. For instance:</para>
 
 <screen role="root"><userinput>ln -sv qemu-system-`uname -m` 
/usr/bin/qemu</userinput></screen>
     </note>

Modified: branches/systemd/pst/printing/cups-filters.xml
==============================================================================
--- branches/systemd/pst/printing/cups-filters.xml      Fri May  6 15:54:06 
2016        (r17327)
+++ branches/systemd/pst/printing/cups-filters.xml      Fri May  6 18:40:16 
2016        (r17328)
@@ -7,9 +7,9 @@
   <!ENTITY cups-filters-download-http
   
"https://www.openprinting.org/download/cups-filters/cups-filters-&cups-filters-version;.tar.xz";>
   <!ENTITY cups-filters-download-ftp  " ">
-  <!ENTITY cups-filters-md5sum        "a32a83aef1808e4ccabad96a593a9f89">
-  <!ENTITY cups-filters-size          "1.4 MB">
-  <!ENTITY cups-filters-buildsize     "50 MB (with tests)">
+  <!ENTITY cups-filters-md5sum        "6554a92ae338cbfe40a45819d65c3738">
+  <!ENTITY cups-filters-size          "1.3 MB">
+  <!ENTITY cups-filters-buildsize     "40 MB (with tests)">
   <!ENTITY cups-filters-time          "0.4 SBU (with tests)">
 ]>
 

Modified: branches/systemd/server/databases/mariadb.xml
==============================================================================
--- branches/systemd/server/databases/mariadb.xml       Fri May  6 15:54:06 
2016        (r17327)
+++ branches/systemd/server/databases/mariadb.xml       Fri May  6 18:40:16 
2016        (r17328)
@@ -6,10 +6,10 @@
 
   <!ENTITY mariadb-download-http 
"https://downloads.mariadb.org/interstitial/mariadb-&mariadb-version;/source/mariadb-&mariadb-version;.tar.gz";>
   <!ENTITY mariadb-download-ftp  
"ftp://mirrors.fe.up.pt/pub/mariadb/mariadb-&mariadb-version;/source/mariadb-&mariadb-version;.tar.gz";>
-  <!ENTITY mariadb-md5sum        "a2c0809f27ec112139c2c50f03569b2b">
+  <!ENTITY mariadb-md5sum        "aa881ff81a181c7357a90b8a357dee7c">
   <!ENTITY mariadb-size          "53 MB">
-  <!ENTITY mariadb-buildsize     "1.2 GB (with tests)">
-  <!ENTITY mariadb-time          "4.5 SBU, (with parallelism=4 and tests)">
+  <!ENTITY mariadb-buildsize     "1.1 GB (with tests)">
+  <!ENTITY mariadb-time          "4.8 SBU, (with parallelism=4 and tests)">
 ]>
 
 <sect1 id="mariadb" xreflabel="MariaDB-&mariadb-version;">

Modified: branches/systemd/server/major/bind.xml
==============================================================================
--- branches/systemd/server/major/bind.xml      Fri May  6 15:54:06 2016        
(r17327)
+++ branches/systemd/server/major/bind.xml      Fri May  6 18:40:16 2016        
(r17328)
@@ -152,7 +152,6 @@
     class="username">root</systemitem> user:</para>
 
 <screen role="root"><userinput>make install &amp;&amp;
-chmod -v 0755 /usr/lib/lib{bind9,dns,isc{,cc,cfg},lwres}.so &amp;&amp;
 
 install -v -m755 -d /usr/share/doc/bind-&bind-version;/{arm,misc} &amp;&amp;
 install -v -m644    doc/arm/*.html \
@@ -186,11 +185,6 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
       href="../../xincludes/static-libraries.xml"/>
 
-    <para><command>chmod 0755
-    /usr/lib/{lib{bind9,dns,isc{,cc,cfg},lwres}.so</command>:
-    Enable the execute bit to prevent a warning when using
-    <command>ldd</command> to check library dependencies.</para>
-
     <para><command>cd doc; install ...</command>: These commands install
     additional package documentation. Omit any or all of these commands if
     desired.</para>

Modified: branches/systemd/server/major/proftpd.xml
==============================================================================
--- branches/systemd/server/major/proftpd.xml   Fri May  6 15:54:06 2016        
(r17327)
+++ branches/systemd/server/major/proftpd.xml   Fri May  6 18:40:16 2016        
(r17328)
@@ -6,10 +6,10 @@
 
   <!ENTITY proftpd-download-http " ">
   <!ENTITY proftpd-download-ftp  
"ftp://ftp.proftpd.org/distrib/source/proftpd-&proftpd-version;.tar.gz";>
-  <!ENTITY proftpd-md5sum        "b9d3092411478415b31d435f8e26d173">
+  <!ENTITY proftpd-md5sum        "f7b8e3a383b34a894c2502db74ccccde">
   <!ENTITY proftpd-size          "29 MB">
-  <!ENTITY proftpd-buildsize     "69 MB">
-  <!ENTITY proftpd-time          "0.2 SBU">
+  <!ENTITY proftpd-buildsize     "68 MB">
+  <!ENTITY proftpd-time          "0.3 SBU">
 ]>
 
 <sect1 id="proftpd" xreflabel="ProFTPD-&proftpd-version;">

Modified: branches/systemd/x/lib/at-spi2-atk.xml
==============================================================================
--- branches/systemd/x/lib/at-spi2-atk.xml      Fri May  6 15:54:06 2016        
(r17327)
+++ branches/systemd/x/lib/at-spi2-atk.xml      Fri May  6 18:40:16 2016        
(r17328)
@@ -5,9 +5,9 @@
   %general-entities;
 
   <!ENTITY at-spi2-atk-download-http
-           
"&gnome-download-http;/at-spi2-atk/2.18/at-spi2-atk-&at-spi2-atk-version;.tar.xz">
+           
"&gnome-download-http;/at-spi2-atk/2.20/at-spi2-atk-&at-spi2-atk-version;.tar.xz">
   <!ENTITY at-spi2-atk-download-ftp
-           
"&gnome-download-ftp;/at-spi2-atk/2.18/at-spi2-atk-&at-spi2-atk-version;.tar.xz">
+           
"&gnome-download-ftp;/at-spi2-atk/2.20/at-spi2-atk-&at-spi2-atk-version;.tar.xz">
   <!ENTITY at-spi2-atk-md5sum        "d7040a55df975865ab0d74a4b325afb5">
   <!ENTITY at-spi2-atk-size          "288 KB">
   <!ENTITY at-spi2-atk-buildsize     "7.8 MB">

Modified: branches/systemd/x/lib/at-spi2-core.xml
==============================================================================
--- branches/systemd/x/lib/at-spi2-core.xml     Fri May  6 15:54:06 2016        
(r17327)
+++ branches/systemd/x/lib/at-spi2-core.xml     Fri May  6 18:40:16 2016        
(r17328)
@@ -5,9 +5,9 @@
   %general-entities;
 
   <!ENTITY at-spi2-core-download-http
-           
"&gnome-download-http;/at-spi2-core/2.18/at-spi2-core-&at-spi2-core-version;.tar.xz">
+           
"&gnome-download-http;/at-spi2-core/2.20/at-spi2-core-&at-spi2-core-version;.tar.xz">
   <!ENTITY at-spi2-core-download-ftp
-           
"&gnome-download-ftp;/at-spi2-core/2.18/at-spi2-core-&at-spi2-core-version;.tar.xz">
+           
"&gnome-download-ftp;/at-spi2-core/2.20/at-spi2-core-&at-spi2-core-version;.tar.xz">
   <!ENTITY at-spi2-core-md5sum        "fc18801e56f6ce6914126f837d42f556">
   <!ENTITY at-spi2-core-size          "444 KB">
   <!ENTITY at-spi2-core-buildsize     "14 MB (with tests)">

Modified: branches/systemd/x/lib/atk.xml
==============================================================================
--- branches/systemd/x/lib/atk.xml      Fri May  6 15:54:06 2016        (r17327)
+++ branches/systemd/x/lib/atk.xml      Fri May  6 18:40:16 2016        (r17328)
@@ -4,10 +4,10 @@
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
 
-  <!ENTITY atk-download-http 
"&gnome-download-http;/atk/2.18/atk-&atk-version;.tar.xz">
-  <!ENTITY atk-download-ftp  
"&gnome-download-ftp;/atk/2.18/atk-&atk-version;.tar.xz">
-  <!ENTITY atk-md5sum        "fd3678f35004b4c92e3da39356996054">
-  <!ENTITY atk-size          "672 KB">
+  <!ENTITY atk-download-http 
"&gnome-download-http;/atk/2.20/atk-&atk-version;.tar.xz">
+  <!ENTITY atk-download-ftp  
"&gnome-download-ftp;/atk/2.20/atk-&atk-version;.tar.xz">
+  <!ENTITY atk-md5sum        "5187b0972f4d3905f285540b31395e20">
+  <!ENTITY atk-size          "707 KB">
   <!ENTITY atk-buildsize     "16 MB">
   <!ENTITY atk-time          "0.1 SBU">
 ]>

Modified: branches/systemd/x/lib/clutter-gst.xml
==============================================================================
--- branches/systemd/x/lib/clutter-gst.xml      Fri May  6 15:54:06 2016        
(r17327)
+++ branches/systemd/x/lib/clutter-gst.xml      Fri May  6 18:40:16 2016        
(r17328)
@@ -8,10 +8,10 @@
            
"&gnome-download-http;/clutter-gst/3.0/clutter-gst-&clutter-gst-version;.tar.xz">
   <!ENTITY clutter-gst-download-ftp
            
"&gnome-download-ftp;/clutter-gst/3.0/clutter-gst-&clutter-gst-version;.tar.xz">
-  <!ENTITY clutter-gst-md5sum        "ca24eb92a0d34fc9e66fd686a965d51c">
-  <!ENTITY clutter-gst-size          "397 KB">
-  <!ENTITY clutter-gst-buildsize     "10.1 MB">
-  <!ENTITY clutter-gst-time          "0.1 SBU">
+  <!ENTITY clutter-gst-md5sum        "3e4f64477f26d9cfd2db06d3aaed203a">
+  <!ENTITY clutter-gst-size          "400 KB">
+  <!ENTITY clutter-gst-buildsize     "8.5 MB">
+  <!ENTITY clutter-gst-time          "0.2 SBU">
 ]>
 
 <sect1 id="clutter-gst" xreflabel="clutter-gst-&clutter-gst-version;">

Modified: branches/systemd/x/lib/clutter-gtk.xml
==============================================================================
--- branches/systemd/x/lib/clutter-gtk.xml      Fri May  6 15:54:06 2016        
(r17327)
+++ branches/systemd/x/lib/clutter-gtk.xml      Fri May  6 18:40:16 2016        
(r17328)
@@ -5,10 +5,10 @@
   %general-entities;
 
   <!ENTITY clutter-gtk-download-http
-           
"&gnome-download-http;/clutter-gtk/1.6/clutter-gtk-&clutter-gtk-version;.tar.xz">
+           
"&gnome-download-http;/clutter-gtk/1.8/clutter-gtk-&clutter-gtk-version;.tar.xz">
   <!ENTITY clutter-gtk-download-ftp
-           
"&gnome-download-ftp;/clutter-gtk/1.6/clutter-gtk-&clutter-gtk-version;.tar.xz">
-  <!ENTITY clutter-gtk-md5sum        "79dc3d7a8645f87d83a9ccca8a08aa8e">
+           
"&gnome-download-ftp;/clutter-gtk/1.8/clutter-gtk-&clutter-gtk-version;.tar.xz">
+  <!ENTITY clutter-gtk-md5sum        "351cf9229cf941d36b441ede2236d742">
   <!ENTITY clutter-gtk-size          "320 KB">
   <!ENTITY clutter-gtk-buildsize     "5.3 MB">
   <!ENTITY clutter-gtk-time          "0.1 SBU">

Modified: branches/systemd/x/lib/clutter.xml
==============================================================================
--- branches/systemd/x/lib/clutter.xml  Fri May  6 15:54:06 2016        (r17327)
+++ branches/systemd/x/lib/clutter.xml  Fri May  6 18:40:16 2016        (r17328)
@@ -4,12 +4,12 @@
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
 
-  <!ENTITY clutter-download-http 
"&gnome-download-http;/clutter/1.24/clutter-&clutter-version;.tar.xz">
-  <!ENTITY clutter-download-ftp  
"&gnome-download-ftp;/clutter/1.24/clutter-&clutter-version;.tar.xz">
-  <!ENTITY clutter-md5sum        "3b98e1b33719982a5736ae42cbf7183e">
+  <!ENTITY clutter-download-http 
"&gnome-download-http;/clutter/1.26/clutter-&clutter-version;.tar.xz">
+  <!ENTITY clutter-download-ftp  
"&gnome-download-ftp;/clutter/1.26/clutter-&clutter-version;.tar.xz">
+  <!ENTITY clutter-md5sum        "b065e9ca53d1f6bc1ec26aeb27338bb7">
   <!ENTITY clutter-size          "5.1 MB">
-  <!ENTITY clutter-buildsize     "74 MB (additional 14 MB for tests)">
-  <!ENTITY clutter-time          "1.0 SBU (additional 0.6 SBU for tests)">
+  <!ENTITY clutter-buildsize     "88 MB (with tests)">
+  <!ENTITY clutter-time          "1.7 SBU (with tests)">
 ]>
 
 <sect1 id="clutter" xreflabel="Clutter-&clutter-version;">

Modified: branches/systemd/x/lib/gdk-pixbuf.xml
==============================================================================
--- branches/systemd/x/lib/gdk-pixbuf.xml       Fri May  6 15:54:06 2016        
(r17327)
+++ branches/systemd/x/lib/gdk-pixbuf.xml       Fri May  6 18:40:16 2016        
(r17328)
@@ -5,11 +5,11 @@
   %general-entities;
 
   <!ENTITY gdk-pixbuf-download-http
-           
"&gnome-download-http;/gdk-pixbuf/2.32/gdk-pixbuf-&gdk-pixbuf-version;.tar.xz">
+           
"&gnome-download-http;/gdk-pixbuf/2.34/gdk-pixbuf-&gdk-pixbuf-version;.tar.xz">
   <!ENTITY gdk-pixbuf-download-ftp
-           
"&gnome-download-ftp;/gdk-pixbuf/2.32/gdk-pixbuf-&gdk-pixbuf-version;.tar.xz">
-  <!ENTITY gdk-pixbuf-md5sum        "9275076639baa24a342f3e02c402920e">
-  <!ENTITY gdk-pixbuf-size          "2.4 MB">
+           
"&gnome-download-ftp;/gdk-pixbuf/2.34/gdk-pixbuf-&gdk-pixbuf-version;.tar.xz">
+  <!ENTITY gdk-pixbuf-md5sum        "63cb19f92cf7709ccf44bbb6fe1ff70c">
+  <!ENTITY gdk-pixbuf-size          "2.6 MB">
   <!ENTITY gdk-pixbuf-buildsize     "40 MB (additional 2 MB for tests)">
   <!ENTITY gdk-pixbuf-time          "4.0 SBU (with tests)">
 ]>

Modified: branches/systemd/x/lib/goffice010.xml
==============================================================================
--- branches/systemd/x/lib/goffice010.xml       Fri May  6 15:54:06 2016        
(r17327)
+++ branches/systemd/x/lib/goffice010.xml       Fri May  6 18:40:16 2016        
(r17328)
@@ -8,10 +8,10 @@
            
"&gnome-download-http;/goffice/0.10/goffice-&goffice010-version;.tar.xz">
   <!ENTITY goffice010-download-ftp
             
"&gnome-download-ftp;/goffice/0.10/goffice-&goffice010-version;.tar.xz">
-  <!ENTITY goffice010-md5sum        "15666df449d9de66cc246ec70aa7bd55">
+  <!ENTITY goffice010-md5sum        "7c4de58dd3e4230a6817d172b865ab84">
   <!ENTITY goffice010-size          "2.3 MB">
-  <!ENTITY goffice010-buildsize     "101 MB (with tests)">
-  <!ENTITY goffice010-time          "0.9 SBU (with tests)">
+  <!ENTITY goffice010-buildsize     "82 MB (with tests)">
+  <!ENTITY goffice010-time          "1.0 SBU (with tests)">
 ]>
 
 <sect1 id="goffice010" xreflabel="GOffice-&goffice010-version;">

Modified: branches/systemd/x/lib/gtk3.xml
==============================================================================
--- branches/systemd/x/lib/gtk3.xml     Fri May  6 15:54:06 2016        (r17327)
+++ branches/systemd/x/lib/gtk3.xml     Fri May  6 18:40:16 2016        (r17328)
@@ -139,12 +139,11 @@
     <!-- no, this probably isn't a real file name, it describes the file name
     as /style/set-widget-path-saved:  but life is too short to care,
     (ken) -->
-      At least one other test, <filename>set-widget-path-saved</filename>,
-      might fail.
+      The accessibility test (six subtests) is known to fail.
     </para>
 
     <para>
-      To test the results, issue <command>make check</command>.
+      To test the results, issue <command>make -k check</command>.
     </para>
 
     <para>

Modified: branches/systemd/x/lib/pango.xml
==============================================================================
--- branches/systemd/x/lib/pango.xml    Fri May  6 15:54:06 2016        (r17327)
+++ branches/systemd/x/lib/pango.xml    Fri May  6 18:40:16 2016        (r17328)
@@ -4,11 +4,11 @@
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
 
-  <!ENTITY pango-download-http 
"&gnome-download-http;/pango/1.38/pango-&pango-version;.tar.xz">
-  <!ENTITY pango-download-ftp  
"&gnome-download-ftp;/pango/1.38/pango-&pango-version;.tar.xz">
-  <!ENTITY pango-md5sum        "7fde35d4a127b55ce8bbcefe109bc80d">
+  <!ENTITY pango-download-http 
"&gnome-download-http;/pango/1.40/pango-&pango-version;.tar.xz">
+  <!ENTITY pango-download-ftp  
"&gnome-download-ftp;/pango/1.40/pango-&pango-version;.tar.xz">
+  <!ENTITY pango-md5sum        "186ce69b25709d891c2caaaa564a8307">
   <!ENTITY pango-size          "1024 KB">
-  <!ENTITY pango-buildsize     "27 MB (additional 2 MB to rebuild and install 
the API documentation)">
+  <!ENTITY pango-buildsize     "21 MB (additional 2 MB to rebuild and install 
the API documentation)">
   <!ENTITY pango-time          "0.4 SBU (additional 0.1 SBU to rebuild and 
install the API documentation)">
 
 ]>
@@ -91,7 +91,9 @@
 
     <bridgehead renderas="sect4">Optional (Required if building 
GNOME)</bridgehead>
     <para role="optional">
-      <xref linkend="gobject-introspection"/>
+      <xref linkend="gobject-introspection"/>,
+      <xref linkend="gtk-doc"/>, and
+      <ulink url="https://github.com/GNOME/cantarell-fonts/releases";>Cantarell 
Fonts</ulink> (for tests)
     </para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>

Modified: branches/systemd/xfce/core/xfce4-settings.xml
==============================================================================
--- branches/systemd/xfce/core/xfce4-settings.xml       Fri May  6 15:54:06 
2016        (r17327)
+++ branches/systemd/xfce/core/xfce4-settings.xml       Fri May  6 18:40:16 
2016        (r17328)
@@ -94,6 +94,11 @@
       <xref linkend="libxklavier"/>
     </para>
 
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="libinput"/>
+    </para>
+
     <para condition="html" role="usernotes">
       User Notes: <ulink url="&blfs-wiki;/xfce4-settings"/>
     </para>

Modified: branches/systemd/xsoft/graphweb/seamonkey.xml
==============================================================================
--- branches/systemd/xsoft/graphweb/seamonkey.xml       Fri May  6 15:54:06 
2016        (r17327)
+++ branches/systemd/xsoft/graphweb/seamonkey.xml       Fri May  6 18:40:16 
2016        (r17328)
@@ -7,10 +7,10 @@
   <!ENTITY seamonkey-download-http 
"&mozilla-http;/seamonkey/releases/&seamonkey-version;/source/seamonkey-&seamonkey-version;.source.tar.xz">
 <!--  <!ENTITY seamonkey-download-ftp 
"&mozilla-ftp;/seamonkey/releases/&seamonkey-version;/source/seamonkey-&seamonkey-version;.source.tar.bz2">-->
   <!ENTITY seamonkey-download-ftp " ">
-  <!ENTITY seamonkey-md5sum        "eb571346b1ad00d3197d48aa0a906102">
-  <!ENTITY seamonkey-size          "175 MB">
+  <!ENTITY seamonkey-md5sum        "5789df8f96e14577c275f10fdf8462f3">
+  <!ENTITY seamonkey-size          "185 MB">
   <!ENTITY seamonkey-buildsize     "4.3 GB (84 MB installed)">
-  <!ENTITY seamonkey-time          "10 SBU (using parallelism=4)">
+  <!ENTITY seamonkey-time          "13 SBU (using parallelism=4)">
 ]>
 
 <sect1 id="seamonkey" xreflabel="SeaMonkey-&seamonkey-version;">
@@ -95,9 +95,9 @@
     <para role="required">
       <xref linkend="alsa-lib"/>,
       <xref linkend="gtk2"/>,
-      <xref linkend="zip"/>,
-      <xref linkend="unzip"/>, and
-      <xref linkend="yasm"/>
+      <xref linkend="unzip"/>, 
+      <xref linkend="yasm"/>, and
+      <xref linkend="zip"/>
     </para>
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
@@ -242,14 +242,6 @@
 mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/moz-build-dir</literal>
 EOF</userinput></screen>
 
-    <para>
-      First, fix building with system freetype-2.6 or later:
-    </para>
-
-<screen><userinput>sed -e '/^ftglyph.h/i ftfntfmt.h'                     \
-    -e '/^freetype\/ftcache.h/a freetype\/ftfntfmt.h' \
-    -i mozilla/config/system-headers</userinput></screen>
-
     <note><para>
       If you are compiling <application>SeaMonkey</application> in chroot, make
       sure you have the <envar>SHELL</envar> environment variable set or 
prepend

Modified: branches/systemd/xsoft/other/fontforge.xml
==============================================================================
--- branches/systemd/xsoft/other/fontforge.xml  Fri May  6 15:54:06 2016        
(r17327)
+++ branches/systemd/xsoft/other/fontforge.xml  Fri May  6 18:40:16 2016        
(r17328)
@@ -79,8 +79,7 @@
     <para role="required">
       <xref linkend="freetype2"/>,
       <xref linkend="glib2"/>,  and
-      <xref linkend="libxml2"/>, also
-      <xref linkend="wget"/> if you want to run the tests
+      <xref linkend="libxml2"/>
     </para>
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
@@ -88,7 +87,9 @@
       <xref linkend="cairo"/>,
       <xref linkend="gtk2"/>,
       <xref linkend="harfbuzz"/>,
-      <xref linkend="pango"/> (required if Xorg libraries are present), and
+      <xref linkend="pango"/> (required if Xorg libraries are present),
+      <xref linkend="desktop-file-utils"/>,
+      <xref linkend="shared-mime-info"/>, and
       <xref linkend="xorg7-lib"/>
     </para>
 
@@ -99,6 +100,7 @@
       <xref linkend="libpng"/>,
       <xref linkend="libtiff"/>,
       <xref linkend="python2"/>,
+      <xref linkend="wget"/> (needed for tests),
       <ulink url="http://ipython.org/";>IPython</ulink>,
       <ulink url="https://github.com/fontforge/libspiro";>libspiro</ulink>,
       <ulink url="https://bitbucket.org/sortsmill/libunicodenames";>

Modified: branches/systemd/xsoft/other/pidgin.xml
==============================================================================
--- branches/systemd/xsoft/other/pidgin.xml     Fri May  6 15:54:06 2016        
(r17327)
+++ branches/systemd/xsoft/other/pidgin.xml     Fri May  6 18:40:16 2016        
(r17328)
@@ -6,10 +6,10 @@
 
   <!ENTITY pidgin-download-http 
"&sourceforge-repo;/pidgin/pidgin-&pidgin-version;.tar.bz2">
   <!ENTITY pidgin-download-ftp  " ">
-  <!ENTITY pidgin-md5sum        "7c8bb6f997e05e7929104439872c2844">
-  <!ENTITY pidgin-size          "9.0 MB">
-  <!ENTITY pidgin-buildsize     "215 MB (additional 2 MB for the tests and 91 
MB for API docs)">
-  <!ENTITY pidgin-time          "1.9 SBU (additional 0.1 SBU for API docs)">
+  <!ENTITY pidgin-md5sum        "14e0f5cfb2ed065e4dc80391a806ac76">
+  <!ENTITY pidgin-size          "9.4 MB">
+  <!ENTITY pidgin-buildsize     "200 MB (with tests; add 91 MB for API docs)">
+  <!ENTITY pidgin-time          "1.8 SBU (with tests; add 0.1 SBU for API 
docs)">
 ]>
 
 <sect1 id="pidgin" xreflabel="Pidgin-&pidgin-version;">
@@ -71,16 +71,6 @@
       </listitem>
     </itemizedlist>
 
-   <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Recommended patch:
-          <ulink 
url="&patch-root;/pidgin-&pidgin-version;-gstreamer1-1.patch"/>
-        </para>
-      </listitem>
-   </itemizedlist>
-
     <bridgehead renderas="sect3">Pidgin Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
@@ -146,14 +136,6 @@
     <title>Installation of Pidgin</title>
 
     <para>
-      First apply a patch to allow the package to build with the current
-      <application>gstreamer</application> framework:
-    </para>
-
-<screen><userinput>patch -Np1 -i ../pidgin-&pidgin-version;-gstreamer1-1.patch 
&amp;&amp;
-autoreconf -fi</userinput></screen>
-
-    <para>
       If you wish to run the test suite, make sure that <xref
       linkend="libidn"/> is installed and remove the switch
       <quote>--disable-idn</quote>. Compile <application>Pidgin</application>

Modified: branches/systemd/xsoft/other/transmission.xml
==============================================================================
--- branches/systemd/xsoft/other/transmission.xml       Fri May  6 15:54:06 
2016        (r17327)
+++ branches/systemd/xsoft/other/transmission.xml       Fri May  6 18:40:16 
2016        (r17328)
@@ -6,10 +6,10 @@
 
   <!ENTITY transmission-download-http 
"https://transmission.cachefly.net/transmission-&transmission-version;.tar.xz";>
   <!ENTITY transmission-download-ftp  " ">
-  <!ENTITY transmission-md5sum        "411aec1c418c14f6765710d89743ae42">
-  <!ENTITY transmission-size          "3 MB">
-  <!ENTITY transmission-buildsize     "230 MB">
-  <!ENTITY transmission-time          "1.1 SBU">
+  <!ENTITY transmission-md5sum        "3fce404a436e3cd7fde80fb6ed61c264">
+  <!ENTITY transmission-size          "3.2 MB">
+  <!ENTITY transmission-buildsize     "338 MB">
+  <!ENTITY transmission-time          "1.6 SBU (with Qt and GTK gui 
interfaces)">
 ]>
 
 <sect1 id="transmission" xreflabel="Transmission-&transmission-version;">
@@ -71,16 +71,6 @@
         </para>
       </listitem>
     </itemizedlist>
-<!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Optional patch:
-          <ulink 
url="&patch-root;/transmission-&transmission-version;-qt4-1.patch"/>
-       </para>
-      </listitem>
-    </itemizedlist>-->
 
     <bridgehead renderas="sect3">Transmission Dependencies</bridgehead>
 
@@ -111,11 +101,6 @@
 
   <sect2 role="installation">
     <title>Installation of Transmission</title>
-<!--
-    <para>If you want to build the Qt interface using <xref linkend="qt4"/>,
-    apply the following patch:</para>
-
-<screen><userinput>patch -Np1 -i 
../transmission-&transmission-version;-qt4-1.patch</userinput></screen>-->
 
     <para>
       Install <application>Transmission</application> by running the
@@ -131,14 +116,11 @@
        <application>Qt5</application> are installed in
        <filename class="directory">/opt</filename>, use
        <command>source setqt4</command> or <command>source setqt5</command> to
-       choose which one will be used to build the Qt GUI. For
-       <application>Qt4</application>, first fix the code with:
+       choose which one will be used to build the Qt GUI.
     </para>
 
-<screen><userinput>sed -i '/^CONFIG/aQMAKE_CXXFLAGS += -std=c++11' 
qt/qtr.pro</userinput></screen>
-
     <para>
-      Now, compile the Qt GUI, with the following commands:
+      Compile the Qt GUI, with the following commands:
     </para>
 
 <screen><userinput>pushd qt        &amp;&amp;
-- 
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