r7030 - in trunk/BOOK: . basicnet/netprogs general/genlib general/prog gnome/core introduction/welcome server/major

randy at linuxfromscratch.org randy at linuxfromscratch.org
Wed Aug 8 08:18:24 PDT 2007


Author: randy
Date: 2007-08-08 09:18:24 -0600 (Wed, 08 Aug 2007)
New Revision: 7030

Modified:
   trunk/BOOK/basicnet/netprogs/subversion.xml
   trunk/BOOK/general.ent
   trunk/BOOK/general/genlib/dbus-bindings.xml
   trunk/BOOK/general/prog/python.xml
   trunk/BOOK/general/prog/pyxml.xml
   trunk/BOOK/gnome/core/gnome-menus.xml
   trunk/BOOK/gnome/core/libgnomeui.xml
   trunk/BOOK/introduction/welcome/changelog.xml
   trunk/BOOK/server/major/samba3.xml
Log:
Replaced all instances of the Python library directory pathname with an entity

Modified: trunk/BOOK/basicnet/netprogs/subversion.xml
===================================================================
--- trunk/BOOK/basicnet/netprogs/subversion.xml	2007-08-08 15:12:53 UTC (rev 7029)
+++ trunk/BOOK/basicnet/netprogs/subversion.xml	2007-08-08 15:18:24 UTC (rev 7030)
@@ -253,7 +253,7 @@
 
 make install-swig-py &&
 echo /usr/lib/svn-python \
-    > /usr/lib/python2.5/site-packages/subversion.pth &&
+    > /usr/lib/python&python-libdir;/site-packages/subversion.pth &&
 
 make install-swig-rb</userinput></screen>
 

Modified: trunk/BOOK/general/genlib/dbus-bindings.xml
===================================================================
--- trunk/BOOK/general/genlib/dbus-bindings.xml	2007-08-08 15:12:53 UTC (rev 7029)
+++ trunk/BOOK/general/genlib/dbus-bindings.xml	2007-08-08 15:18:24 UTC (rev 7030)
@@ -271,7 +271,7 @@
         <seg>None</seg>
         <seg><application>Python</application>
         <application>D-Bus</application> modules</seg>
-        <seg>/usr/lib/python2.5/site-packages/dbus and
+        <seg>/usr/lib/python&python-libdir;/site-packages/dbus and
         /usr/share/doc/dbus-python</seg>
       </seglistitem>
     </segmentedlist>

Modified: trunk/BOOK/general/prog/python.xml
===================================================================
--- trunk/BOOK/general/prog/python.xml	2007-08-08 15:12:53 UTC (rev 7029)
+++ trunk/BOOK/general/prog/python.xml	2007-08-08 15:18:24 UTC (rev 7030)
@@ -113,11 +113,12 @@
       <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
-        <seg>pydoc, python, python2.5, smtpd.py, and optionally if
+        <seg>pydoc, python, python&python-libdir;, smtpd.py, and optionally if
         <application>Tk</application> is installed, idle</seg>
-        <seg>libpython2.5.so and numerous modules installed in
-        /usr/lib/python2.5/lib-dynload</seg>
-        <seg>/usr/include/python2.5 and /usr/lib/python2.5</seg>
+        <seg>libpython&python-libdir;.so and numerous modules installed in
+        /usr/lib/python&python-libdir;/lib-dynload</seg>
+        <seg>/usr/include/python&python-libdir;,
+         and /usr/lib/python&python-libdir;</seg>
       </seglistitem>
     </segmentedlist>
 
@@ -159,13 +160,13 @@
         </listitem>
       </varlistentry>
 
-      <varlistentry id="python2.5">
-        <term><command>python2.5</command></term>
+      <varlistentry id="python-ver">
+        <term><command>python&python-libdir;</command></term>
         <listitem>
           <para>is a version-specific name for the <command>python</command>
           program.</para>
-          <indexterm zone="python python2.5">
-            <primary sortas="b-python2.5">python2.5</primary>
+          <indexterm zone="python python-ver">
+            <primary sortas="b-python&python-libdir;">python&python-libdir;</primary>
           </indexterm>
         </listitem>
       </varlistentry>

Modified: trunk/BOOK/general/prog/pyxml.xml
===================================================================
--- trunk/BOOK/general/prog/pyxml.xml	2007-08-08 15:12:53 UTC (rev 7029)
+++ trunk/BOOK/general/prog/pyxml.xml	2007-08-08 15:18:24 UTC (rev 7030)
@@ -116,7 +116,7 @@
       <seglistitem>
         <seg>xmlproc_parse and xmlproc_val</seg>
         <seg>PyXML Python library modules</seg>
-        <seg>/usr/lib/python2.4/site-packages/_xmlplus and
+        <seg>/usr/lib/python&python-libdir;/site-packages/_xmlplus and
         /usr/share/doc/PyXML-&pyxml-version;</seg>
       </seglistitem>
     </segmentedlist>

Modified: trunk/BOOK/general.ent
===================================================================
--- trunk/BOOK/general.ent	2007-08-08 15:12:53 UTC (rev 7029)
+++ trunk/BOOK/general.ent	2007-08-08 15:18:24 UTC (rev 7030)
@@ -209,6 +209,7 @@
 <!ENTITY pdl-version                  "2.4.2">
 <!ENTITY php-version                  "5.2.3">
 <!ENTITY Python-version               "2.5.1">
+<!ENTITY python-libdir                "2.5">
 <!ENTITY pyxml-version                "0.8.4">
 <!ENTITY ruby-version                 "1.8.6">
 <!ENTITY tcl-version                  "8.4.15">
@@ -416,6 +417,7 @@
 <!ENTITY pango-version                "1.16.4">
 <!ENTITY atk-version                  "1.18.0">
 <!ENTITY gtk2-version                 "2.10.13">
+<!ENTITY gtk2-libdir                  "2.0/2.10.0">
 <!ENTITY lesstif-version              "0.95.0">
 <!ENTITY startup-notification-version "0.9">
 <!ENTITY libwnck-version              "2.18.3">

Modified: trunk/BOOK/gnome/core/gnome-menus.xml
===================================================================
--- trunk/BOOK/gnome/core/gnome-menus.xml	2007-08-08 15:12:53 UTC (rev 7029)
+++ trunk/BOOK/gnome/core/gnome-menus.xml	2007-08-08 15:18:24 UTC (rev 7030)
@@ -157,9 +157,9 @@
         profile, or in individual user's profiles as shown below:</para>
 
 <screen><literal>export PYTHONPATH=$PYTHONPATH:$(pkg-config --variable=prefix \
-       ORBit-2.0)/lib/python2.5/site-packages:$(pkg-config \
+       ORBit-2.0)/lib/python&python-libdir;/site-packages:$(pkg-config \
        --variable=prefix \
-       ORBit-2.0)/lib/python2.5/site-packages/GMenuSimpleEditor</literal></screen>
+       ORBit-2.0)/lib/python&python-libdir;/site-packages/GMenuSimpleEditor</literal></screen>
 
       </sect4>
 
@@ -181,7 +181,7 @@
         <seg>&gnome-etc-dir;/xdg and the following subdirectories of
         <envar>$GNOME_PREFIX</envar>/:
         include/gnome-menus,
-        lib/python2.4/site-packages/GMenuSimpleEditor,
+        lib/python&python-libdir;/site-packages/GMenuSimpleEditor,
         share/{desktop-directories, gnome-menus}</seg>
       </seglistitem>
     </segmentedlist>

Modified: trunk/BOOK/gnome/core/libgnomeui.xml
===================================================================
--- trunk/BOOK/gnome/core/libgnomeui.xml	2007-08-08 15:12:53 UTC (rev 7029)
+++ trunk/BOOK/gnome/core/libgnomeui.xml	2007-08-08 15:18:24 UTC (rev 7030)
@@ -90,8 +90,8 @@
 
 if [ $(pkg-config --variable=prefix ORBit-2.0) != "/usr" ]; then
     ln -v -s $(pkg-config --variable=prefix \
-             ORBit-2.0)/lib/gtk-&gtk2-working-dir;/filesystems \
-        /usr/lib/gtk-&gtk2-working-dir;
+             ORBit-2.0)/lib/gtk-&gtk2-libdir;/filesystems \
+        /usr/lib/gtk-&gtk2-libdir;
 fi</userinput></screen>
 
   </sect2>

Modified: trunk/BOOK/introduction/welcome/changelog.xml
===================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml	2007-08-08 15:12:53 UTC (rev 7029)
+++ trunk/BOOK/introduction/welcome/changelog.xml	2007-08-08 15:18:24 UTC (rev 7030)
@@ -45,6 +45,10 @@
       <para>August 8th, 2007</para>
       <itemizedlist>
         <listitem>
+          <para>[randy] - Replaced all instances of the Python library
+          directory pathname with an entity.</para>
+        </listitem>
+        <listitem>
           <para>[randy] - Simplified some commands using conditionals in
           various package instructions.</para>
         </listitem>

Modified: trunk/BOOK/server/major/samba3.xml
===================================================================
--- trunk/BOOK/server/major/samba3.xml	2007-08-08 15:12:53 UTC (rev 7029)
+++ trunk/BOOK/server/major/samba3.xml	2007-08-08 15:18:24 UTC (rev 7030)
@@ -675,7 +675,7 @@
         <seg>libnss_winbind.so, libnss_wins.so, libsmbclient.so, libmsrpc.so,
         the pam_winbind.so and pam_smbpass.so PAM libraries, and assorted
         character set, filesystem and support modules.</seg>
-        <seg>/etc/samba, /usr/lib/python2.5/site-packages/samba,
+        <seg>/etc/samba, /usr/lib/python&python-libdir;/site-packages/samba,
         /usr/lib/samba, /usr/share/doc/samba-&samba3-version;,
         /usr/share/samba, /var/lib/samba and /var/log/samba</seg>
       </seglistitem>




More information about the blfs-book mailing list