From de49ebdced58280cdab57107b38c7cc62eb2b2a6 Mon Sep 17 00:00:00 2001
From: Randy McMurchy <randy@linuxfromscratch.org>
Date: Sun, 2 Apr 2006 15:50:30 +0000
Subject: [PATCH] Updated to libusb-0.1.12

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@5797 af4574ff-66df-0310-9fd7-8a98e5e911e0
---
 general.ent                        |  2 +-
 general/genlib/libusb.xml          | 24 ++++++++++++++----------
 introduction/welcome/changelog.xml |  3 +++
 3 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/general.ent b/general.ent
index b6081f27f3..46e4b6ed7e 100644
--- a/general.ent
+++ b/general.ent
@@ -104,7 +104,7 @@
 <!ENTITY slib-version                 "3a3">
 <!ENTITY gwrap-version                "1.9.6">
 <!ENTITY LZO-version                  "2.02">
-<!ENTITY libusb-version               "0.1.10a">
+<!ENTITY libusb-version               "0.1.12">
 <!ENTITY iso-codes-version            "0.49">
 <!ENTITY gmime-version                "2.1.17">
 <!ENTITY libidn-version               "0.6.3">
diff --git a/general/genlib/libusb.xml b/general/genlib/libusb.xml
index 3a361bb3df..4623699a90 100644
--- a/general/genlib/libusb.xml
+++ b/general/genlib/libusb.xml
@@ -5,11 +5,11 @@
   %general-entities;
 
   <!ENTITY libusb-download-http "http://prdownloads.sourceforge.net/libusb/libusb-&libusb-version;.tar.gz">
-  <!ENTITY libusb-download-ftp  "ftp://ftp.fu-berlin.de/unix/linux/mirrors/gentoo/distfiles/libusb-&libusb-version;.tar.gz">
-  <!ENTITY libusb-md5sum        "c6062b29acd2cef414bcc34e0decbdd1">
-  <!ENTITY libusb-size          "375 KB">
-  <!ENTITY libusb-buildsize     "7.4 MB (additional 1.3 MB to install documentation)">
-  <!ENTITY libusb-time          "0.1 SBU">
+  <!ENTITY libusb-download-ftp  " ">
+  <!ENTITY libusb-md5sum        "caf182cbc7565dac0fd72155919672e6">
+  <!ENTITY libusb-size          "389 KB">
+  <!ENTITY libusb-buildsize     "8.4 MB (includes installing all documentation)">
+  <!ENTITY libusb-time          "0.3 SBU (includes building all documentation)">
 ]>
 
 <sect1 id="libusb" xreflabel="libusb-&libusb-version;">
@@ -60,14 +60,17 @@
 
     <bridgehead renderas="sect3">libusb Dependencies</bridgehead>
 
-    <bridgehead renderas="sect4">Optional (Required to Build the HTML User
-    Manual)</bridgehead>
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional"><xref linkend="pkgconfig"/></para>
+
+    <bridgehead renderas="sect4">Optional
+    (Required to Build the HTML User Manual)</bridgehead>
     <para role="optional"><xref linkend="openjade"/> and
     <ulink url="http://www.docbook.org/sgml/4.2/index.html"> DocBOOK SGML
     DTD-4.2</ulink></para>
 
-    <bridgehead renderas="sect4">Optional (Required to Build the API
-    Documentation)</bridgehead>
+    <bridgehead renderas="sect4">Optional
+    (Required to Build the API Documentation)</bridgehead>
     <para role="optional"><xref linkend="doxygen"/> and
     <ulink url="http://www.graphviz.org/">GraphViz</ulink></para>
 
@@ -115,7 +118,8 @@ install -v -m644 apidocs/html/* \
     <title>Command Explanations</title>
 
     <para><parameter>--disable-build-docs</parameter>: This switch avoids
-    building the HTML user manual.</para>
+    building the HTML user manual. Remove it if you have the required
+    dependencies installed and wish to build the manual.</para>
 
   </sect2>
 
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index 77ea8402ce..f8b061c3c0 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -44,6 +44,9 @@
     <listitem>
       <para>April 2nd, 2006</para>
       <itemizedlist>
+        <listitem>
+          <para>[randy] - Updated to libusb-0.1.12.</para>
+        </listitem>
         <listitem>
           <para>[randy] - Updated to G-Wrap-1.9.6.</para>
         </listitem>