Changeset 6d15c62

Timestamp:

11/03/2011 11:05:47 PM (11 years ago)

Author:

Bruce Dubbs <bdubbs@…>

Branches:

10.0, 10.1, 11.0, 11.1, 7.10, 7.4, 7.5, 7.6, 7.6-blfs, 7.6-systemd, 7.7, 7.8, 7.9, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, gnome, kde5-13430, kde5-14269, kde5-14686, krejzi/svn, lazarus, nosym, perl-modules, qt5new, systemd-11177, systemd-13485, trunk, upgradedb, xry111/intltool, xry111/test-20220226

Children:

08f1ff7

Parents:

4d61f73

Message:

Rearrange package organization

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@8934 af4574ff-66df-0310-9fd7-8a98e5e911e0

Files:

• general.ent (modified) (3 diffs)
• general/sysutils/autofs.xml (moved) (moved from postlfs/config/autofs.xml ) (1 diff)
• general/sysutils/initdtools.xml (moved) (moved from postlfs/config/initdtools.xml )
• general/sysutils/sysutils.xml (modified) (3 diffs)
• index.xml (modified) (1 diff)
• introduction/welcome/changelog.xml (modified) (2 diffs)
• networking/connect/connect.xml (moved) (moved from basicnet/connect/connect.xml ) (1 diff)
• networking/connect/dhcp-client.xml (moved) (moved from basicnet/connect/dhcp-client.xml )
• networking/connect/dhcp.xml (moved) (moved from server/other/dhcp.xml )
• networking/connect/dhcpcd.xml (moved) (moved from basicnet/connect/dhcpcd.xml )
• networking/connect/ppp.xml (moved) (moved from basicnet/connect/ppp.xml )
• networking/mailnews/fetchmail.xml (moved) (moved from basicnet/mailnews/fetchmail.xml )
• networking/mailnews/mailnews.xml (moved) (moved from basicnet/mailnews/mailnews.xml )
• networking/mailnews/mailx.xml (moved) (moved from basicnet/mailnews/mailx.xml )
• networking/mailnews/mutt.xml (moved) (moved from basicnet/mailnews/mutt.xml )
• networking/mailnews/other.xml (moved) (moved from basicnet/mailnews/other.xml )
• networking/mailnews/pine.xml (moved) (moved from basicnet/mailnews/pine.xml )
• networking/mailnews/procmail.xml (moved) (moved from basicnet/mailnews/procmail.xml )
• networking/mailnews/slrn.xml (moved) (moved from basicnet/mailnews/slrn.xml )
• networking/mailnews/tin.xml (moved) (moved from basicnet/mailnews/tin.xml )
• networking/netlibs/curl.xml (moved) (moved from basicnet/netlibs/curl.xml )
• networking/netlibs/gnet.xml (moved) (moved from basicnet/netlibs/gnet.xml )
• networking/netlibs/libnice.xml (moved) (moved from basicnet/netlibs/libnice.xml )
• networking/netlibs/libpcap.xml (moved) (moved from basicnet/netlibs/libpcap.xml )
• networking/netlibs/libproxy.xml (moved) (moved from basicnet/netlibs/libproxy.xml )
• networking/netlibs/libsoup.xml (moved) (moved from basicnet/netlibs/libsoup.xml )
• networking/netlibs/neon.xml (moved) (moved from basicnet/netlibs/neon.xml )
• networking/netlibs/netlibs.xml (moved) (moved from basicnet/netlibs/netlibs.xml )
• networking/netprogs/cvs.xml (moved) (moved from basicnet/netprogs/cvs.xml )
• networking/netprogs/ggz-client-libs.xml (moved) (moved from basicnet/netprogs/ggz-client-libs.xml )
• networking/netprogs/inetutils.xml (moved) (moved from basicnet/netprogs/inetutils.xml )
• networking/netprogs/ncftp.xml (moved) (moved from basicnet/netprogs/ncftp.xml )
• networking/netprogs/ncpfs.xml (moved) (moved from basicnet/netprogs/ncpfs.xml )
• networking/netprogs/net-tools.xml (moved) (moved from basicnet/netprogs/net-tools.xml )
• networking/netprogs/netfs.xml (moved) (moved from postlfs/config/netfs.xml )
• networking/netprogs/netprogs.xml (moved) (moved from basicnet/netprogs/netprogs.xml ) (2 diffs)
• networking/netprogs/nfs-utils-client.xml (moved) (moved from basicnet/netprogs/nfs-utils-client.xml )
• networking/netprogs/nfs-utils.xml (moved) (moved from server/major/nfs-utils.xml )
• networking/netprogs/ntp.xml (moved) (moved from basicnet/netprogs/ntp.xml )
• networking/netprogs/openssh-client.xml (moved) (moved from basicnet/netprogs/openssh-client.xml )
• networking/netprogs/othernetprogs.xml (moved) (moved from basicnet/netprogs/othernetprogs.xml )
• networking/netprogs/portmap.xml (moved) (moved from basicnet/netprogs/portmap.xml )
• networking/netprogs/rsync-client.xml (moved) (moved from basicnet/netprogs/rsync-client.xml )
• networking/netprogs/rsync.xml (moved) (moved from basicnet/netprogs/rsync.xml )
• networking/netprogs/samba3-client.xml (moved) (moved from basicnet/netprogs/samba3-client.xml )
• networking/netprogs/subversion.xml (moved) (moved from basicnet/netprogs/subversion.xml )
• networking/netprogs/tcpwrappers.xml (moved) (moved from basicnet/netprogs/tcpwrappers.xml )
• networking/netprogs/wget.xml (moved) (moved from basicnet/netprogs/wget.xml )
• networking/netprogs/wireless-tools.xml (moved) (moved from basicnet/netprogs/wireless-tools.xml )
• networking/netutils/avahi.xml (moved) (moved from basicnet/netutils/avahi.xml )
• networking/netutils/bind-utils.xml (moved) (moved from basicnet/netutils/bind-utils.xml )
• networking/netutils/mod_dnssd.xml (moved) (moved from basicnet/netutils/mod_dnssd.xml )
• networking/netutils/netutils.xml (moved) (moved from basicnet/netutils/netutils.xml ) (2 diffs)
• networking/netutils/nmap.xml (moved) (moved from basicnet/netutils/nmap.xml )
• networking/netutils/traceroute.xml (moved) (moved from basicnet/netutils/traceroute.xml )
• networking/netutils/whois.xml (moved) (moved from basicnet/netutils/whois.xml )
• networking/netutils/wireshark.xml (moved) (moved from basicnet/netutils/wireshark.xml )
• networking/networking.xml (moved) (moved from basicnet/basicnet.xml ) (1 diff)
• networking/textweb/links.xml (moved) (moved from basicnet/textweb/links.xml )
• networking/textweb/lynx.xml (moved) (moved from basicnet/textweb/lynx.xml )
• networking/textweb/textweb.xml (moved) (moved from basicnet/textweb/textweb.xml )
• networking/textweb/w3m.xml (moved) (moved from basicnet/textweb/w3m.xml )
• postlfs/config/config.xml (modified) (2 diffs)
• server/major/major.xml (modified) (1 diff)
• server/other/other.xml (modified) (1 diff)

general.ent

@@ -4 +4 @@
 -->
 
-<!ENTITY day          "02">                   <!-- Always 2 digits -->
+<!ENTITY day          "03">                   <!-- Always 2 digits -->
 <!ENTITY month        "11">                   <!-- Always 2 digits -->
 <!ENTITY year         "2011">
@@ -10 +10 @@
 <!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 -->
@@ -312 +312 @@
 <!ENTITY DeviceKit-version            "003">
 <!ENTITY lzma-utils-version           "4.32.7">
+-->
 <!ENTITY pkgconfig-version            "0.23">
--->
 
 <!-- Chapter 12 -->

general/sysutils/autofs.xml

@@ -21 +21 @@
   </sect1info>
 
-  <title>Automate Mounting of File Systems</title>
+  <title>autofs-&autofs-version;</title>
 
   <indexterm zone="autofs">

general/sysutils/sysutils.xml

@@ -20 +20 @@
   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"/>
@@ -26 +27 @@
   <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"/>
@@ -48 +50 @@
   <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"/>

index.xml

@@ -19 +19 @@
   <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"/>

introduction/welcome/changelog.xml

@@ -43 +43 @@
 
     <listitem>
+      <para>November 3rd, 2011</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Rearrange package organization.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>November 2nd, 2011</para>
       <itemizedlist>
@@ -108 +117 @@
 
     <listitem>
-      <para>October 26th, 2011</para>
+      <para>October 27th, 2011</para>
       <itemizedlist>
         <listitem>

networking/connect/connect.xml

@@ -34 +34 @@
   <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"/>
 

networking/netprogs/netprogs.xml

@@ -11 +11 @@
 -->
 
-<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
@@ -26 +26 @@
 <!--  <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"/>

networking/netutils/netutils.xml

@@ -11 +11 @@
 -->
 
-<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
@@ -21 +21 @@
   <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"/>

networking/networking.xml

@@ -11 +11 @@
 -->
 
-<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="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="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="mailnews/mailnews.xml"/>
 

postlfs/config/config.xml

@@ -49 +49 @@
   <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"/>
@@ -57 +57 @@
   <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>

server/major/major.xml

@@ -21 +21 @@
   <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"/>

server/other/other.xml

@@ -23 +23 @@
   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"/>