From: Manoj Srivastava Date: Thu, 16 Jun 2005 05:06:09 +0000 (+0000) Subject: minor tweaks X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=5b04353fb9f59c449909007b55dab5581f8e21d7;p=debian%2Fdebian-policy.git 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 5cfcd11..bbf49b5 100644 --- 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 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 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 cf6e0e2..ec066fd 100644 --- 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 ed01efb..207e309 100644 --- 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 90c32db..53ec0b1 100644 --- a/policy.sgml +++ b/policy.sgml @@ -503,9 +503,10 @@

The packages in all the sections (main, - contrib, non-US, and non-free) - are grouped further into subsections to simplify - handling of them.

+ contrib, non-US/main, non-free, + non-US/contrib, and non-US/non-free) are + grouped further into subsections to simplify + handling.

The section for each package is specified in the package's @@ -2909,18 +2910,18 @@ /usr/include/X11/, or /usr/lib/X11/; these directories are actually symbolic links, which dpkg does not follow when unpacking a package. Instead, use - /usr/X11R6/bin/, /usr/doc/package/ (i.e., - place files with the rest of your package's documentation), - /usr/X11R6/include/, and + /usr/X11R6/bin/, /usr/share/doc/package/ + (i.e., place files with the rest of your package's + documentation), /usr/X11R6/include/, and /usr/X11R6/lib/. 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 /usr/{bin,include,lib}/X11/ directories rather than - their /usr/X11R6/ 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.

+ their /usr/X11R6/ 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.

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 d4dda5d..5b547f9 100644 --- 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 ) 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