From 12be197f0f3236782d7b63c9bc265d4bb7b2dd96 Mon Sep 17 00:00:00 2001 From: Manoj Srivastava Date: Thu, 16 Jun 2005 05:05:44 +0000 Subject: [PATCH] Integrate the new policy files Author: srivasta Date: 1999/06/29 19:59:47 Integrate the new policy files git-archimport-id: srivasta@debian.org--etch/debian-policy--devel--3.0--patch-29 --- debian/rules | 12 +++--- policy.sgml | 120 +++++++++++++++++++++++++-------------------------- 2 files changed, 66 insertions(+), 66 deletions(-) diff --git a/debian/rules b/debian/rules index a62d129..115c1e4 100755 --- a/debian/rules +++ b/debian/rules @@ -5,9 +5,9 @@ ## Created On : Thu Oct 29 15:35:55 1998 ## Created On Node : tiamat.datasync.com ## Last Modified By : Manoj Srivastava -## Last Modified On : Tue Jun 29 10:27:46 1999 +## Last Modified On : Tue Jun 29 14:55:15 1999 ## Last Machine Used: glaurung.green-gryphon.com -## Update Count : 45 +## Update Count : 47 ## Status : Unknown, Use with caution! ## HISTORY : ## Description : @@ -39,7 +39,7 @@ DOCDIR := $(TMPTOP)/usr/doc/$(package) LIBDIR := $(TMPTOP)/usr/share/doc-base PTMPTOP := $(SRCTOP)/debian/tmp-packaging -PDOCDIR := $(PTMPTOP)/usr/doc/$(package) +PDOCDIR := $(PTMPTOP)/usr/doc/$(ppackage) PLIBDIR := $(PTMPTOP)/usr/share/doc-base FHS_ARCHIVE =$(shell ls -1 fhs*.tar.gz) @@ -167,9 +167,9 @@ stamp-packaging: build debiandoc2latexps -O packaging.sgml | gzip -9f > ../packaging.ps.gz debiandoc2latexpdf -O packaging.sgml | gzip -9f > ../packaging.pdf.gz GZIP=-9v tar zcf ../packaging.html.tar.gz packaging.html - dpkg-distaddfile -fdebian/files packaging.ps.gz byhand - - dpkg-distaddfile -fdebian/files packaging.pdf.gz byhand - - dpkg-distaddfile -fdebian/files packaging.html.tar.gz byhand - + dpkg-distaddfile -fdebian/files packaging.ps.gz byhand - + dpkg-distaddfile -fdebian/files packaging.pdf.gz byhand - + dpkg-distaddfile -fdebian/files packaging.html.tar.gz byhand - for i in $(PBYHAND_FILES); do \ $(install_file) $$i .. ; \ dpkg-distaddfile -fdebian/files $$i byhand - ; \ diff --git a/policy.sgml b/policy.sgml index 17b48cd..168d770 100644 --- a/policy.sgml +++ b/policy.sgml @@ -17,7 +17,7 @@ Christoph Lameter contributed the "Web Standard" The debian-policy mailing list has taken responsibility for the contents of this document since September 1998, with the package - maintainers responsible for packagingn adminstrivia only. + maintainers responsible for packaging adminstrivia only. --> @@ -555,10 +555,10 @@ because we are trying to produce, amongst other things, a free Unix. Other packages without which the system will not run well or be usable must also be - here. This does not include Emacs, the X - Window System, TeX or any other large applications. - The important packages are just a bare - minimum of commonly-expected and necessary tools.

+ here. This does not include Emacs, the X + Window System, TeX or any other large applications. + The important packages are just a bare + minimum of commonly-expected and necessary tools.

standard @@ -579,16 +579,16 @@ required, but that's not what is meant here.) This is all the software that you might reasonably want to install if you didn't know what it was or don't have - specialised requirements. This is a much larger system + specialized requirements. This is a much larger system and includes the X Window System, a full TeX - distribution, and lots of applications.

+ distribution, and many applications.

extra

This contains packages that conflict with others with higher priorities, or are only likely to be useful if - you already know what they are or have specialised + you already know what they are or have specialized requirements.

@@ -803,7 +803,7 @@ install-info.

- Packages should try to minimise the amount of prompting + Packages should try to minimize the amount of prompting they need to do, and they should ensure that the user will only ever be asked each question once. This means that packages should try to use appropriate shared @@ -1051,8 +1051,8 @@

In an as yet unreleased version of the standard, the location of the mail spool and state information - directories has changed; and we proipose to follow the - latter, since that would mean that we do not ahve to + directories has changed; and we propose to follow the + latter, since that would mean that we do not have to move things around again when the new version of the FHS comes around). The changes are, amongst others, s%/var/mail%/var/spool/mail% and @@ -1153,7 +1153,7 @@

Apart from this we should have dynamically allocated ids, which should by default be arranged in some sensible - order--but the behaviour should be configurable.

+ order--but the behavior should be configurable.

No package except base-passwd may modify @@ -1200,7 +1200,7 @@ adduser will choose UIDs and GIDs for user accounts in this range, though adduser.conf may be used to modify this - behaviour.

+ behavior.

30000-59999: @@ -1401,7 +1401,7 @@ symbolic links in /etc/rcn.d.

- To get the default behaviour for your package, put in your + To get the default behavior for your package, put in your postinst script update-rc.d package defaults >/dev/null @@ -1438,7 +1438,7 @@

For example, the kbd package provides a - script here for initialising the keyboard layout and + script here for initializing the keyboard layout and console font and mode.

@@ -1757,7 +1757,7 @@ You should print the `done.' right after the job has been completed, so that the user gets informed why he has to wait. You can get this - behaviour by saying + behavior by saying echo -n "Doing something very useful..." do_something @@ -1841,9 +1841,9 @@

emacs: the help prefix

- The interpretation of any keyboard events should be - independent of the terminal that's used (either the console, - X terminal emulators, rlogin/telnet session, etc.).

+ The interpretation of any keyboard events should be independent + of the terminal that's used, be it a virtual console, an X + terminal emulator, an rlogin/telnet session, etc.

The following list explains how the different programs @@ -1924,7 +1924,7 @@

Some systems (including previous Debian versions) use xmodmap to arrange for both <-- and Delete - to generate KB_Delete). We can change the behaviour + to generate KB_Delete). We can change the behavior of their X clients via the same X resources that we use to do it for our own, or have our clients be configured via their resources when things are the @@ -2090,8 +2090,8 @@ Certainly libtool is fully capable of linking against shared libraries which don't have .la files, but being a mere shell script it can add considerably to the build time of a - libtool using package if that shellscript has to derive all - this infomation from first principles for each library every + libtool using package if that shell-script has to derive all + this information from first principles for each library every time it is linked. With the advent of libtool-1.4 (and to a lesser extent libtool-1.3), the .la files will also store information about inter-library dependencies which cannot @@ -2101,7 +2101,7 @@

Packages that use libtool to create shared libraries must include the .la files in the -dev - packages. This is a good idea in general, and espescially + packages. This is a good idea in general, and especially for static linking issues.

@@ -2264,10 +2264,10 @@ Symbolic links

- In general, symbolic links within a toplevel directory + In general, symbolic links within a top-level directory should be relative, and symbolic links pointing from one - toplevel directory into another should be absolute. (A - toplevel directory is a sub-directory of the root + top-level directory into another should be absolute. (A + top-level directory is a sub-directory of the root directory `/'.)

@@ -2865,20 +2865,19 @@ Programs for the X Window system

- Some programs can be configured with or without support for - the X Window System. Typically, binaries produced when - built with X support will need the X shared libraries to - run.

- + Some programs can be configured with or without support for the X + Window System. Typically, binaries produced with support for X + will need the X shared libraries to run. +

+

Such programs should be configured with X support, and should declare a dependency on xlib6g (which contains X shared libraries). Users who wish to use the program can install just the relatively small xfree86-common and xlib6g packages, and do - not need to install the whole of X. -

- + not need to install the whole of X.

+

Do not create two versions (one with X support and one without) of your package.

@@ -2888,8 +2887,8 @@ the directory /usr/X11R6/lib/X11/app-defaults/. They are considered as part of the program code. Thus, they should not be modified and should not be tagged as - conffile. If the local system administrator wants - to customise X applications globally, a file with the same + conffiles. If the local system administrator wants + to customize X applications globally, a file with the same name as that of the package should be placed in the /etc/X11/Xresources/ directory instead. Important: packages that install files into the @@ -2897,41 +2896,41 @@ declare a conflict with xbase (<< 3.3.2.3a-2); if this is not done it is possible for the package to destroy a previously-existing - /etc/X11/Xresources file. -

- + /etc/X11/Xresources file.

+

No package should ever install files into the directories - /usr/bin/X11/, /usr/share/doc/X11/, + /usr/bin/X11/, /usr/doc/X11/, /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/share/doc/package/ (i.e., place - files with the rest of your package's documentation), - /usr/X11R6/include/, and /usr/X11R6/lib/. - It is permissible, and even preferable, however, for a - package to refer to the /usr/{bin,include,lib}/X11/ - directories internally, however; this restriction governs - only the paths used by the package as it is unpacked onto - the system. -

- -

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

+ +

If you package a program that requires the (non-free) - OSF/Motif library, you should try to determine if the + OSF/Motif library, you should try to determine whether the programs works reasonably well with the free re-implementation of Motif called LessTif. If so, build the package using the LessTif libraries; it can then go into the main section of the package repository and become an - official part of the Debian distribution. -

- + official part of the Debian distribution.

+

If however, the Motif-based program works insufficiently - well with LessTif, you should instead provide "-smotif" and - "-dmotif" versions (appending these identifiers to the name - of the package), which are statically and dynamically linked + well with LessTif, you should instead provide "-smotif" and "-dmotif" + versions (appending these identifiers to the name of the + package), which are statically and dynamically linked against the Motif libraries, respectively. (All known versions of OSF/Motif permit redistribution of statically-linked binaries using the library, but check the @@ -2944,6 +2943,7 @@ licensing on the package is compatible with the Debian Free Software Guidelines, it may go into the contrib section; otherwise it must go into the non-free section. +

@@ -3201,7 +3201,7 @@ directory. They are not all the licenses, just a few common ones. I could use /usr/share/doc/common-licenses but I think this is too long, and, after all, the GPL - does not "document" anything, it is merely a licence. + does not "document" anything, it is merely a license.

-- 2.39.2