From 56d1349dd3bd455a8479bee468aa2320b2b5f830 Mon Sep 17 00:00:00 2001 From: Manoj Srivastava Date: Thu, 16 Jun 2005 05:06:57 +0000 Subject: [PATCH] * Correct missing in packaging.sgml (closes Author: jdg Date: 1999/12/20 20:43:36 * Correct missing in packaging.sgml (closes: #51091) * Correct typo in policy 2.3.5 (closes: #52225) * Removed old debian/postinst and debian/prerm files to avoid any confusion * Other miscellaneous cleanups (nothing of any substance) git-archimport-id: srivasta@debian.org--etch/debian-policy--devel--3.0--patch-42 --- debian/changelog | 7 ++++ debian/postinst | 89 ------------------------------------------------ debian/prerm | 76 ----------------------------------------- packaging.sgml | 75 +++++++++++++++------------------------- policy.sgml | 2 +- 5 files changed, 35 insertions(+), 214 deletions(-) delete mode 100644 debian/postinst delete mode 100644 debian/prerm diff --git a/debian/changelog b/debian/changelog index 49d9bfa..8029173 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +debian-policy (3.1.1.2) unstable; urgency=low + + * Correct missing in packaging.sgml (closes: #51091) + * Correct typo in policy 2.3.5 (closes: #52225) + + -- Julian Gilbey Mon, 20 Dec 1999 20:39:57 +0000 + debian-policy (3.1.1.1) unstable; urgency=low * Correction to typo in packaging manual, section 6.2. diff --git a/debian/postinst b/debian/postinst deleted file mode 100644 index a9455e8..0000000 --- a/debian/postinst +++ /dev/null @@ -1,89 +0,0 @@ -#!/bin/sh -# -*- Mode: Sh -*- -# postinst --- -# Author : Manoj Srivastava ( srivasta@tiamat.datasync.com ) -# Created On : Thu Oct 29 15:23:36 1998 -# Created On Node : tiamat.datasync.com -# Last Modified By : Manoj Srivastava -# Last Modified On : Thu Oct 29 15:28:24 1998 -# Last Machine Used: tiamat.datasync.com -# Update Count : 3 -# Status : Unknown, Use with caution! -# HISTORY : -# Description : -# -# - - -# Abort if any command returns an error value -set -e - - -# This script is called as the last step of the installation of the -# package. All the package's files are in place, dpkg has already done -# its automatic conffile handling, and all the packages we depend of -# are already fully installed and configured. - - -case "$1" in - configure) - # Configure this package. If the package must prompt the user for - # information, do it here. - : - - if [ -x /usr/sbin/install-docs ]; then - /usr/sbin/install-docs -i /usr/share/doc-base/debian-policy - fi - - # There are three sub-cases: - if test "${2+set}" != set; then - # We're being installed by an ancient dpkg which doesn't remember - # which version was most recently configured, or even whether - # there is a most recently configured version. - : - - elif test -z "$2" -o "$2" = ""; then - # The package has not ever been configured on this system, or was - # purged since it was last configured. - : - - else - # Version $2 is the most recently configured version of this - # package. - : - - fi ;; - abort-upgrade) - # Back out of an attempt to upgrade this package FROM THIS VERSION - # to version $2. Undo the effects of "prerm upgrade $2". - : - - ;; - abort-remove) - if test "$2" != in-favour; then - echo "$0: undocumented call to \`postinst $*'" 1>&2 - exit 0 - fi - # Back out of an attempt to remove this package, which was due to - # a conflict with package $3 (version $4). Undo the effects of - # "prerm remove in-favour $3 $4". - : - - ;; - abort-deconfigure) - if test "$2" != in-favour -o "$5" != removing; then - echo "$0: undocumented call to \`postinst $*'" 1>&2 - exit 0 - fi - # Back out of an attempt to deconfigure this package, which was - # due to package $6 (version $7) which we depend on being removed - # to make way for package $3 (version $4). Undo the effects of - # "prerm deconfigure in-favour $3 $4 removing $6 $7". - : - - ;; - *) echo "$0: didn't understand being called with \`$1'" 1>&2 - exit 0;; -esac - -exit 0 diff --git a/debian/prerm b/debian/prerm deleted file mode 100644 index 0777c5d..0000000 --- a/debian/prerm +++ /dev/null @@ -1,76 +0,0 @@ -#!/bin/sh -# -*- Mode: Sh -*- -# prerm --- -# Author : Manoj Srivastava ( srivasta@tiamat.datasync.com ) -# Created On : Thu Oct 29 15:31:03 1998 -# Created On Node : tiamat.datasync.com -# Last Modified By : Manoj Srivastava -# Last Modified On : Thu Oct 29 15:33:43 1998 -# Last Machine Used: tiamat.datasync.com -# Update Count : 1 -# Status : Unknown, Use with caution! -# HISTORY : -# Description : -# -# - -# Abort if any command returns an error value -set -e - -# This script is called as the first step in removing the package from -# the system. This includes cases where the user explicitly asked for -# the package to be removed, upgrade, automatic removal due to conflicts, -# and deconfiguration due to temporary removal of a depended-on package. - -case "$1" in - remove) - # This package about to be removed. - : - - # There are two sub-cases: - if test "${2+set}" = set; then - if test "$2" != in-favour; then - echo "$0: undocumented call to \`prerm $*'" 1>&2 - exit 0 - fi - # We are being removed because of a conflict with package $3 - # (version $4), which is now being installed. - : - - else - # The package is being removed in its own right. - : - - fi ;; - deconfigure) - if test "$2" != in-favour -o "$5" != removing; then - echo "$0: undocumented call to \`prerm $*'" 1>&2 - exit 0 - fi - # Package $6 (version $7) which we depend on is being removed due - # to a conflict with package $3 (version $4), and this package is - # being deconfigured until $6 can be reinstalled. - : - - ;; - upgrade) - # Prepare to upgrade FROM THIS VERSION of this package to version $2. - : - - ;; - failed-upgrade) - # Prepare to upgrade from version $2 of this package TO THIS VERSION. - # This is only used if the old version's prerm couldn't handle it, - # and returned non-zero. (Fix old prerm bugs here.) - : - - ;; - *) echo "$0: didn't understand being called with \`$1'" 1>&2 - exit 0;; -esac - -if [ -x /usr/sbin/install-docs ]; then - /usr/sbin/install-docs -r debian-policy -fi - -exit 0 diff --git a/packaging.sgml b/packaging.sgml index 00a4cb9..a788ee9 100644 --- a/packaging.sgml +++ b/packaging.sgml @@ -508,7 +508,8 @@

- + + Source packages @@ -2765,7 +2766,7 @@

If you need to compare version numbers in a script, you may use dpkg --compare-versions .... Type dpkg - --help --> --for details on arguments. + --help for details on arguments.

@@ -3145,7 +3146,7 @@

Part of the problem is due to what is arguably a - bug in dpkg . + bug in dpkg.

@@ -4170,7 +4171,7 @@ Relationships between source and binary packages - Build-Depends, Build-Depends-Indep, Build-Conflicts, Build-Conflicts-Indep - +

A source package may declare a dependency or a conflict on a @@ -4182,32 +4183,32 @@ when one of the targets in debian/rules that the particular field applies to is invoked. - - Build-Depends, Build-Conflicts - -

- The Build-Depends and Build-Conflicts fields apply - to the targets - build, binary, binary-arch - and binary-indep. -

- - Build-Depends-Indep, Build-Conflicts-Indep - -

- The Build-Depends-Indep and - Build-Conflicts-Indep fields apply to the - targets binary and binary-indep. -

- - + + Build-Depends, Build-Conflicts + +

+ The Build-Depends and + Build-Conflicts fields apply to the targets + build, binary, binary-arch + and binary-indep. +

+ + Build-Depends-Indep, Build-Conflicts-Indep + +

+ The Build-Depends-Indep and + Build-Conflicts-Indep fields apply to the + targets binary and binary-indep. +

+ + -

+

- + + - Configuration file handling @@ -5222,25 +5223,3 @@ - - - - - - - - - - - - - - - - - - - - - - diff --git a/policy.sgml b/policy.sgml index 3f75544..b156aec 100644 --- a/policy.sgml +++ b/policy.sgml @@ -706,7 +706,7 @@

Sometimes, there are several packages doing more-or-less the same job. In this case, it's useful to define a - virtual package who's name describes the function + virtual package whose name describes the function the packages have. (The virtual packages just exist logically, not physically--that's why they are called virtual.) The packages with this particular -- 2.39.5