Changeset 3df0b486 for general

Timestamp:

08/11/2014 04:11:59 PM (10 years ago)

Author:

Krejzi <krejzi@…>

Branches:

systemd-11177

Children:

946a2368

Parents:

28324dbe

Message:

Merged trunk.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/branches/systemd@13879 af4574ff-66df-0310-9fd7-8a98e5e911e0

Location:

general

Files:

• genlib/libassuan.xml (modified) (1 diff)
• genlib/xapian.xml (modified) (1 diff)
• prog/tcl.xml (modified) (1 diff)
• sysutils/bluez-systemd.xml (modified) (5 diffs)
• sysutils/unrar.xml (modified) (1 diff)

general/genlib/libassuan.xml

@@ -110 +110 @@
     <para>
       If you wish to build documentation, you must have
-      <xref linkend="texlive"/> installed, then issue
-      the following command:
+      <xref linkend="texlive"/> installed. Due to an apparently fake error,
+      build the documentation in two steps, issuing the following commands:
     </para>
 
-<screen><userinput>make -C doc pdf ps</userinput></screen>
+<screen><userinput>make -C doc pdf || true &amp;&amp;
+make -C doc ps</userinput></screen>
 
     <para>

general/genlib/xapian.xml

@@ -10 +10 @@
   <!ENTITY xapian-md5sum        "493117bf45e5471e86b4fc5d6d8069dc">
   <!ENTITY xapian-size          "3.0 MB">
-  <!ENTITY xapian-buildsize     "45 MB">
-  <!ENTITY xapian-time          "1.5 SBU">
+  <!ENTITY xapian-buildsize     "45 MB (Additioansl 220 MB for tests)">
+  <!ENTITY xapian-time          "1.5 SBU (Additioanl 22 SBU for tsts)">
 ]>
 

general/prog/tcl.xml

@@ -224 +224 @@
           /usr/lib/tdbcmysql1.0.0,
           /usr/lib/itcl4.0.0,
-          /usr/share/man/mann and optionaly
+          /usr/share/man/mann and optionally
           /usr/share/doc/&tcl-version;
         </seg>

general/sysutils/bluez-systemd.xml

@@ -7 +7 @@
   <!ENTITY bluez-download-http "http://www.kernel.org/pub/linux/bluetooth/bluez-&bluez-version;.tar.xz">
   <!ENTITY bluez-download-ftp  "ftp://ftp.kernel.org/pub/linux/bluetooth/bluez-&bluez-version;.tar.xz">
-  <!ENTITY bluez-md5sum        "d5a0d05520e013f2394bf1d0bac12889">
-  <!ENTITY bluez-size          "1.3 MB">
-  <!ENTITY bluez-buildsize     "59 MB">
-  <!ENTITY bluez-time          "0.8 SBU">
+  <!ENTITY bluez-md5sum        "fd0783c8bc524bc9b26514aad1f85814">
+  <!ENTITY bluez-size          "1.4 MB">
+  <!ENTITY bluez-buildsize     "50 MB (additional 1 MB for the API docs)">
+  <!ENTITY bluez-time          "0.6 SBU">
 ]>
 
@@ -193 +193 @@
       <para>
         <filename>/etc/bluetooth/main.conf</filename> is installed automatically
-        during the install.  Additionally, there are three supplementary
-        configuration files. /etc/sysconfig/bluetooth is
-        installed as a part of the boot script below.  In addition 
+        during the install.  Additionally, there are two<!--three-->
+        supplementary configuration files.<!-- /etc/sysconfig/bluetooth is
+        installed as a part of the boot script below.-->  In addition 
         you optionally can install the following as the 
         <systemitem class="username">root</systemitem> user:
@@ -206 +206 @@
 # See the rfcomm man page for options
 
-# End of rfcomm.conf</literal></screen>
+# End of rfcomm.conf</literal>
+EOF</screen>
 
 <screen role="root"><userinput>cat > /etc/bluetooth/uart.conf &lt;&lt; "EOF"</userinput>
@@ -214 +215 @@
 # See the hciattach man page for options
 
-# End of uart.conf</literal></screen>
+# End of uart.conf</literal>
+EOF</screen>
 
       <indexterm zone="bluez bluez-config">
@@ -262 +264 @@
           bccmd, bluemoon, bluetoothctl, bluetoothd, btmon, ciptool,
           hciattach, hciconfig, hcidump, hcitool, hid2hci, l2ping,
-          l2test, obexd, rctest, rfcomm, and sdptool
+          l2test, mpris-proxy, obexd, rctest, rfcomm, and sdptool
         </seg>
         <seg>

general/sysutils/unrar.xml

@@ -7 +7 @@
   <!ENTITY unrar-download-http "http://www.rarlab.com/rar/unrarsrc-&unrar-version;.tar.gz">
   <!ENTITY unrar-download-ftp  " ">
-  <!ENTITY unrar-md5sum        "be9607c59d62c3b101a70cd62c681515">
-  <!ENTITY unrar-size          "212 KB">
-  <!ENTITY unrar-buildsize     "2.3 MB">
-  <!ENTITY unrar-time          "less than 0.1 SBU">
+  <!ENTITY unrar-md5sum        "af571529a358c972872b91792ffc0a80">
+  <!ENTITY unrar-size          "211 KB">
+  <!ENTITY unrar-buildsize     "2.4 MB">
+  <!ENTITY unrar-time          "0.1 SBU">
 ]>