minor tweaks

Author: srivasta
Date: 1999/07/15 19:49:49
minor tweaks

git-archimport-id: srivasta@debian.org--etch/debian-policy--devel--3.0--patch-35

diff --git a/debian/changelog b/debian/changelog
index 5cfcd117a3a6f9a32b081cf6cf01ed85009fcccf..bbf49b5befd9c7e061c3ecdd0b3d08bbdf68cec2 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,8 +8,17 @@ debian-policy (3.0.1.0) unstable; urgency=low
     packages using libtool's libltdl library, in which case the
     .la files must go in the run-time library package. (this is why this
     is version 3.0.1.0, and not 3.0.0.1)
-
- -- Manoj Srivastava <srivasta@debian.org>  Thu,  1 Jul 1999 14:48:25 -0500
+  * The virtual package list has new directions (this has been true for a
+    while, I am just closing the bug now). closes: Bug#26159
+  * Since this package now contains the FHS, this closes: Bug#25533
+  * The General resolution prototcol handling of the logos closes: Bug#26915
+  * Inclusion of the Menu policy in the main policy document closes: Bug#30036
+  * Since proposal submitting guidelines are now in the policy package,
+    this closes: Bug#38612
+  * Changed a /usr/doc reference to /usr/share/doc which had beeen missed
+    before. closes: Bug#40864
+
+ -- Manoj Srivastava <srivasta@debian.org>  Thu, 15 Jul 1999 13:35:11 -0500
 
 debian-policy (3.0.0.0) unstable; urgency=low
 
@@ -586,5 +595,4 @@ debian-manuals (0.2.0.0) experimental;
 
 Local variables:
 mode: debian-changelog
-add-log-mailing-address: "phil@hands.com"
 End:

diff --git a/debian/control b/debian/control
index cf6e0e2c25bf735366cee5054832e66d5d0f4a50..ec066fdcd278ed5e020736d7800df8140603ec94 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -12,6 +12,7 @@ Description: Debian Policy Manual and related documents
  This package contains:
     - Debian Policy Manual
     - Linux Filesystem Structure (FSSTND)
+    - Linux Filesystem Hierarchy Standard (FHS)
     - Authoritative list of virtual package names
     - Paper about libc6 migration
     - Policy checklist for upgrading your packages

diff --git a/debian/copyright b/debian/copyright
index ed01efb0c125d18feda73ce6589d45f4f787e6e8..207e3093bac415afcb12a1143f91f7e75eafe437 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -19,10 +19,10 @@ fitness for a particular purpose. See the GNU General Public License
 for more details.
 
 You should have received a copy of the GNU General Public License with
-your Debian GNU/Linux system, in /usr/doc/copyright/GPL, or with the
-dpkg source package as the file COPYING. If not, write to the Free
-Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+your Debian GNU/Linux system, in /usr/share/common-licenses/GPL, or
+with the dpkg source package as the file COPYING. If not, write to the
+Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
+MA 02111-1307, USA.
 
 ------------------------------------------------------------------------------
 Copyright of the Linux Filesystem Standard (FSSTND).

diff --git a/policy.sgml b/policy.sgml
index 90c32dba20bd63f56188b47e1c58fc3e97969e92..53ec0b11b2c5d70dc8bbec1235a4f9bf8b023e57 100644 (file)
--- a/policy.sgml
+++ b/policy.sgml
@@ -503,9 +503,10 @@
 
        <p>
          The packages in all the sections (<em>main</em>,
-         <em>contrib</em>, <em>non-US</em>, and <em>non-free</em>)
-         are grouped further into <em>subsections</em> to simplify
-         handling of them.</p>
+         <em>contrib</em>, <em>non-US/main</em>, <em>non-free</em>,
+         <em>non-US/contrib</em>, and <em>non-US/non-free</em>) are
+         grouped further into <em>subsections</em> to simplify
+         handling.</p>
 
        <p>
          The section for each package is specified in the package's
@@ -2909,18 +2910,18 @@
          <tt>/usr/include/X11/</tt>, or <tt>/usr/lib/X11/</tt>; these
          directories are actually symbolic links, which <tt>dpkg</tt>
          does not follow when unpacking a package.  Instead, use
-         <tt>/usr/X11R6/bin/</tt>, <tt>/usr/doc/package/</tt> (i.e.,
-         place files with the rest of your package's documentation),
-         <tt>/usr/X11R6/include/</tt>, and
+         <tt>/usr/X11R6/bin/</tt>, <tt>/usr/share/doc/package/</tt>
+         (i.e., place files with the rest of your package's
+         documentation), <tt>/usr/X11R6/include/</tt>, and
          <tt>/usr/X11R6/lib/</tt>.  This restriction governs only the
-         paths used by the package as it is unpacked onto the system; it
-         is permissible, and even preferable, for files within a package
-         (shell scripts, for instance) to refer to the
+         paths used by the package as it is unpacked onto the system;
+         it is permissible, and even preferable, for files within a
+         package (shell scripts, for instance) to refer to the
          <tt>/usr/{bin,include,lib}/X11/</tt> directories rather than
-         their <tt>/usr/X11R6/</tt> counterparts -- this way they do not
-         have to be modified in the event that the X Window System
-         packages install their files into a different directory in the
-         future.</p>
+         their <tt>/usr/X11R6/</tt> counterparts -- this way they do
+         not have to be modified in the event that the X Window
+         System packages install their files into a different
+         directory in the future.</p>
 
        <p>
          If you package a program that requires the (non-free)

diff --git a/virtual-package-names-list.txt b/virtual-package-names-list.txt
index d4dda5d17260be23d6663631d8f98dbe1d00d808..5b547f983e78a84d2965b1b3bbb0412d4fc3e0ef 100644 (file)
--- a/virtual-package-names-list.txt
+++ b/virtual-package-names-list.txt
@@ -32,8 +32,8 @@ The procedure for updating the list is as follows:
 3. Mail the maintainer of the virtual package name list (which is the
    Debian Policy list <debian-policy@lists.debian.org>) notifying them
    of the consensus reached (or your suggestions if noone objected).
-   Please update the bug report at the same time (possibly retitling the
-   bug to [ACCEPTED] ....
+   Please update the bug report at the same time (retitling the bug to
+   [ACCEPTED] ....
 
    Please include a proposed brief description of the new virtual name(s)
    for the list.  The list maintainer will then post the new list to
@@ -80,6 +80,7 @@ libc-dev                Anything that provides header and object files
                         of `libc'
 emacsen                 Anything providing the GNU emacs or a compatible
                         editor
+ftp-server              Any ftp server
 
 News and Mail
 -------------
@@ -140,3 +141,7 @@ Christian Schwarz
               lambdamoo-server
   29 Jan 1998 Added libc-dev, emacsen
   14 Apr 1998 Removed obsolete virtual package `emacs'
+
+Manoj Srivastava
+  23 Jun 1999 Added pop3-server
+  13 Jul 1999 Added ftp-server