Author: krejzi
Date: Sun Aug  3 03:32:57 2014
New Revision: 13812

Log:
Merged trunk.

Modified:
   branches/systemd/general.ent
   branches/systemd/general/genlib/libsigc++.xml
   branches/systemd/general/prog/mercurial.xml
   branches/systemd/gnome-systemd/platform/libpeas.xml
   branches/systemd/gnome.ent
   branches/systemd/gnome/platform/libpeas.xml
   branches/systemd/introduction/important/building-notes.xml
   branches/systemd/introduction/welcome/changelog.xml
   branches/systemd/networking/netprogs/samba-systemd.xml
   branches/systemd/packages.ent

Modified: branches/systemd/general.ent
==============================================================================
--- branches/systemd/general.ent        Sat Aug  2 15:52:33 2014        (r13811)
+++ branches/systemd/general.ent        Sun Aug  3 03:32:57 2014        (r13812)
@@ -1,12 +1,12 @@
 <!-- $LastChangedBy$ $Date$ -->
 
-<!ENTITY day          "02">                   <!-- Always 2 digits -->
+<!ENTITY day          "03">                   <!-- Always 2 digits -->
 <!ENTITY month        "08">                   <!-- Always 2 digits -->
 <!ENTITY year         "2014">
 <!ENTITY copyrightdate "2001-&year;">
 <!ENTITY copyholder   "The BLFS systemd Development Team">
 <!ENTITY version      "&year;-&month;-&day;">
-<!ENTITY releasedate  "August 2nd, &year;">
+<!ENTITY releasedate  "August 3rd, &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/libsigc++.xml
==============================================================================
--- branches/systemd/general/genlib/libsigc++.xml       Sat Aug  2 15:52:33 
2014        (r13811)
+++ branches/systemd/general/genlib/libsigc++.xml       Sun Aug  3 03:32:57 
2014        (r13812)
@@ -6,10 +6,10 @@
 
   <!ENTITY libsigc-download-http 
"&gnome-download-http;/libsigc++/2.3/libsigc++-&libsigc-version;.tar.xz">
   <!ENTITY libsigc-download-ftp  
"&gnome-download-ftp;/libsigc++/2.3/libsigc++-&libsigc-version;.tar.xz">
-  <!ENTITY libsigc-md5sum        "06a0569e8ba161d3428e7daa838682f8">
-  <!ENTITY libsigc-size          "3.4 MB">
-  <!ENTITY libsigc-buildsize     "31 MB">
-  <!ENTITY libsigc-time          "less than 0.1 SBU">
+  <!ENTITY libsigc-md5sum        "e75fbd6f5cc34d058a9dabec96245dc8">
+  <!ENTITY libsigc-size          "3.5 MB">
+  <!ENTITY libsigc-buildsize     "34 MB (additional 12 MB for the tests)">
+  <!ENTITY libsigc-time          "less than 0.1 SBU (additional 0.1 SBU for 
the tests)">
 ]>
 
 <sect1 id="libsigc" xreflabel="libsigc++-&libsigc-version;">
@@ -104,7 +104,7 @@
     <segmentedlist>
       <segtitle>Installed Programs</segtitle>
       <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directory</segtitle>
+      <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
         <seg>

Modified: branches/systemd/general/prog/mercurial.xml
==============================================================================
--- branches/systemd/general/prog/mercurial.xml Sat Aug  2 15:52:33 2014        
(r13811)
+++ branches/systemd/general/prog/mercurial.xml Sun Aug  3 03:32:57 2014        
(r13812)
@@ -6,12 +6,12 @@
 
   <!ENTITY mercurial-download-http 
"http://mercurial.selenic.com/release/mercurial-&mercurial-version;.tar.gz";>
   <!ENTITY mercurial-download-ftp  " ">
-  <!ENTITY mercurial-md5sum        "c5be4265745a8140fec777a4dfc40e0e">
+  <!ENTITY mercurial-md5sum        "d3916736a9d356899191409e546b5964">
   <!ENTITY mercurial-size          "3.8 MB">
-  <!ENTITY mercurial-buildsize     "43 MB (additional 249 MB for the tests and 
2 MB for docs generation)
+  <!ENTITY mercurial-buildsize     "44 MB (additional 250 MB for the tests and 
2 MB for docs generation)
 
 ">
-  <!ENTITY mercurial-time          "less than 0.1 SBU (additional 7.9 SBU for 
tests)">
+  <!ENTITY mercurial-time          "less than 0.1 SBU (additional 8.8 SBU for 
tests)">
 ]>
 
 <sect1 id="mercurial" xreflabel="Mercurial-&mercurial-version;">

Modified: branches/systemd/gnome-systemd/platform/libpeas.xml
==============================================================================
--- branches/systemd/gnome-systemd/platform/libpeas.xml Sat Aug  2 15:52:33 
2014        (r13811)
+++ branches/systemd/gnome-systemd/platform/libpeas.xml Sun Aug  3 03:32:57 
2014        (r13812)
@@ -4,10 +4,11 @@
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
 
+<!-- 1.9 needs to be modified when version increases from 1.9.X -->
   <!ENTITY libpeas-download-http 
"&gnome-download-http;/libpeas/1.10/libpeas-&libpeas-version;.tar.xz">
   <!ENTITY libpeas-download-ftp  
"&gnome-download-ftp;/libpeas/1.10/libpeas-&libpeas-version;.tar.xz">
-  <!ENTITY libpeas-md5sum        "b388cdb1c38ac8701f85c8278df0de0a">
-  <!ENTITY libpeas-size          "496 KB">
+  <!ENTITY libpeas-md5sum        "62cda826762dd0ec9380f7af6637516a">
+  <!ENTITY libpeas-size          "504 KB">
   <!ENTITY libpeas-buildsize     "16 MB (additional 6 MB for the tests)">
   <!ENTITY libpeas-time          "0.3 SBU">
 ]>
@@ -89,10 +90,10 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
       <xref linkend="gdb"/>,
-      <ulink url="http://glade.gnome.org/";>Glade</ulink>,
       <xref linkend="gtk-doc"/>,
-      <ulink url="&gnome-download-http;/seed/">Seed</ulink>, and
-      <xref linkend="valgrind"/>
+      <xref linkend="valgrind"/>,
+      <ulink url="http://glade.gnome.org/";>Glade</ulink>, and
+      <ulink url="&gnome-download-http;/seed/">Seed</ulink>
     </para>
 
     <para condition="html" role="usernotes">User Notes:

Modified: branches/systemd/gnome.ent
==============================================================================
--- branches/systemd/gnome.ent  Sat Aug  2 15:52:33 2014        (r13811)
+++ branches/systemd/gnome.ent  Sun Aug  3 03:32:57 2014        (r13812)
@@ -21,7 +21,7 @@
 <!ENTITY libgnomekbd-version          "3.6.0">
 <!ENTITY libgtop-version              "2.30.0">
 <!ENTITY libgweather-version          "3.12.2">
-<!ENTITY libpeas-version              "1.10.0">
+<!ENTITY libpeas-version              "1.10.1">
 <!ENTITY librest-version              "0.7.91">
 <!ENTITY libwacom-version             "0.9">
 <!ENTITY libwnck-version              "3.4.7">

Modified: branches/systemd/gnome/platform/libpeas.xml
==============================================================================
--- branches/systemd/gnome/platform/libpeas.xml Sat Aug  2 15:52:33 2014        
(r13811)
+++ branches/systemd/gnome/platform/libpeas.xml Sun Aug  3 03:32:57 2014        
(r13812)
@@ -7,8 +7,8 @@
 <!-- 1.9 needs to be modified when version increases from 1.9.X -->
   <!ENTITY libpeas-download-http 
"&gnome-download-http;/libpeas/1.10/libpeas-&libpeas-version;.tar.xz">
   <!ENTITY libpeas-download-ftp  
"&gnome-download-ftp;/libpeas/1.10/libpeas-&libpeas-version;.tar.xz">
-  <!ENTITY libpeas-md5sum        "b388cdb1c38ac8701f85c8278df0de0a">
-  <!ENTITY libpeas-size          "496 KB">
+  <!ENTITY libpeas-md5sum        "62cda826762dd0ec9380f7af6637516a">
+  <!ENTITY libpeas-size          "504 KB">
   <!ENTITY libpeas-buildsize     "16 MB (additional 6 MB for the tests)">
   <!ENTITY libpeas-time          "0.3 SBU">
 ]>
@@ -90,10 +90,10 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
       <xref linkend="gdb"/>,
-      <ulink url="http://glade.gnome.org/";>Glade</ulink>,
       <xref linkend="gtk-doc"/>,
-      <ulink url="&gnome-download-http;/seed/">Seed</ulink>, and
-      <xref linkend="valgrind"/>
+      <xref linkend="valgrind"/>,
+      <ulink url="http://glade.gnome.org/";>Glade</ulink>, and
+      <ulink url="&gnome-download-http;/seed/">Seed</ulink>
     </para>
 
     <para condition="html" role="usernotes">User Notes:
@@ -113,8 +113,12 @@
 make</userinput></screen>
 
     <para>
-      To test the results, issue: <command>make check</command>. An active
-      graphical session with bus address is necessary to run the tests.
+      To test the results, issue:
+      <command>make check 2&gt;&amp;1 | tee 
../libpeas-make-check.log</command>.
+      Check the results with
+      <command>egrep '(FAIL|PASS)' ../libpeas-make-check.log</command>.
+      An active graphical session with bus address is necessary to
+      run the tests.
     </para>
 
     <para>
@@ -147,6 +151,7 @@
         </seg>
         <seg>
           libpeas-1.0.so and libpeas-gtk-1.0.so
+          and several libraries under /usr/lib/{libpeas-1.0,peas-demo}
         </seg>
         <seg>
           /usr/include/libpeas-1.0,

Modified: branches/systemd/introduction/important/building-notes.xml
==============================================================================
--- branches/systemd/introduction/important/building-notes.xml  Sat Aug  2 
15:52:33 2014        (r13811)
+++ branches/systemd/introduction/important/building-notes.xml  Sun Aug  3 
03:32:57 2014        (r13812)
@@ -390,9 +390,8 @@
     <screen><userinput>find /lib /usr/lib -not -path "*Image*" -a -name \*.la 
-delete</userinput></screen>
 
     <para>The above command removes all .la files with the exception of those 
that have
-    "Image" (ImageMagick) as a part of the path.  The .la files are used by 
the ImageMagick
-    modules subdirectory are used by the program.  There may be other 
exceptions by
-    packages not in BLFS.</para>
+    "Image" as a part of the path.  These .la files are used by the 
+    ImageMagick programs.  There may be other exceptions by packages not in 
BLFS.</para>
 
   </sect2>
 

Modified: branches/systemd/introduction/welcome/changelog.xml
==============================================================================
--- branches/systemd/introduction/welcome/changelog.xml Sat Aug  2 15:52:33 
2014        (r13811)
+++ branches/systemd/introduction/welcome/changelog.xml Sun Aug  3 03:32:57 
2014        (r13812)
@@ -45,19 +45,23 @@
 -->
 
     <listitem>
-      <para>August 1st, 2014</para>
+      <para>August 2nd, 2014</para>
       <itemizedlist>
         <listitem>
-          <para>[fernando] - Update to wireshark-1.12.0. Fixes
-          <ulink url="&blfs-ticket-root;5317">#5317</ulink>.</para>
+          <para>[fernando] - Update to libpeas-1.10.1. Fixes
+          <ulink url="&blfs-ticket-root;5324">#5324</ulink>.</para>
         </listitem>
         <listitem>
-          <para>[igor] - Update to libdrm-2.4.56. Fixes
-          <ulink url="&blfs-ticket-root;5310">#5310</ulink>.</para>
+          <para>[fernando] - Update to samba-4.1.11. Fixes
+          <ulink url="&blfs-ticket-root;5321">#5321</ulink>.</para>
         </listitem>
         <listitem>
-          <para>[krejzi] - Added "Advanced Network Setup" page which currently
-          describes network bridge setup using systemd-networkd.</para>
+          <para>[fernando] - Update to mercurial-3.1. Fixes
+          <ulink url="&blfs-ticket-root;5320">#5320</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[fernando] - Update to libsigc++-2.3.2. Fixes
+          <ulink url="&blfs-ticket-root;5319">#5319</ulink>.</para>
         </listitem>
         <listitem>
           <para>[krejzi] - Added telepathy-gabble-0.18.3.</para>
@@ -76,6 +80,24 @@
         </listitem>
       </itemizedlist>
     </listitem>
+
+    <listitem>
+      <para>August 1st, 2014</para>
+      <itemizedlist>
+        <listitem>
+          <para>[fernando] - Update to wireshark-1.12.0. Fixes
+          <ulink url="&blfs-ticket-root;5317">#5317</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[igor] - Update to libdrm-2.4.56. Fixes
+          <ulink url="&blfs-ticket-root;5310">#5310</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[krejzi] - Added "Advanced Network Setup" page which currently
+          describes network bridge setup using systemd-networkd.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
 
     <listitem>
       <para>July 31st, 2014</para>

Modified: branches/systemd/networking/netprogs/samba-systemd.xml
==============================================================================
--- branches/systemd/networking/netprogs/samba-systemd.xml      Sat Aug  2 
15:52:33 2014        (r13811)
+++ branches/systemd/networking/netprogs/samba-systemd.xml      Sun Aug  3 
03:32:57 2014        (r13812)
@@ -6,10 +6,10 @@
 
   <!ENTITY samba-download-http 
"http://ftp.samba.org/pub/samba/stable/samba-&samba-version;.tar.gz";>
   <!ENTITY samba-download-ftp  
"ftp://ftp.samba.org/pub/samba/stable/samba-&samba-version;.tar.gz";>
-  <!ENTITY samba-md5sum        "666907da70369db20ac6bb2c6f234e42">
+  <!ENTITY samba-md5sum        "d7377e7247ad16f6b15363727b91b761">
   <!ENTITY samba-size          "19 MB">
-  <!ENTITY samba-buildsize     "415 MB (additional 397 MB for the quicktest, 
reputedly up to 500 MB additional for all tests)">
-  <!ENTITY samba-time          "5.9 SBU (additional 4.1 SBU for the quicktest, 
reputedly up to 110 SBU to run all tests)">
+  <!ENTITY samba-buildsize     "415 MB (additional 396 MB for the quicktest, 
reputedly up to 500 MB additional for all tests)">
+  <!ENTITY samba-time          "6 SBU (additional 4.3 SBU for the quicktest, 
reputedly up to 110 SBU to run all tests)">
 ]>
 
 <sect1 id="samba" xreflabel="Samba-&samba-version;">

Modified: branches/systemd/packages.ent
==============================================================================
--- branches/systemd/packages.ent       Sat Aug  2 15:52:33 2014        (r13811)
+++ branches/systemd/packages.ent       Sun Aug  3 03:32:57 2014        (r13812)
@@ -119,7 +119,7 @@
 <!ENTITY libiodbc-version             "3.52.9">
 <!ENTITY libksba-version              "1.3.0">
 <!ENTITY liblinear-version            "1.94">
-<!ENTITY libsigc-version              "2.3.1">
+<!ENTITY libsigc-version              "2.3.2">
 <!ENTITY libtasn1-version             "4.0">
 <!ENTITY libunistring-version         "0.9.3">
 <!ENTITY libusb-version               "1.0.19">
@@ -253,7 +253,7 @@
 <!ENTITY librep-version               "0.92.3">
 <!ENTITY llvm-version                 "3.4.2">
 <!ENTITY lua-version                  "5.2.3">
-<!ENTITY mercurial-version            "3.0.2">
+<!ENTITY mercurial-version            "3.1">
 <!ENTITY nasm-version                 "2.11.05">
 <!ENTITY npapi-sdk-version            "0.27.2">
 <!ENTITY php-version                  "5.5.15">
@@ -316,7 +316,7 @@
 <!ENTITY ntp-version                  "4.2.6p5">
 <!ENTITY rpcbind-version              "0.2.1">
 <!ENTITY rsync-version                "3.1.1">
-<!ENTITY samba-version                "4.1.10">
+<!ENTITY samba-version                "4.1.11">
 <!ENTITY wget-version                 "1.15">
 <!ENTITY wireless-tools-version       "29">
 <!ENTITY wpa_supplicant-version       "2.2">
-- 
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