[blfs-book] r12523 - in trunk/BOOK: . introduction/welcome pst/scanning

fernando at higgs.linuxfromscratch.org fernando at higgs.linuxfromscratch.org
Sun Jan 5 16:04:56 PST 2014


Author: fernando
Date: Sun Jan  5 16:04:56 2014
New Revision: 12523

Log:
Update to xsane-0.999.

Modified:
   trunk/BOOK/general.ent
   trunk/BOOK/introduction/welcome/changelog.xml
   trunk/BOOK/pst/scanning/xsane.xml

Modified: trunk/BOOK/general.ent
==============================================================================
--- trunk/BOOK/general.ent	Sun Jan  5 12:54:49 2014	(r12522)
+++ trunk/BOOK/general.ent	Sun Jan  5 16:04:56 2014	(r12523)
@@ -846,7 +846,7 @@
 <!-- Chapter 43 -->
 <!ENTITY sane-version                 "1.0.24">
 <!ENTITY sane-fe-version              "1.0.14">
-<!ENTITY xsane-version                "0.998">
+<!ENTITY xsane-version                "0.999">
 
 <!-- Chapter 44 -->
 <!ENTITY sgml-common-version          "0.6.3">

Modified: trunk/BOOK/introduction/welcome/changelog.xml
==============================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml	Sun Jan  5 12:54:49 2014	(r12522)
+++ trunk/BOOK/introduction/welcome/changelog.xml	Sun Jan  5 16:04:56 2014	(r12523)
@@ -47,6 +47,10 @@
       <para>January 5th, 2014</para>
       <itemizedlist>
         <listitem>
+          <para>[fernando] - Update to xsane-0.999. Fixes
+          <ulink url="&blfs-ticket-root;4530">#4530</ulink>.</para>
+        </listitem>
+        <listitem>
           <para>[fernando] - Update to poppler-0.24.5. Fixes
           <ulink url="&blfs-ticket-root;4526">#4526</ulink>.</para>
         </listitem>

Modified: trunk/BOOK/pst/scanning/xsane.xml
==============================================================================
--- trunk/BOOK/pst/scanning/xsane.xml	Sun Jan  5 12:54:49 2014	(r12522)
+++ trunk/BOOK/pst/scanning/xsane.xml	Sun Jan  5 16:04:56 2014	(r12523)
@@ -4,10 +4,11 @@
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
 
-  <!ENTITY xsane-download-http " ">
-  <!ENTITY xsane-download-ftp  "ftp://ftp2.sane-project.org/pub/sane/xsane/xsane-&xsane-version;.tar.gz">
-  <!ENTITY xsane-md5sum        "936f1cc76b37caa8f285e1e15ac7e0aa">
-  <!ENTITY xsane-size          "2.8 MB">
+  <!ENTITY xsane-download-http "http://www.xsane.org/download/xsane-&xsane-version;.tar.gz">
+  <!ENTITY xsane-download-ftp " ">
+<!--  <!ENTITY xsane-download-ftp  "ftp://ftp2.sane-project.org/pub/sane/xsane/xsane-&xsane-version;.tar.gz"> -->
+  <!ENTITY xsane-md5sum        "9927f21e1ab6ba96315e7f0e30746deb">
+  <!ENTITY xsane-size          "2.9 MB">
   <!ENTITY xsane-buildsize     "23 MB">
   <!ENTITY xsane-time          "0.2 SBU">
 ]>
@@ -64,17 +65,15 @@
       <xref linkend="gtk2"/> and
       <xref linkend="sane"/> (back ends)
     </para>
-
+<!--
     <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="required">
+    <para role="recommended">
       <xref linkend="xdg-utils"/> (for the help docummentation at runtime)
-    </para>
+    </para>-->
 
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="libtiff"/>,
-      <xref linkend="libjpeg"/>,
-      <xref linkend="lcms"/>, and
+      <xref linkend="lcms"/> and
       <xref linkend="gimp"/>
     </para>
 
@@ -89,8 +88,8 @@
     <para>Install <application>XSane</application> by running the following
     commands:</para>
 
-<screen><userinput>sed -i -e 's/netscape/xdg-open/'                   src/xsane.h      &&
-sed -i -e 's/png_ptr->jmpbuf/png_jmpbuf(png_ptr)/' src/xsane-save.c &&
+<!--sed -i -e 's/netscape/xdg-open/'                   src/xsane.h      &&-->
+<screen><userinput>sed -i -e 's/png_ptr->jmpbuf/png_jmpbuf(png_ptr)/' src/xsane-save.c &&
 ./configure --prefix=/usr                                           &&
 make</userinput></screen>
 
@@ -100,15 +99,24 @@
 
 <screen role="root"><userinput>make xsanedocdir=/usr/share/doc/xsane-&xsane-version; install &&
 ln -v -s ../../doc/xsane-&xsane-version; /usr/share/sane/xsane/doc</userinput></screen>
-
+<!--
     <para>If you have not installed <xref linkend="xdg-utils"/> and have not
-    issued the first sed:</para>
+    issued the first sed:</para>-->
+    <para>A browser of your choice can be used to get inline help, using the
+    following command,  as the <systemitem class="username">root</systemitem>
+    user:</para>
 
 <screen role="root"><userinput>ln -v -s <browser> /usr/bin/netscape</userinput></screen>
 
     <note><para>Be sure to replace <browser> with the browser of your
     choice on your system.</para></note>
 
+    <para>Alternatively, if the environment variable BROWSER is set to the
+    browser you want to use, eg, BROWSER="/usr/bin/firefox", the first time you
+    run <command>xsane</command>, it will be recorded in ~/.sane/xsane/xsane.rc.
+    If you wish to change it, edit this file, or remove it, and use the
+    instructions above, so that a new one is created.</para>
+
     <para>If <application>GIMP</application> is installed, issue the following
     command as the <systemitem class="username">root</systemitem> user:</para>
 
@@ -118,10 +126,10 @@
 
   <sect2 role="commands">
     <title>Command Explanations</title>
-
+<!--
     <para><command>sed -i -e 's/netscape/xdg-open/' src/xsane.h </command>:
     This is to use <command>xdg-open</command> for the help documentation,
-    instead of the hardcoded browser.</para>
+    instead of the hardcoded browser.</para>-->
 
     <para><command>ln -v -s ../../doc/xsane-&xsane-version;
     /usr/share/sane/xsane/doc</command>: This symlink is created to ensure that



More information about the blfs-book mailing list