[blfs-book] r11106 - in trunk/BOOK: . xfce/apps

krejzi at higgs.linuxfromscratch.org krejzi at higgs.linuxfromscratch.org
Sat Mar 16 14:56:02 PDT 2013


Author: krejzi
Date: Sat Mar 16 14:56:02 2013
New Revision: 11106

Log:
Xfce4 Terminal update, Vte cosmetic changes.

Added:
   trunk/BOOK/xfce/apps/xfce4-terminal.xml
      - copied, changed from r11098, trunk/BOOK/xfce/apps/terminal.xml
Deleted:
   trunk/BOOK/xfce/apps/terminal.xml
Modified:
   trunk/BOOK/general.ent
   trunk/BOOK/xfce/apps/apps.xml
   trunk/BOOK/xfce/apps/vte2.xml

Modified: trunk/BOOK/general.ent
==============================================================================
--- trunk/BOOK/general.ent	Sat Mar 16 14:38:22 2013	(r11105)
+++ trunk/BOOK/general.ent	Sat Mar 16 14:56:02 2013	(r11106)
@@ -757,7 +757,7 @@
 <!-- Xfce apps -->
 <!ENTITY midori-version               "0.4.9">
 <!ENTITY parole-version               "0.5.0">
-<!ENTITY terminal-version             "0.4.8">
+<!ENTITY xfce4-terminal-version       "0.6.1">
 <!ENTITY vte2-version                 "0.28.2">
 <!ENTITY xfburn-version               "0.4.3">
 <!ENTITY xfce4-notifyd-version        "0.2.2">

Modified: trunk/BOOK/xfce/apps/apps.xml
==============================================================================
--- trunk/BOOK/xfce/apps/apps.xml	Sat Mar 16 14:38:22 2013	(r11105)
+++ trunk/BOOK/xfce/apps/apps.xml	Sat Mar 16 14:56:02 2013	(r11106)
@@ -22,8 +22,8 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="midori.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="parole.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="terminal.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="vte2.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xfce4-terminal.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xfburn.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xfce4-notifyd.xml"/>
 

Modified: trunk/BOOK/xfce/apps/vte2.xml
==============================================================================
--- trunk/BOOK/xfce/apps/vte2.xml	Sat Mar 16 14:38:22 2013	(r11105)
+++ trunk/BOOK/xfce/apps/vte2.xml	Sat Mar 16 14:56:02 2013	(r11106)
@@ -12,7 +12,7 @@
   <!ENTITY vte2-time          "0.5 SBU">
 ]>
 
-<sect1 id="vte2" xreflabel="vte-&vte2-version;">
+<sect1 id="vte2" xreflabel="Vte-&vte2-version;">
   <?dbhtml filename="vte2.html"?>
 
   <sect1info>
@@ -20,10 +20,10 @@
     <date>$Date$</date>
   </sect1info>
 
-  <title>vte-&vte2-version;</title>
+  <title>Vte-&vte2-version;</title>
 
   <indexterm zone="vte2">
-    <primary sortas="a-vte2">vte2</primary>
+    <primary sortas="a-Vte">Vte</primary>
   </indexterm>
 
   <sect2 role="package">
@@ -31,7 +31,7 @@
 
     <para>
       <application>Vte</application> is a library (libvte) implementing a
-      terminal emulator widget for <application>Gtk 2</application>, and a
+      terminal emulator widget for <application>GTK+ 2</application>, and a
       minimal demonstration application (vte) that uses
       <application>libvte</application>.
     </para>
@@ -76,14 +76,15 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="intltool"/> and
-      <xref linkend="gtk2"/>.
+      <xref linkend="gtk2"/> and
+      <xref linkend="intltool"/>
     </para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="gobject-introspection"/> and
-      <xref linkend="gtk-doc"/>.
+      <xref linkend="gobject-introspection"/>,
+      <xref linkend="gtk-doc"/> and
+      <xref linkend="pygtk"/>
     </para>
 
     <para condition="html" role="usernotes">
@@ -99,7 +100,9 @@
       commands:
     </para>
 
-<screen><userinput>./configure --prefix=/usr --disable-static --libexecdir=/usr/libexec/vte2 &&
+<screen><userinput>./configure --prefix=/usr \
+            --libexecdir=/usr/lib/vte \
+            --disable-static  &&
 make</userinput></screen>
 
     <para>
@@ -111,6 +114,7 @@
     </para>
 
 <screen role="root"><userinput>make install</userinput></screen>
+
   </sect2>
 
   <sect2 role="commands">
@@ -119,14 +123,6 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../../xincludes/static-libraries.xml"/>
 
-    <para>
-      <option>--libexecdir=/usr/libexec/vte2</option>: Both
-      <application>Vte</application> and <xref linkend="vte"/> (the
-      <application>Gtk 3</application> version) install a setuid helper program
-      called <filename>gnome-pty-helper</filename>. Putting it into a directory
-      called <filename class="directory">vte2</filename> ensures that they do
-      not overwrite one another.
-    </para>
   </sect2>
 
   <sect2 role="content">
@@ -138,9 +134,15 @@
       <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
-        <seg>vte</seg>
-        <seg>libvte.so</seg>
         <seg>
+          vte
+        </seg>
+        <seg>
+          libvte.so
+        </seg>
+        <seg>
+          /usr/include/vte-0.0,
+          /usr/lib/vte,
           /usr/share/gtk-doc/html/vte-0.0 and
           /usr/share/vte
         </seg>
@@ -168,13 +170,16 @@
         <term><filename class="libraryfile">libvte.so</filename></term>
         <listitem>
           <para>
-            contains the <application>Libvte</application> API functions.
+            contains the <application>Vte</application> API functions.
           </para>
           <indexterm zone="vte2 libvte2">
             <primary sortas="c-libvte">libvte.so</primary>
           </indexterm>
         </listitem>
       </varlistentry>
+
     </variablelist>
+
   </sect2>
+
 </sect1>

Copied and modified: trunk/BOOK/xfce/apps/xfce4-terminal.xml (from r11098, trunk/BOOK/xfce/apps/terminal.xml)
==============================================================================
--- trunk/BOOK/xfce/apps/terminal.xml	Fri Mar 15 16:11:00 2013	(r11098, copy source)
+++ trunk/BOOK/xfce/apps/xfce4-terminal.xml	Sat Mar 16 14:56:02 2013	(r11106)
@@ -4,37 +4,37 @@
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
 
-  <!ENTITY terminal-download-http
-    "http://archive.xfce.org/src/apps/terminal/0.4/Terminal-&terminal-version;.tar.bz2">
-  <!ENTITY terminal-download-ftp  " ">
-  <!ENTITY terminal-md5sum        "8dff62234da14e1a5e542fb56560ebe2">
-  <!ENTITY terminal-size          "1.6 MB">
-  <!ENTITY terminal-buildsize     "20 MB">
-  <!ENTITY terminal-time          "0.2 SBU">
+  <!ENTITY xfce4-terminal-download-http
+           "http://archive.xfce.org/src/apps/xfce4-terminal/0.6/xfce4-terminal-&xfce4-terminal-version;.tar.bz2">
+  <!ENTITY xfce4-terminal-download-ftp  " ">
+  <!ENTITY xfce4-terminal-md5sum        "98613ce500fef2ed62cdbe788084acca">
+  <!ENTITY xfce4-terminal-size          "820 KB">
+  <!ENTITY xfce4-terminal-buildsize     "15 MB">
+  <!ENTITY xfce4-terminal-time          "0.2 SBU">
 ]>
 
-<sect1 id="terminal" xreflabel="terminal-&terminal-version;">
-  <?dbhtml filename="terminal.html"?>
+<sect1 id="xfce4-terminal" xreflabel="xfce4-terminal-&xfce4-terminal-version;">
+  <?dbhtml filename="xfce4-terminal.html"?>
 
   <sect1info>
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
 
-  <title>terminal-&terminal-version;</title>
+  <title>xfce4-terminal-&xfce4-terminal-version;</title>
 
-  <indexterm zone="terminal">
-    <primary sortas="a-terminal">terminal</primary>
+  <indexterm zone="xfce4-terminal">
+    <primary sortas="a-xfce4-terminal">xfce4-terminal</primary>
   </indexterm>
 
   <sect2 role="package">
-    <title>Introduction to terminal</title>
+    <title>Introduction to Xfce4 Terminal</title>
 
     <para>
-      <application>Terminal</application> is a <application>Gtk 2</application>
+      <application>Xfce4 Terminal</application> is a <application>GTK+ 2</application>
       terminal emulator. This is useful for running commands or programs in the
-      comfort of an xorg window; you can drag and drop files into the
-      <application>Terminal</application> or copy and paste text with your mouse.
+      comfort of an Xorg window; you can drag and drop files into the
+      <application>Xfce4 Terminal</application> or copy and paste text with your mouse.
     </para>
 
     &lfs72_checked;
@@ -43,58 +43,58 @@
     <itemizedlist spacing="compact">
       <listitem>
         <para>
-          Download (HTTP): <ulink url="&terminal-download-http;"/>
+          Download (HTTP): <ulink url="&xfce4-terminal-download-http;"/>
         </para>
       </listitem>
       <listitem>
         <para>
-          Download (FTP): <ulink url="&terminal-download-ftp;"/>
+          Download (FTP): <ulink url="&xfce4-terminal-download-ftp;"/>
         </para>
       </listitem>
       <listitem>
         <para>
-          Download MD5 sum: &terminal-md5sum;
+          Download MD5 sum: &xfce4-terminal-md5sum;
         </para>
       </listitem>
       <listitem>
         <para>
-          Download size: &terminal-size;
+          Download size: &xfce4-terminal-size;
         </para>
       </listitem>
       <listitem>
         <para>
-          Estimated disk space required: &terminal-buildsize;
+          Estimated disk space required: &xfce4-terminal-buildsize;
         </para>
       </listitem>
       <listitem>
         <para>
-          Estimated build time: &terminal-time;
+          Estimated build time: &xfce4-terminal-time;
         </para>
       </listitem>
     </itemizedlist>
 
-    <bridgehead renderas="sect3">terminal Dependencies</bridgehead>
+    <bridgehead renderas="sect3">Xfce4 Terminal Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="exo"/> and
-      <xref linkend="vte2"/>.
+      <xref linkend="libxfce4ui"/> and
+      <xref linkend="vte2"/>
     </para>
 
     <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/terminal"/>
+      User Notes: <ulink url="&blfs-wiki;/xfce4-terminal"/>
     </para>
   </sect2>
 
   <sect2 role="installation">
-    <title>Installation of terminal</title>
+    <title>Installation of Xfce4 Terminal</title>
 
     <para>
-      Install <application>terminal</application> by running the following
+      Install <application>Xfce4 Terminal</application> by running the following
       commands:
     </para>
 
-<screen><userinput>./configure --prefix=/usr --docdir=/usr/share/doc/terminal-&terminal-version; &&
+<screen><userinput>./configure --prefix=/usr &&
 make</userinput></screen>
 
     <para>
@@ -106,33 +106,27 @@
     </para>
 
 <screen role="root"><userinput>make install</userinput></screen>
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
 
-    <para>
-      <option>--docdir=/usr/share/doc/terminal-&terminal-version;</option>: This
-      puts <application>Terminal</application>'s docs into a versioned
-      directory.
-    </para>
   </sect2>
 
   <sect2 role="content">
     <title>Contents</title>
 
     <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Program</segtitle>
       <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directory</segtitle>
 
       <seglistitem>
         <seg>
-          Terminal and
-          terminal
+          xfce4-terminal
+        </seg>
+        <seg>
+          None
+        </seg>
+        <seg>
+          /usr/share/xfce4/terminal
         </seg>
-        <seg>None</seg>
-        <seg>/usr/share/doc/terminal-&terminal-version;</seg>
       </seglistitem>
     </segmentedlist>
 
@@ -141,29 +135,20 @@
       <?dbfo list-presentation="list"?>
       <?dbhtml list-presentation="table"?>
 
-      <varlistentry id="Terminal">
-        <term><command>Terminal</command></term>
+      <varlistentry id="xfce4-terminal-prog">
+        <term><command>xfce4-terminal</command></term>
         <listitem>
           <para>
-            is a <application>Gtk 2</application> terminal emulator.
+            is a <application>GTK+ 2</application> terminal emulator.
           </para>
-          <indexterm zone="terminal Terminal">
-            <primary sortas="b-Terminal">Terminal</primary>
+          <indexterm zone="xfce4-terminal xfce4-terminal-prog">
+            <primary sortas="b-xfce4-terminal">xfce4-terminal</primary>
           </indexterm>
         </listitem>
       </varlistentry>
 
-      <varlistentry id="terminal-prog">
-        <term><command>terminal</command></term>
-        <listitem>
-          <para>
-            is a symbolic link to <application>Terminal</application>.
-          </para>
-          <indexterm zone="terminal terminal-prog">
-            <primary sortas="b-terminal">terminal</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
     </variablelist>
+
   </sect2>
+
 </sect1>



More information about the blfs-book mailing list