X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=policy.sgml;h=854fde66d2e4e1d29bddb7f9dbb2201988ccdcc6;hb=96ba2dfcb00f5cfa50d7d5ea22a88cdfdd4ccbab;hp=0650306fec093eb14b94337818ad4d936b679eb0;hpb=191c59413924e9b0a8a9cd16071178ee205f4013;p=debian%2Fdebian-policy.git
diff --git a/policy.sgml b/policy.sgml
index 0650306..854fde6 100644
--- a/policy.sgml
+++ b/policy.sgml
@@ -488,9 +488,9 @@
In addition, the packages in main
-
- must not require a package outside of main
- for compilation or execution (thus, the package must
- not declare a "Depends", "Recommends", or
+ must not require or recommend a package outside
+ of main for compilation or execution (thus, the
+ package must not declare a "Depends", "Recommends", or
"Build-Depends" relationship on a non-main
package),
@@ -709,12 +709,13 @@
list of sections. At present, they are:
admin, cli-mono, comm, database,
devel, debug, doc, editors,
- electronics, embedded, fonts,
- games, gnome, graphics, gnu-r,
- gnustep, hamradio, haskell,
- httpd, interpreters, java, kde,
- kernel, libs, libdevel, lisp,
- localization, mail, math, misc,
+ education, electronics, embedded,
+ fonts, games, gnome, graphics,
+ gnu-r, gnustep, hamradio, haskell,
+ httpd, interpreters, introspection,
+ java, kde, kernel, libs,
+ libdevel, lisp, localization,
+ mail, math, metapackages, misc,
net, news, ocaml, oldlibs,
otherosfs, perl, php, python,
ruby, science, shells, sound,
@@ -2543,7 +2544,7 @@ Package: libc6
lines. The first line of the value, the part on the same line as
the field name, often has special significance or may have to be
empty. Other lines are added following the same syntax as the
- continuation lines the folded fields. Whitespace, including newlines,
+ continuation lines of the folded fields. Whitespace, including newlines,
is significant in the values of multiline fields.
@@ -2717,7 +2718,7 @@ Package: libc6
- The source package control file is generated by
+ The Debian source control file is generated by
dpkg-source when it builds the source
archive, from other files in the source package,
described above. When unpacking, it is checked against
@@ -2974,7 +2975,7 @@ Package: libc6
- In the source package control file .dsc, this
+ In the Debian source control file .dsc, this
field contains a list of architectures and architecture
wildcards separated by spaces. When the list contains the
architecture wildcard any, the only other value
@@ -2986,7 +2987,7 @@ Package: libc6
value all. In other words, in .dsc
files unlike the debian/control, all may
occur in combination with specific architectures.
- The Architecture field in the source package control
+ The Architecture field in the Debian source control
file .dsc is generally constructed from
the Architecture fields in
the debian/control in the source package.
@@ -3302,6 +3303,7 @@ Package: libc6
Those starting with a single space are part of a paragraph.
Successive lines of this form will be word-wrapped when
displayed. The leading space will usually be stripped off.
+ The line must contain at least one non-whitespace character.
-
@@ -3312,7 +3314,8 @@ Package: libc6
will be allowed to trail off to the right. None, one or two
initial spaces may be deleted, but the number of spaces
deleted from each line will be the same (so that you can have
- indenting work correctly, for example).
+ indenting work correctly, for example). The line must
+ contain at least one non-whitespace character.
-
@@ -3727,7 +3730,7 @@ Checksums-Sha256:
Additional user-defined fields may be added to the
source package control file. Such fields will be
ignored, and not copied to (for example) binary or
- source package control files or upload control files.
+ Debian source control files or upload control files.
@@ -3744,7 +3747,7 @@ Checksums-Sha256:
field name after the hyphen will be used in the output
file. Where the letter B is used the field
will appear in binary package control files, where the
- letter S is used in source package control
+ letter S is used in Debian source control
files and where C is used in upload control
(.changes) files.
@@ -3755,7 +3758,7 @@ Checksums-Sha256:
XBS-Comment: I stand between the candle and the star.
- then the binary and source package control files will contain the
+ then the binary and Debian source control files will contain the
field
Comment: I stand between the candle and the star.
@@ -4627,6 +4630,7 @@ Depends: libc6 (>= 2.2.1), exim | mail-transport-agent
architectures. This is indicated in brackets after each
individual package name and the optional version specification.
The brackets enclose a list of Debian architecture names
+ in the format described in [,
separated by whitespace. Exclamation marks may be prepended to
each of the names. (It is not permitted for some names to be
prepended with exclamation marks while others aren't.)
@@ -4694,7 +4698,8 @@ Build-Depends: foo [!i386] | bar [!amd64]
]
Relationships may also be restricted to a certain set of
- architectures using architecture wildcards. The syntax for
+ architectures using architecture wildcards in the format
+ described in [. The syntax for
declaring such restrictions is the same as declaring
restrictions using a certain set of architectures without
architecture wildcards. For example:
@@ -6332,12 +6337,11 @@ install -m644 debian/shlibs.package debian/package/DEBIAN/
For example, the emacsen-common package could
contain something like
-if [ ! -e /usr/local/share/emacs ]
-then
- if mkdir /usr/local/share/emacs 2>/dev/null
- then
- chown root:staff /usr/local/share/emacs
- chmod 2775 /usr/local/share/emacs
+if [ ! -e /usr/local/share/emacs ]; then
+ if mkdir /usr/local/share/emacs 2>/dev/null; then
+ if chown root:staff /usr/local/share/emacs; then
+ chmod 2775 /usr/local/share/emacs || true
+ fi
fi
fi
@@ -7494,9 +7498,8 @@ exec /usr/lib/foo/foo "$@"
package that provides online documentation (other than just
manual pages) to register these documents with
doc-base by installing a
- doc-base control file via the
- doc-base control file in
+ /usr/share/doc-base/.
]
Please refer to the documentation that comes with the
@@ -7915,11 +7918,23 @@ fname () {
Symbolic links
- In general, symbolic links within a top-level directory
- should be relative, and symbolic links pointing from one
- top-level directory into another should be absolute. (A
- top-level directory is a sub-directory of the root
- directory /.)
+ In general, symbolic links within a top-level directory should
+ be relative, and symbolic links pointing from one top-level
+ directory to or into another should be absolute. (A top-level
+ directory is a sub-directory of the root
+ directory /.) For example, a symbolic link
+ from /usr/lib/foo to /usr/share/bar
+ should be relative (../share/bar), but a symbolic
+ link from /var/run to /run should be
+ absolute.
+ This is necessary to allow top-level directories to be
+ symlinks. If linking /var/run
+ to /run were done with the relative symbolic
+ link ../run, but /var were a
+ symbolic link to /srv/disk1, the symbolic link
+ would point to /srv/run rather than the intended
+ target.
+
@@ -9742,9 +9757,8 @@ END-INFO-DIR-ENTRY
In addition, the copyright file must say where the upstream
- sources (if any) were obtained. It should name the original
- authors of the package and the Debian maintainer(s) who were
- involved with its creation.
+ sources (if any) were obtained, and should name the original
+ authors.
@@ -9763,8 +9777,8 @@ END-INFO-DIR-ENTRY
/usr/share/doc/package may be a symbolic
link to another directory in /usr/share/doc only if
the two packages both come from the same source and the
- first package Depends on the second. These rules are
- important because copyrights must be extractable by
+ first package Depends on the second. These rules are important
+ because copyright files must be extractable by
mechanical means.