Author: krejzi
Date: Sun Jul 14 16:25:22 2013
New Revision: 11427

Log:
Final sync with the trunk, enough for today.

Modified:
   branches/systemd/general.ent
   branches/systemd/general/prog/python-modules.xml
   branches/systemd/general/sysutils/ibus.xml
   branches/systemd/introduction/welcome/changelog.xml
   branches/systemd/x/wm/openbox.xml

Modified: branches/systemd/general.ent
==============================================================================
--- branches/systemd/general.ent        Sun Jul 14 16:24:00 2013        (r11426)
+++ branches/systemd/general.ent        Sun Jul 14 16:25:22 2013        (r11427)
@@ -423,16 +423,14 @@
 <!-- Python module versions used in the Python Modules instructions -->
 <!ENTITY dbus-python-version          "1.2.0">
 <!ENTITY notify-python-version        "0.1.1">
-<!ENTITY pyxml-version                "0.8.4">
 <!ENTITY py2cairo-version             "1.10.0">
 <!ENTITY pycairo-version              "1.10.0">
 <!ENTITY pygobject2-version           "2.28.6">
 <!ENTITY pygobject3-version           "3.8.2">
 <!ENTITY pygtk-version                "2.24.0">
-<!ENTITY pygtksourceview-version      "2.10.1">
 <!ENTITY pyatspi2-version             "2.8.0">
 <!ENTITY pyrex-version                "0.9.9">
-<!ENTITY pyxdg-version                "0.23">
+<!ENTITY pyxdg-version                "0.25">
 
 <!-- Part IV -->
 <!-- Chapter 14 -->

Modified: branches/systemd/general/prog/python-modules.xml
==============================================================================
--- branches/systemd/general/prog/python-modules.xml    Sun Jul 14 16:24:00 
2013        (r11426)
+++ branches/systemd/general/prog/python-modules.xml    Sun Jul 14 16:25:22 
2013        (r11427)
@@ -78,6 +78,14 @@
   <!ENTITY pyrex-size          "252 KB">
   <!ENTITY pyrex-buildsize     "4.0 MB">
   <!ENTITY pyrex-time          "less than 0.1 SBU">
+
+  <!ENTITY pyxdg-download-http 
+           
"http://people.freedesktop.org/~takluyver/pyxdg-&pyxdg-version;.tar.gz";>
+  <!ENTITY pyxdg-download-ftp  " ">
+  <!ENTITY pyxdg-md5sum        "bedcdb3a0ed85986d40044c87f23477c">
+  <!ENTITY pyxdg-size          "48 KB">
+  <!ENTITY pyxdg-buildsize     "800 KB">
+  <!ENTITY pyxdg-time          "less than 0.1 SBU">
 ]>
 
 <sect1 id="python-modules" xreflabel="Python modules">
@@ -151,6 +159,11 @@
           <xref linkend="pyrex"/>
         </para>
       </listitem>
+      <listitem>
+        <para>
+          <xref linkend="pyxdg"/>
+        </para>
+      </listitem>
     </itemizedlist>
   </sect2>
 
@@ -1428,16 +1441,6 @@
       </para>
 
 <screen role="root"><userinput>python setup.py install</userinput></screen>
-    </sect3>
-
-    <sect3 role="commands">
-      <title>Command Explanations</title>
-
-      <para>
-        <command>python setup.py install</command>: This command installs
-        the package. There are other options available, see
-        <command>python setup.py --help-commands</command> for details.
-      </para>
 
     </sect3>
 
@@ -1467,4 +1470,118 @@
   </sect2>
   <!-- End Pyrex -->
 
+  <!-- Begin PyXDG -->
+  <sect2 id="pyxdg" xreflabel="PyXDG-&pyxdg-version;">
+
+    <title>PyXDG-&pyxdg-version;</title>
+
+    <indexterm zone="pyxdg">
+      <primary sortas="a-PyXDG">PyXDG</primary>
+    </indexterm>
+
+    <sect3 role="package">
+      <title>Introduction to PyXDG Module</title>
+
+      <para>
+        <application>PyXDG</application> is a <application>Python</application>
+        library to access freedesktop.org standards.
+      </para>
+
+      &lfs73_checked;
+
+      <bridgehead renderas="sect4">Package Information</bridgehead>
+      <itemizedlist spacing="compact">
+        <listitem>
+          <para>
+            Download (HTTP): <ulink url="&pyxdg-download-http;"/>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download (FTP): <ulink url="&pyxdg-download-ftp;"/>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download MD5 sum: &pyxdg-md5sum;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download size: &pyxdg-size;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Estimated disk space required: &pyxdg-buildsize;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Estimated build time: &pyxdg-time;
+          </para>
+        </listitem>
+      </itemizedlist>
+
+      <bridgehead renderas="sect4">PyXDG Dependencies</bridgehead>
+
+      <bridgehead renderas="sect5">Required</bridgehead>
+      <para role="required">
+        <xref linkend="python2"/> and/or
+        <xref linkend="python3"/>
+      </para>
+
+      <para condition="html" role="usernotes">
+        User Notes: <ulink url="&blfs-wiki;/pyxdg"/>
+      </para>
+    </sect3>
+
+    <sect3 role="installation">
+      <title>Installation of PyXDG</title>
+
+      <note>
+        <para>
+          Both <application>Python 2</application> and
+          <application>Python 3</application> modules can
+          be built and installed without any conflicts.
+        </para>
+      </note>
+
+      <para>
+        To install the <application>Python 2</application> module,
+        run the following command as the
+        <systemitem class="username">root</systemitem> user:
+      </para>
+
+<screen role="root"><userinput>python setup.py install 
--optimize=1</userinput></screen>
+
+      <para>
+        To install the <application>Python 3</application> module,
+        run the following command as the
+        <systemitem class="username">root</systemitem> user:
+      </para>
+
+<screen role="root"><userinput>python3 setup.py install 
--optimize=1</userinput></screen>
+
+    </sect3>
+
+    <sect3 role="content">
+      <title>Contents</title>
+
+      <segmentedlist>
+        <segtitle>Installed Directory</segtitle>
+
+        <seglistitem>
+          <seg>
+            /usr/lib/python&python2-majorver;/site-packages/xdg and/or
+            /usr/lib/python&python3-majorver;/site-packages/xdg
+          </seg>
+        </seglistitem>
+      </segmentedlist>
+
+    </sect3>
+
+  </sect2>
+  <!--End PyXDG -->
+
 </sect1>

Modified: branches/systemd/general/sysutils/ibus.xml
==============================================================================
--- branches/systemd/general/sysutils/ibus.xml  Sun Jul 14 16:24:00 2013        
(r11426)
+++ branches/systemd/general/sysutils/ibus.xml  Sun Jul 14 16:25:22 2013        
(r11427)
@@ -90,8 +90,7 @@
     <para role="optional">
       <xref linkend="dbus-python"/>,
       <xref linkend="gtk-doc"/> and
-      <ulink url="http://freedesktop.org/wiki/Software/pyxdg";>
-      pyxdg</ulink>
+      <xref linkend="pyxdg"/>
     </para>
 
     <para condition="html" role="usernotes">

Modified: branches/systemd/introduction/welcome/changelog.xml
==============================================================================
--- branches/systemd/introduction/welcome/changelog.xml Sun Jul 14 16:24:00 
2013        (r11426)
+++ branches/systemd/introduction/welcome/changelog.xml Sun Jul 14 16:25:22 
2013        (r11427)
@@ -47,6 +47,9 @@
       <para>July 14th, 2013</para>
       <itemizedlist>
         <listitem>
+          <para>[krejzi] - Added PyXDG 0.25, a Python Module.</para>
+        </listitem>
+        <listitem>
           <para>[krejzi] - D-Bus Python 1.2.0.</para>
         </listitem>
         <listitem>

Modified: branches/systemd/x/wm/openbox.xml
==============================================================================
--- branches/systemd/x/wm/openbox.xml   Sun Jul 14 16:24:00 2013        (r11426)
+++ branches/systemd/x/wm/openbox.xml   Sun Jul 14 16:25:22 2013        (r11427)
@@ -77,7 +77,7 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
       <xref linkend="imlib2"/> (to enable icons in the right click menu) and
-      <ulink url="http://freedesktop.org/wiki/Software/pyxdg";>PyXDG</ulink>
+      <xref linkend="pyxdg"/>
     </para>
 
     <para condition="html" role="usernotes">
-- 
http://linuxfromscratch.org/mailman/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page

Reply via email to