From: Manoj Srivastava Date: Thu, 16 Jun 2005 05:44:11 +0000 (+0000) Subject: A bug fixing non-normative release X-Git-Url: https://git.donarmstrong.com/?p=debian%2Fdebian-policy.git;a=commitdiff_plain;h=8005797abdddb3b4762ed13d88ef22bc15ad8c75 A bug fixing non-normative release Author: srivasta Date: 2004/06/25 21:11:36 A bug fixing non-normative release git-archimport-id: srivasta@debian.org--etch/debian-policy--devel--3.0--patch-267 --- diff --git a/debconf_spec/Makefile b/debconf_spec/Makefile index e44ac08..ba5c251 100644 --- a/debconf_spec/Makefile +++ b/debconf_spec/Makefile @@ -2,7 +2,7 @@ all: debconf_specification.txt.gz debconf_specification.html %.html: %.xml html.dsl jade -V nochunks -t sgml -d html.dsl \ - /usr/lib/sgml/declaration/xml.dcl $< > $@ + /usr/share/xml/declaration/xml.dcl $< > $@ -tidy -q -i -m -f /dev/null $@ %.txt: %.html diff --git a/debconf_spec/debconf_specification.xml b/debconf_spec/debconf_specification.xml index 6e38f7b..1690f76 100644 --- a/debconf_spec/debconf_specification.xml +++ b/debconf_spec/debconf_specification.xml @@ -280,7 +280,7 @@ Description: domain for this computer usually run before the preinst, and before the package is unpacked! - Please see debconf-devel(8) for details. + Please see debconf-devel(7) for details. This is done to make sure that we can use the desired configuration in the preinst if necessary. diff --git a/debian/changelog b/debian/changelog index 18e4386..7ff4598 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,22 +6,56 @@ debian-policy (3.6.1.1) unstable; urgency=low * Fix the outdated link for the mime subpolicy. closes: Bug#212153 * Fix a missing comma in the list of sections closes: Bug#215524 * Fix spelling of sysv-rc closes: Bug#215558 + * [AMENDMENT 28/03/2004] ${perl:Depends} documentation + incomplete. Added an informative foot note stating that dependencies + caused by versioned uses and on separately packaged modules are not + included in this variable and must be explicitly included. + closes: Bug#202054 + * Clarified that section 3.2.1 refers to the date based postion of the + version number, if not already clear from the context. This allows + developers leeway in selecting date based version numbers for their + packages, without loosing the advantages of the format specified in + this section. closes: Bug#248618 + * Bug fix: "Broken link to virtual-package-names-list.txt in section + 3.6", thanks to Carlos O'Donell (Closes: #248786). + * Bug fix: "Broken link to debconf_specification.txt.gz in section + 3.10.1 of the Debian Policy manual.", thanks to Carlos O'Donell and + Scott C.MacCallum (Closes: #248788, 247761). + * Bug fix: "missing commas in subsections list", thanks to Filippo + Giunchedi (Closes: #236614). + * Bug fix: "debian-policy: policy-process, broken URL", thanks to Manoj + Srivastava (Closes: #244969). + * Bug fix: "bad reference to debconf-devel(8) has to be (7)", thanks to + Kevin Price (Closes: #247143). + * Bug fix: "debian-policy: Small wording change", thanks to Mike Paul + (Closes: #252392). + * Bug fix: "debian-policy: broken URL: CSH Programming Considered + Harmful", thanks to Steven Augart (Closes: #253324). + * Bug fix: "New virtual package: cron-daemon", thanks to Adam Byrtek + (Closes: #252086). Josip: - * Fixed detection of invoke-rc.d's existence, closes: #218530. + * Fixed detection of invoke-rc.d's existence, closes: #218530. * Generalized the dpkg-shlibdeps example and added a current example in a footnote, set proper section ids and linked the d-sd section better, - closes: #50565. + closes: #50565. * Clarified the section about the Architecture field and added footnotes - to indicate recommended actions, closes: #51832. - * Updated PGP references, closes: #68827. + to indicate recommended actions, closes: #51832. + * Updated PGP references, closes: #68827. * Linked f-Format in the list of fields of the .dsc file, not mandatory - according to my skimming of dpkg-source, closes: #70742. + according to my skimming of dpkg-source, closes: #70742. * Fixed the command line required to output the copyright file, - closes: #75508. + closes: #75508. * Removed the long obsolete notion of specific directory names within - source tarballs, closes: #79210. - - -- + source tarballs, closes: #79210. + Andi: + * sgml-dtd was moved, fix FTBFS. Closes: #241683 + * fix link to WM specification. Closes: #235484 + * manpage -> man page. Closes: #232364, #238958 + * language adjustment. Closes: #227762 + * added virtual packages stardict-dictionary, inetd-superserver. + Closes: #185943, #237049 + + -- Manoj Srivastava Fri, 25 Jun 2004 16:07:38 -0500 debian-policy (3.6.1.0) unstable; urgency=low diff --git a/debian/control b/debian/control index 54d4294..78c341f 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Debian Policy List Uploaders: Julian Gilbey , Manoj Srivastava , Josip Rodin Standards-Version: 3.6.0 -Build-Depends-Indep: debiandoc-sgml (>= 1.1.47), tetex-extra, groff, bsdmainutils, pstoedit, jade, docbook-xml (>= 3.1.1), docbook-dsssl, tidy, links (>= 0.90) | links-ssl (>= 0.90) +Build-Depends-Indep: sgml-data (>= 2.0), debiandoc-sgml (>= 1.1.47), tetex-extra, groff, bsdmainutils, pstoedit, jade, docbook-xml (>= 3.1.1), docbook-dsssl, tidy, links (>= 0.90) | links-ssl (>= 0.90) Package: debian-policy Architecture: all diff --git a/perl-policy.sgml b/perl-policy.sgml index 9be4389..895bf0e 100644 --- a/perl-policy.sgml +++ b/perl-policy.sgml @@ -371,7 +371,12 @@ $(MAKE) install PREFIX=$(CURDIR)/debian/<tmp>/usr file, using a substitution such as ${perl:Depends} is suggested. This allows the dependencies to be determined as build time and written to the substvars file - in the form perl:Depends=deps. + in the form + perl:Depends=deps. +

Please note that dependencies caused by versioned + uses and on separately packaged modules are not included + in this variable and must be explicitly included.

+

Packages built with debhelper may use diff --git a/policy-process.sgml b/policy-process.sgml index 1f4d10a..352bf88 100644 --- a/policy-process.sgml +++ b/policy-process.sgml @@ -7,7 +7,7 @@ Manoj Srivastava srivasta@debian.org - $Revision: 1.5 $ + $Revision: 1.6 $ Copyright © 2000 by Manoj Srivastava. @@ -49,9 +49,7 @@

In the following, the term developer refers to registered Debian developers. -

-

A copy of this document should also be found at

+

Archives and Personnel diff --git a/policy.sgml b/policy.sgml index ee87ee8..733e1f0 100644 --- a/policy.sgml +++ b/policy.sgml @@ -693,7 +693,7 @@ libs, libdevel, mail, math, misc, net, news, non-US, non-free, oldlibs, - otherosfs, perl, python + otherosfs, perl, python, science, shells, sound, tex, text, utils, web, x11. @@ -856,11 +856,11 @@

To prevent having to use epochs for every new upstream - version, the version number should be changed to the - following format in such cases: "19960501", "19961224". It - is up to the maintainer whether he/she wants to bother the - upstream maintainer to change the version numbers upstream, - too. + version, the date based portion of the version number + should be changed to the following format in such cases: + "19960501", "19961224". It is up to the maintainer whether + he/she wants to bother the upstream maintainer to change + the version numbers upstream, too.

@@ -1079,10 +1079,7 @@ package names can be found in the debian-policy package. It is also available from the Debian web mirrors at - and from the Debian archive mirrors at - . + id="http://www.debian.org/doc/packaging-manuals/virtual-package-names-list.txt">.

@@ -1188,7 +1185,7 @@

The package installation scripts should avoid producing - output which it is unnecessary for the user to see and + output which is unnecessary for the user to see and should rely on dpkg to stave off boredom on the part of a user installing many packages. This means, amongst other things, using the --quiet option on @@ -1250,10 +1247,7 @@ debian-policy package. It is also available from the Debian web mirrors at - and from the Debian archive mirrors at - . + id="http://www.debian.org/doc/packaging-manuals/debconf_specification.html">.

@@ -1483,14 +1477,15 @@

- If you need to edit a Makefile where - GNU-style configure scripts are used, you - should edit the .in files rather than editing the + If you need to edit a Makefile where GNU-style + configure scripts are used, you should edit the + .in files rather than editing the Makefile directly. This allows the user to reconfigure the package if necessary. You should not configure the package and edit the generated - Makefile! This makes it impossible for - someone else to later reconfigure the package. + Makefile! This makes it impossible for someone + else to later reconfigure the package without losing the + changes you made.

@@ -1658,7 +1653,7 @@ contact the dpkg maintainer to have the parser script for it included in the dpkg package. (You will need to agree that the parser and its - manpage may be distributed under the GNU GPL, just as the rest + man page may be distributed under the GNU GPL, just as the rest of dpkg is.)

@@ -5572,7 +5567,7 @@ test -f program-executed-later-in-script || exit 0

For more information about using update-rc.d, - please consult its manpage .

@@ -5630,7 +5625,7 @@ test -f program-executed-later-in-script || exit 0

For more information about using - invoke-rc.d, please consult its manpage + invoke-rc.d, please consult its man page .

@@ -6041,10 +6036,7 @@ Reloading description configuration...done. files in the debian-policy package. It is also available from the Debian web mirrors at - and from the Debian archive mirrors at - . + id="http://www.debian.org/doc/packaging-manuals/menu-policy/">.

@@ -6083,10 +6075,7 @@ Reloading description configuration...done. files in the debian-policy package. It is also available from the Debian web mirrors at - and from the Debian archive mirrors at - . + id="http://www.debian.org/doc/packaging-manuals/mime-policy/">.

@@ -6603,7 +6592,7 @@ strip --strip-unneeded your-lib csh and tcsh should be avoided as scripting languages. See Csh Programming Considered Harmful, one of the comp.unix.* FAQs, which - can be found at . + can be found at . If an upstream package comes with csh scripts then you must make sure that they start with #!/bin/csh and make your package depend on the @@ -7718,7 +7707,7 @@ name ["syshostname"]: If the window manager complies with , written by the , add 40 points. @@ -8075,10 +8064,7 @@ name ["syshostname"]: files in the debian-policy package. It is also available from the Debian web mirrors at - and from the Debian archive mirrors at - . + id="http://www.debian.org/doc/packaging-manuals/perl-policy/">.

@@ -8175,7 +8161,7 @@ name ["syshostname"]: and should be reported to the Debian Bug Tracking System (the maintainer of the package is allowed to write this bug report themselves, if they so desire). Do not close the bug report - until a proper manpage is available. + until a proper man page is available. It is not very hard to write a man page. See the , @@ -8187,10 +8173,10 @@ name ["syshostname"]:

- You may forward a complaint about a missing manpage to the + You may forward a complaint about a missing man page to the upstream authors, and mark the bug as forwarded in the Debian bug tracking system. Even though the GNU Project do - not in general consider the lack of a manpage to be a bug, + not in general consider the lack of a man page to be a bug, we do; if they tell you that they don't consider it a bug you should leave the bug in our bug tracking system open anyway. @@ -8201,21 +8187,21 @@ name ["syshostname"]:

- If one manpage needs to be accessible via several names it + If one man page needs to be accessible via several names it is better to use a symbolic link than the .so feature, but there is no need to fiddle with the relevant parts of the upstream source to change from .so to symlinks: don't do it unless it's easy. You should not create hard links in the manual page directories, nor put absolute filenames in .so directives. The filename - in a .so in a manpage should be relative to the - base of the manpage tree (usually + in a .so in a man page should be relative to the + base of the man page tree (usually /usr/share/man). If you do not create any links (whether symlinks, hard links, or .so directives) - in the filesystem to the alternate names of the manpage, + in the filesystem to the alternate names of the man page, then you should not rely on man finding your - manpage under those names based solely on the information in - the manpage's header. + man page under those names based solely on the information in + the man page's header. Supporting this in man often requires unreasonable processing time to find a manual page or to report that none exists, and moves knowledge into man's @@ -8547,7 +8533,7 @@ install-info --quiet --remove /usr/share/info/foobar.info This manual does not go into detail about the options and usage of the package building and installation tools. It should therefore be read in conjuction with those programs' - manpages. + man pages.

@@ -8555,7 +8541,7 @@ install-info --quiet --remove /usr/share/info/foobar.info for managing various system configuration and similar issues, such as update-rc.d and install-info, are not described in detail here - - please see their manpages. + please see their man pages.

@@ -8593,7 +8579,7 @@ install-info --quiet --remove /usr/share/info/foobar.info In the future binary packages may also contain other components, such as checksums and digital signatures. The format for the archive is described in full in the - deb(5) manpage. + deb(5) man page.

@@ -8664,7 +8650,7 @@ install-info --quiet --remove /usr/share/info/foobar.info

- See the manpage for details of how + See the man page for details of how to examine the contents of this newly-created file. You may find the output of following commands enlightening: @@ -9939,7 +9925,7 @@ install-info --quiet --remove /usr/share/info/foobar.info

- See the manpage for details.

diff --git a/virtual-package-names-list.txt b/virtual-package-names-list.txt index f56b567..0c08d83 100644 --- a/virtual-package-names-list.txt +++ b/virtual-package-names-list.txt @@ -80,6 +80,7 @@ System other applications time-daemon anything that serves as a time daemon ups-monitor anything that is capable of controlling an UPS + cron-daemon anything that is capable of executing scheduled commands Documentation ------------- @@ -90,6 +91,7 @@ Documentation ispell-dictionary a dictionary for the ispell system myspell-dictionary a dictionary for the myspell system man-browser something that can read man pages + stardict-dictionary a dictionary for stardict wordlist a /usr/share/dict/words (*) www-browser something that can browse HTML files @@ -99,6 +101,7 @@ Network ftp-server a FTP server httpd a HTTP server ident-server an identd daemon + inetd-superserver an inetd server lambdamoo-core a lambdamoo-compatible database package lambdamoo-server anything running a moo using a lambdamoo-core radius-server a RADIUS server for acct/auth @@ -234,4 +237,11 @@ Manoj Srivastava: Added aspell-dictionary Added radius-server 9 Sep 2002 Added dict-server - 3 Aug 2003 Added myspell-dictionary \ No newline at end of file + 3 Aug 2003 Added myspell-dictionary + +Andreas Barth: + 25 Apr 2004 Added stardict-dictionary + Added inetd-superserver + +Manoj Srivastava: + 25 Jun 2004 Added cron-daemon