From: Manoj Srivastava Date: Thu, 16 Jun 2005 09:21:27 +0000 (+0000) Subject: Synchronized with patch 146 from Manojs tree X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=4bdc4ba18156ab5ae8e14de5283c3a84f3668cb0;hp=3713844db296d1b05102f3354cf22b2774afe670;p=debian%2Fdebian-policy.git Synchronized with patch 146 from Manojs tree Synchronized with patch 146 from Manojs tree Patches applied: * srivasta@debian.org--etch/debian-policy--devel--3.0--patch-146 * Fix the debconf spec to (postinst -> postrm) closes git-archimport-id: debian-policy@lists.debian.org--etch/debian-policy--devel--3.0--patch-146 --- diff --git a/debconf_spec/debconf_specification.xml b/debconf_spec/debconf_specification.xml index df14a87..c1a0642 100644 --- a/debconf_spec/debconf_specification.xml +++ b/debconf_spec/debconf_specification.xml @@ -265,12 +265,16 @@ Description: domain for this computer section on templates. - The config-file contains a new element, which I call the configmodule. - This is a program that will determine the configuration before the - package is unpacked. This means it is run before - the preinst, and before the package is unpacked! This is done to make - sure that we can use the desired configuration in the preinst if - necessary. + The config-file contains a new element, which I call the + configmodule. This is a program that will determine the + configuration before the package is unpacked. This means it is + usually run before the preinst, and before + the package is unpacked! + + Plese see debconf-devel(8) for details. + + This is done to make sure that we can + use the desired configuration in the preinst if necessary. How does the configmodule get its information? The configmodule diff --git a/debian/changelog b/debian/changelog index 65c2f4c..aed40f3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,22 @@ debian-policy (3.5.7.1) unstable; urgency=low - * Fix the debconf spec to (postinst -> postrm) closes: Bug#129375 + * Fix the debconf spec to (postinst -> postrm) closes: Bug#129375, Bug#160839 * Fix update-rc.d example, mention that changing run-levels or priority may require removing and re-creating the symbolic links. closes: Bug#149709 - - -- + * Fix the groff and col -b interaction closes: Bug#164755 + * Added section numbers to upgrading checklist closes: Bug#160914 + * Fixed typo KB_Backspace -> KB_BackSpace + * Clarify wording in the section about ChangeLog files to allow for + symbolic links in /usr/share/doc/ directory (was already allowed in a + previous section of policy 13.6) closes: Bug#111137 + * Removed a spurious + from text. closes: Bug#160908 + * Added a note in the debconf spec to consult debconf-devel(8) for + details. closes: Bug#133030 + * Added a reference to the local copy of the FHS. closes: Bug#122928 + * Updated reference to ash (dash). This implements the non controversial + parts of Bug#161455. + + -- Manoj Srivastava Sat, 26 Oct 2002 13:12:49 -0500 debian-policy (3.5.7.0) unstable; urgency=low diff --git a/debian/control b/debian/control index ef44414..bda4d75 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: doc Priority: optional Maintainer: Debian Policy List Uploaders: Julian Gilbey , Manoj Srivastava -Standards-Version: ${debian-policy:Version} +Standards-Version: 3.5.7.1 Build-Depends-Indep: links, debiandoc-sgml (>= 1.1.47), sp, liburi-perl, libpaperg, tetex-bin, tetex-extra, latex2html, libi18n-langtags-perl, groff, bsdmainutils, pstoedit, tidy, jade, docbook-xml, docbook-utils Package: debian-policy diff --git a/debian/rules b/debian/rules index 4b1b31a..450b4a3 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 : Wed Sep 6 09:37:43 2000 +## Last Modified On : Sat Oct 26 12:29:03 2002 ## Last Machine Used: glaurung.green-gryphon.com -## Update Count : 56 +## Update Count : 58 ## Status : Unknown, Use with caution! ## HISTORY : ## Description : @@ -110,7 +110,7 @@ stamp-build: cd fhs && patch -p1 < ../mm1.32-patch; \ fi # The extra '.' in the tmac path won't harm if unnecessary - GROFF_TMAC_PATH=. cd fhs && $(MAKE) fhs.ps fhs.pdf fhs.txt + GROFF_TMAC_PATH=. GROFF_NO_SGR=1 $(MAKE) -C fhs fhs.ps fhs.pdf fhs.txt links -dump fhs-changes-2.1.html | perl -pe 's/[\r\0]//g' > \ fhs/fhs-changes-2.1.txt links -dump upgrading-checklist.html | perl -pe 's/[\r\0]//g' > \ diff --git a/policy.sgml b/policy.sgml index ff60513..e309097 100644 --- a/policy.sgml +++ b/policy.sgml @@ -4228,7 +4228,11 @@ libbar 1 bar1 (>= 1.0-1) referred here can be found in the debian-policy package or on alongside this manual. The + name="FHS (Debian copy)"> alongside this manual (or, if + you have the debian-policy installed, + you can try ). The latest version, which may be a more recent version, may be found on . @@ -5327,7 +5331,7 @@ Reloading description configuration...done.

-

<-- generates KB_Backspace +

<-- generates KB_BackSpace in X.

Delete generates KB_Delete in @@ -5549,7 +5553,7 @@ install -s # (or use strip on the files in debian/tmp)

This string means that the debugging symbols should not be stripped from the binary during installation, - so that debugging information may be included in the + package. + so that debugging information may be included in the package.

@@ -5880,8 +5884,9 @@ strip --strip-unneeded your-lib

You may wish to restrict your script to POSIX features when possible so that it may use /bin/sh as its - interpreter. If your script works with ash, - it's probably POSIX compliant, but if you are in doubt, use + interpreter. If your script works with dash + (originally called ash), it's probably POSIX + compliant, but if you are in doubt, use /bin/bash.

@@ -7758,6 +7763,14 @@ install-info --quiet --remove /usr/share/info/foobar.info

+

+ /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. +

+ +

All of these files should be installed compressed using gzip -9, as they will become large with time even diff --git a/upgrading-checklist.html b/upgrading-checklist.html index 2b57d33..44de3fc 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 Aug 31 02:02:54 2002 + Last Modified On : Sat Oct 26 12:22:40 2002 Last Machine Used: glaurung.green-gryphon.com - Update Count : 28 + Update Count : 29 Status : Unknown, Use with caution! HISTORY : Description : @@ -56,27 +56,27 @@ picking your way through this list. 3.5.7.0 Aug 02 - Packages no longer have to ask permission to call MAKEDEV in - postinst, merely notifying the user ought to be enough. + postinst, merely notifying the user ought to be enough. [11.6] - cryptographic software may now be included in the main - archive. + archive. [2.1.5] - task packages are now not permitted; tasks are now created by a - special Tasks: field in the control file. + special Tasks: field in the control file. [2.3.8] - window managers that support netwm now can added 20 points when they add themselves as an alternative for - /usr/bin/x-window-manager + /usr/bin/x-window-manager [12.8.4] - There are new rules for build-indep/build-arch targets and there is a new Build-Depend-Indep semantic. These were actually - introduced in 3.5.6, but I forgot to mention them here. + introduced in 3.5.6, but I forgot to mention them here. [7] - The default compilation options have now changed, one should provide debugging symbols in all cases, and optionally step back optimization to -O0, depending on the DEB_BUILD_OPTIONS - environment variable. + environment variable. [11.1] - Added mention of build-arch, build-indep, etc, in describing the relationships with `Build-Depends', `Build-Conflicts', `Build-Depends-Indep', and `Build-Conflicts-Indep'. May need to - review the new rules. + review the new rules. [7.6, 5.2] - Changed rules on how, and when, to invoke ldconfig in maintiner - scripts. Long rationale. + scripts. Long rationale. [9] 3.5.6.0 Jul 01