From: Manoj Srivastava Date: Thu, 16 Jun 2005 05:37:57 +0000 (+0000) Subject: Josip X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=54bb79b70259904d51b7190fd0dcab7a28ca6b81;p=debian%2Fdebian-policy.git Josip Author: srivasta Date: 2003/03/07 18:38:55 Josip: * Added missing bits of information about Description: fields from the old Packaging manual, closes: #172022 * Fixed a stale reference to the "base system maintainer" to base-passwd maintainer, closes: #174927 * Fixed an accidental change from /usr/share/package to /usr/share/doc in the paragraph about not depending on /usr/share/doc/package, closes: #174048 * Fixed several errors reported by Guenther Palfinger, with some help from Richard Braakman, closes: #177205, #177206, #177207, #177208, #177209 * Added versions to links and docbook-xml source-dependencies, hopefully fixes the bug with potato, and even if it doesn't, I don't care :) closes: #103459 * Fixed typos in the debconf spec noticed by Jay Bonci, closes: #178455 * Clarified that using Build-Depends for build-dependencies is not a "may" but a "should", added proper linking among various sections dealing with the dependencies so that there is no confusion, closes: #87510 If any one of those poor, misguided people ;) still thinks that the requirement should be a "must" (in _our_ meaning, not RFC "MUST"), please file a new bug, as it's quite unproductive to have to sift through a 152-page bug log which mostly goes back-and-forth with explanations how policy should work, occasionally sprinkled with offtopic stuff, too. * When asked to restart a service that isn't already running, the init script should start it, closes: #60979 * Rephrased section on configuration files to remove confusing use of "should", closes: #170019 * Rearranged the shared library information properly, closes: #109166 This change also centralizes the info on how to ship static libraries in one place (hopefully not too ambiguous), closes: #93975 * Allow examples to be placed in /usr/share/doc/package/ in packages that are meant to provide examples, closes: #69864 * Removed several references to the Policy manual etc in the stuff imported from old packaging manual, closes: #181923 * Fixed too greedy wildcard match in the logrotate example, closes: #183544 git-archimport-id: srivasta@debian.org--etch/debian-policy--devel--3.0--patch-197 --- diff --git a/debian/changelog b/debian/changelog index 18b99d2..4e5b3ed 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,21 +2,21 @@ debian-policy (3.5.9.0) unstable; urgency=low Josip: * Added missing bits of information about Description: fields from - the old Packaging manual, closes: #172022. + the old Packaging manual, closes: #172022 * Fixed a stale reference to the "base system maintainer" to - base-passwd maintainer, closes: #174927. + base-passwd maintainer, closes: #174927 * Fixed an accidental change from /usr/share/package to /usr/share/doc in the paragraph about not depending on /usr/share/doc/package, - closes: #174048. + closes: #174048 * Fixed several errors reported by Guenther Palfinger, with some help from - Richard Braakman, closes: #177205, #177206, #177207, #177208, #177209. + Richard Braakman, closes: #177205, #177206, #177207, #177208, #177209 * Added versions to links and docbook-xml source-dependencies, hopefully fixes the bug with potato, and even if it doesn't, I don't care :) - closes #103459. - * Fixed typos in the debconf spec noticed by Jay Bonci, closes: #178455. + closes: #103459 + * Fixed typos in the debconf spec noticed by Jay Bonci, closes: #178455 * Clarified that using Build-Depends for build-dependencies is not a "may" but a "should", added proper linking among various sections dealing with - the dependencies so that there is no confusion, closes: #87510. + the dependencies so that there is no confusion, closes: #87510 If any one of those poor, misguided people ;) still thinks that the requirement should be a "must" (in _our_ meaning, not RFC "MUST"), please file a new bug, as it's quite unproductive to have to sift @@ -24,20 +24,20 @@ debian-policy (3.5.9.0) unstable; urgency=low explanations how policy should work, occasionally sprinkled with offtopic stuff, too. * When asked to restart a service that isn't already running, the init - script should start it, closes: #60979. + script should start it, closes: #60979 * Rephrased section on configuration files to remove confusing use of - "should", closes: #170019. - * Rearranged the shared library information properly, closes: #109166. + "should", closes: #170019 + * Rearranged the shared library information properly, closes: #109166 This change also centralizes the info on how to ship static libraries - in one place (hopefully not too ambiguous), closes: #93975. + in one place (hopefully not too ambiguous), closes: #93975 * Allow examples to be placed in /usr/share/doc/package/ in packages - that are meant to provide examples, closes: #69864. + that are meant to provide examples, closes: #69864 * Removed several references to the Policy manual etc in the stuff - imported from old packaging manual, closes: #181923. + imported from old packaging manual, closes: #181923 * Fixed too greedy wildcard match in the logrotate example, - closes: #183544. + closes: #183544 - -- + -- Manoj Srivastava Fri, 7 Mar 2003 12:35:16 -0600 debian-policy (3.5.8.0) unstable; urgency=low diff --git a/debian/control b/debian/control index 705e9cf..4c184c0 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Debian Policy List Uploaders: Julian Gilbey , Manoj Srivastava Standards-Version: 3.5.9 -Build-Depends-Indep: links (>= 0.90), debiandoc-sgml (>= 1.1.47), sp, liburi-perl, libpaperg, tetex-bin, tetex-extra, latex2html, libi18n-langtags-perl, groff, bsdmainutils, pstoedit, tidy, jade, docbook-xml (>= 3.1.1), docbook-utils +Build-Depends-Indep: links (>= 0.90) | links-ssl (>= 0.90), debiandoc-sgml (>= 1.1.47), sp, liburi-perl, libpaperg, tetex-bin, tetex-extra, latex2html, libi18n-langtags-perl, groff, bsdmainutils, pstoedit, tidy, jade, docbook-xml (>= 3.1.1), docbook-utils Package: debian-policy Architecture: all diff --git a/debian/postinst.in b/debian/postinst.in index 6b06453..9ae1234 100644 --- a/debian/postinst.in +++ b/debian/postinst.in @@ -5,9 +5,9 @@ # Created On : Thu Oct 29 15:23:36 1998 # Created On Node : tiamat.datasync.com # Last Modified By : Manoj Srivastava -# Last Modified On : Sat Oct 26 13:19:34 2002 +# Last Modified On : Fri Mar 7 13:32:56 2003 # Last Machine Used: glaurung.green-gryphon.com -# Update Count : 9 +# Update Count : 10 # Status : Unknown, Use with caution! # HISTORY : # Description : @@ -68,11 +68,7 @@ case "$1" in fi - # FSSTND compatible symlinks - if [ -d /usr/doc -a ! -e /usr/doc/$PACKAGE \ - -a -d /usr/share/doc/$PACKAGE ]; then - ln -sf ../share/doc/$PACKAGE /usr/doc/$PACKAGE - fi + ;; abort-upgrade) # Back out of an attempt to upgrade this package FROM THIS VERSION diff --git a/policy.sgml b/policy.sgml index ed837be..d05d204 100644 --- a/policy.sgml +++ b/policy.sgml @@ -1685,7 +1685,7 @@ Package: libc6

The version number format is: - [epoch:]upstream_version[-debian_revision] + [epoch:]upstream_version[-debian_revision]

diff --git a/upgrading-checklist.html b/upgrading-checklist.html index 3b10b4d..0600527 100644 --- a/upgrading-checklist.html +++ b/upgrading-checklist.html @@ -7,9 +7,9 @@ Created On : Thu Oct 29 20:54:48 1998 Created On Node : tiamat.datasync.com Last Modified By : Manoj Srivastava - Last Modified On : Sat Oct 26 12:22:40 2002 + Last Modified On : Fri Mar 7 12:37:18 2003 Last Machine Used: glaurung.green-gryphon.com - Update Count : 29 + Update Count : 30 Status : Unknown, Use with caution! HISTORY : Description : @@ -53,7 +53,7 @@ picking your way through this list.

The checklist

-3.5.9.0                    ??? ??
+3.5.9.0                    Mar 03
 
      - The section describing the Description: package field once again has
        full details of the long description format. [5.7.2]