Rearrange package organization

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@8934 af4574ff-66df-0310-9fd7-8a98e5e911e0
2025-01-23 22:42:14 +08:00 · 2011-11-03 23:05:47 +00:00 · 2011-11-03 23:05:47 +00:00 · 6d15c62929
commit 6d15c62929
parent 4d61f738e4
65 changed files with 34 additions and 22 deletions
--- a/general.ent
+++ b/general.ent
@ -3,13 +3,13 @@ $LastChangedBy$
 $Date$
 -->

-<!ENTITY day          "02">                   <!-- Always 2 digits -->
+<!ENTITY day          "03">                   <!-- Always 2 digits -->
 <!ENTITY month        "11">                   <!-- Always 2 digits -->
 <!ENTITY year         "2011">
 <!ENTITY copyrightdate "2001-&year;">
 <!ENTITY copyholder   "The BLFS Development Team">
 <!ENTITY version      "svn-&year;&month;&day;">
-<!ENTITY releasedate  "November 2nd, &year;">
+<!ENTITY releasedate  "November 3rd, &year;">
 <!-- <!ENTITY releasedate  "November &day;st, &year;"> -->
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
 <!ENTITY blfs-version "svn">                  <!-- svn|[release #] -->
@ -311,8 +311,8 @@ $Date$
 <!-- Obsolete
 <!ENTITY DeviceKit-version            "003">
 <!ENTITY lzma-utils-version           "4.32.7">
-<!ENTITY pkgconfig-version            "0.23">
 -->
+<!ENTITY pkgconfig-version            "0.23">

 <!-- Chapter 12 -->
 <!ENTITY dejagnu-version              "1.4.4">
--- a/general/sysutils/autofs.xml
+++ b/general/sysutils/autofs.xml
@ -20,7 +20,7 @@
    <date>$Date$</date>
  </sect1info>

-  <title>Automate Mounting of File Systems</title>
+  <title>autofs-&autofs-version;</title>

  <indexterm zone="autofs">
    <primary sortas="a-Autofs">Autofs</primary>
--- a/general/sysutils/initdtools.xml
+++ b/general/sysutils/initdtools.xml
--- a/general/sysutils/sysutils.xml
+++ b/general/sysutils/sysutils.xml
@ -19,12 +19,14 @@ $Date$
  some applications used by other applications in the book for
  installation or configuration purposes.</para>

+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="autofs.xml"/>
  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gpm.xml"/>
  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="fcron.xml"/>
  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="which.xml"/>
  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="unzip.xml"/>
  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="zip.xml"/>
  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="unrar.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="initdtools.xml"/>
  <!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xz-utils.xml"/> -->
  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pciutils.xml"/>
  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="usbutils.xml"/>
@ -47,7 +49,7 @@ $Date$
  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libarchive.xml"/>
  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="cmake.xml"/>
  <!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lzma-utils.xml"/> -->
-  <!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pkgconfig.xml"/> -->
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pkgconfig.xml"/>
  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="raptor.xml"/>
  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="rasqal.xml"/>
  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="redland.xml"/>
--- a/index.xml
+++ b/index.xml
@ -18,7 +18,7 @@ $Date$
  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="introduction/introduction.xml"/>
  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="postlfs/postlfs.xml"/>
  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="general/general.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="basicnet/basicnet.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="networking/networking.xml"/>
  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="server/server.xml"/>
  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x/x.xml"/>
  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kde/kde.xml"/>
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@ -41,6 +41,15 @@

 -->

+    <listitem>
+      <para>November 3rd, 2011</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Rearrange package organization.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
    <listitem>
      <para>November 2nd, 2011</para>
      <itemizedlist>
@ -107,7 +116,7 @@
    </listitem>

    <listitem>
-      <para>October 26th, 2011</para>
+      <para>October 27th, 2011</para>
      <itemizedlist>
        <listitem>
          <para>[bdubbs] - Updated to vsftpd-2.3.4.</para>
--- a/networking/connect/connect.xml
+++ b/networking/connect/connect.xml
@ -33,6 +33,7 @@ $Date$

  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppp.xml"/>
  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dhcpcd.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dhcp.xml"/>
  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dhcp-client.xml"/>

 </chapter>
--- a/networking/connect/dhcp-client.xml
+++ b/networking/connect/dhcp-client.xml
--- a/networking/connect/dhcp.xml
+++ b/networking/connect/dhcp.xml
--- a/networking/connect/dhcpcd.xml
+++ b/networking/connect/dhcpcd.xml
--- a/networking/connect/ppp.xml
+++ b/networking/connect/ppp.xml
--- a/networking/mailnews/fetchmail.xml
+++ b/networking/mailnews/fetchmail.xml
--- a/networking/mailnews/mailnews.xml
+++ b/networking/mailnews/mailnews.xml
--- a/networking/mailnews/mailx.xml
+++ b/networking/mailnews/mailx.xml
--- a/networking/mailnews/mutt.xml
+++ b/networking/mailnews/mutt.xml
--- a/networking/mailnews/other.xml
+++ b/networking/mailnews/other.xml
--- a/networking/mailnews/pine.xml
+++ b/networking/mailnews/pine.xml
--- a/networking/mailnews/procmail.xml
+++ b/networking/mailnews/procmail.xml
--- a/networking/mailnews/slrn.xml
+++ b/networking/mailnews/slrn.xml
--- a/networking/mailnews/tin.xml
+++ b/networking/mailnews/tin.xml
--- a/networking/netlibs/curl.xml
+++ b/networking/netlibs/curl.xml
--- a/networking/netlibs/gnet.xml
+++ b/networking/netlibs/gnet.xml
--- a/networking/netlibs/libnice.xml
+++ b/networking/netlibs/libnice.xml
--- a/networking/netlibs/libpcap.xml
+++ b/networking/netlibs/libpcap.xml
--- a/networking/netlibs/libproxy.xml
+++ b/networking/netlibs/libproxy.xml
--- a/networking/netlibs/libsoup.xml
+++ b/networking/netlibs/libsoup.xml
--- a/networking/netlibs/neon.xml
+++ b/networking/netlibs/neon.xml
--- a/networking/netlibs/netlibs.xml
+++ b/networking/netlibs/netlibs.xml
--- a/networking/netprogs/cvs.xml
+++ b/networking/netprogs/cvs.xml
--- a/networking/netprogs/ggz-client-libs.xml
+++ b/networking/netprogs/ggz-client-libs.xml
--- a/networking/netprogs/inetutils.xml
+++ b/networking/netprogs/inetutils.xml
--- a/networking/netprogs/ncftp.xml
+++ b/networking/netprogs/ncftp.xml
--- a/networking/netprogs/ncpfs.xml
+++ b/networking/netprogs/ncpfs.xml
--- a/networking/netprogs/net-tools.xml
+++ b/networking/netprogs/net-tools.xml
--- a/networking/netprogs/netfs.xml
+++ b/networking/netprogs/netfs.xml
--- a/networking/netprogs/netprogs.xml
+++ b/networking/netprogs/netprogs.xml
@ -10,10 +10,10 @@ $LastChangedBy$
 $Date$
 -->

-<chapter id="basicnet-netprogs">
+<chapter id="netprogs">
  <?dbhtml filename="netprogs.html"?>

-  <title>Basic Networking Programs</title>
+  <title>Networking Programs</title>

  <para>These applications are generally client applications used to
  access the appropriate server across the building or across the world.
@ -25,7 +25,9 @@ $Date$
  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ncftp.xml"/>
 <!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ncpfs.xml"/> -->
  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="net-tools.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="nfs-utils.xml"/>
  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="nfs-utils-client.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="netfs.xml"/>
  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ntp.xml"/>
  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="portmap.xml"/>
 <!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="rsync-client.xml"/> -->
--- a/networking/netprogs/nfs-utils-client.xml
+++ b/networking/netprogs/nfs-utils-client.xml
--- a/networking/netprogs/nfs-utils.xml
+++ b/networking/netprogs/nfs-utils.xml
--- a/networking/netprogs/ntp.xml
+++ b/networking/netprogs/ntp.xml
--- a/networking/netprogs/openssh-client.xml
+++ b/networking/netprogs/openssh-client.xml
--- a/networking/netprogs/othernetprogs.xml
+++ b/networking/netprogs/othernetprogs.xml
--- a/networking/netprogs/portmap.xml
+++ b/networking/netprogs/portmap.xml
--- a/networking/netprogs/rsync-client.xml
+++ b/networking/netprogs/rsync-client.xml
--- a/networking/netprogs/rsync.xml
+++ b/networking/netprogs/rsync.xml
--- a/networking/netprogs/samba3-client.xml
+++ b/networking/netprogs/samba3-client.xml
--- a/networking/netprogs/subversion.xml
+++ b/networking/netprogs/subversion.xml
--- a/networking/netprogs/tcpwrappers.xml
+++ b/networking/netprogs/tcpwrappers.xml
--- a/networking/netprogs/wget.xml
+++ b/networking/netprogs/wget.xml
--- a/networking/netprogs/wireless-tools.xml
+++ b/networking/netprogs/wireless-tools.xml
--- a/networking/netutils/avahi.xml
+++ b/networking/netutils/avahi.xml
--- a/networking/netutils/bind-utils.xml
+++ b/networking/netutils/bind-utils.xml
--- a/networking/netutils/mod_dnssd.xml
+++ b/networking/netutils/mod_dnssd.xml
--- a/networking/netutils/netutils.xml
+++ b/networking/netutils/netutils.xml
@ -10,10 +10,10 @@ $LastChangedBy$
 $Date$
 -->

-<chapter id="basicnet-netutils">
+<chapter id="netutils">
  <?dbhtml filename="netutils.html"?>

-  <title>Basic Networking Utilities</title>
+  <title>Networking Utilities</title>

  <para>This chapter contains some tools that come in handy when the network
  needs investigating.</para>
@ -21,7 +21,6 @@ $Date$
  <para condition="html" role="usernotes">User Notes:
  <ulink url="&blfs-wiki;/basicnetworkingutilities"/></para>

-
  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="traceroute.xml"/>
  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="nmap.xml"/>
  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="whois.xml"/>
--- a/networking/netutils/nmap.xml
+++ b/networking/netutils/nmap.xml
--- a/networking/netutils/traceroute.xml
+++ b/networking/netutils/traceroute.xml
--- a/networking/netutils/whois.xml
+++ b/networking/netutils/whois.xml
--- a/networking/netutils/wireshark.xml
+++ b/networking/netutils/wireshark.xml
--- a/networking/networking.xml
+++ b/networking/networking.xml
@ -10,17 +10,16 @@ $LastChangedBy$
 $Date$
 -->

-<part id="basicnet" xreflabel="Basic Networking">
+<part id="basicnet" xreflabel="Networking">
  <?dbhtml filename="basicnet.html" dir="basicnet"?>

-  <title>Basic Networking</title>
-
+  <title>Networking</title>

  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="connect/connect.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="netlibs/netlibs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="textweb/textweb.xml"/>
  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="netprogs/netprogs.xml"/>
  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="netutils/netutils.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="netlibs/netlibs.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="textweb/textweb.xml"/>
  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mailnews/mailnews.xml"/>

 </part>
--- a/networking/textweb/links.xml
+++ b/networking/textweb/links.xml
--- a/networking/textweb/lynx.xml
+++ b/networking/textweb/lynx.xml
--- a/networking/textweb/textweb.xml
+++ b/networking/textweb/textweb.xml
--- a/networking/textweb/w3m.xml
+++ b/networking/textweb/w3m.xml
--- a/postlfs/config/config.xml
+++ b/postlfs/config/config.xml
@ -48,7 +48,7 @@ $Date$
  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="skel.xml"/>
  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="users.xml"/>
  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="devices.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="initdtools.xml"/>
+  <!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="initdtools.xml"/> -->
  <!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="inputrc.xml"/> -->
  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="profile.xml"/>
  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="vimrc.xml"/>
@ -56,7 +56,7 @@ $Date$
  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="etcshells.xml"/>
  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="random.xml"/>
  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="compressdoc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="autofs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="netfs.xml"/>
+  <!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="autofs.xml"/> -->
+  <!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="netfs.xml"/> -->

 </chapter>
--- a/server/major/major.xml
+++ b/server/major/major.xml
@ -20,7 +20,7 @@ $Date$

  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="apache.xml"/>
  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bind.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="nfs-utils.xml"/>
+<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="nfs-utils.xml"/> -->
 <!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="openssh.xml"/>-->
  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="proftpd.xml"/>
  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="samba3.xml"/>
--- a/server/other/other.xml
+++ b/server/other/other.xml
@ -22,7 +22,7 @@ $Date$
  helpful to learn about the consequences of an improper setup so
  that you can analyze the risks.</para>

-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dhcp.xml"/>
+<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dhcp.xml"/> -->
  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="leafnode.xml"/>
  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="openldap.xml"/>
 <!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="rsync.xml"/> -->