From c1433bb0213ccba1363e5fa2d1418e525a24c81f Mon Sep 17 00:00:00 2001 From: Manoj Srivastava Date: Thu, 16 Jun 2005 05:07:52 +0000 Subject: [PATCH] * Added FHS details to copyright file Author: jdg Date: 2000/06/23 16:37:48 * Added FHS details to copyright file * Added wording for bug#22395: hard links to conffiles * Modified debian/rules to handle different versions of groff * Fixed bug#39398 (which actually received two seconds), with minor amendments * Removed versions 3.1.1.[23] from the changelog (merging the changelog info); these were never actually released git-archimport-id: srivasta@debian.org--etch/debian-policy--devel--3.0--patch-53 --- debian/changelog | 21 +++++++-------------- debian/copyright | 43 +++++++++++++++++++++++++++++++++++++++---- debian/rules | 12 ++++++++---- policy.sgml | 21 +++++++++++++++++++-- 4 files changed, 73 insertions(+), 24 deletions(-) diff --git a/debian/changelog b/debian/changelog index 7850a84..38afb7c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,12 @@ debian-policy (3.2.0.0) unstable; urgency=low * Fixed bugs in debian-policy package: + * [PROPOSAL] Do not make hardlinks to conffiles closes: Bug#22935 + * [OLD PROPOSAL] debian-policy has an unclear statement on dependancies + and priorities closes: Bug#39398 * [ACCEPTED 10/26/99] changelog.html.gz sanitization. closes: Bug#40934 * [AMENDED 07/09/1999] policy on -g, a proposal closes: Bug#43787 + * Correct typo in section 2.3.5 closes: Bug#52225 * [ACCEPTED 02/01/2000] policy for usage of "xserver" alternative closes: Bug#53755 * [ACCEPTED 02/01/2000] additions to virtual package @@ -38,26 +42,15 @@ debian-policy (3.2.0.0) unstable; urgency=low dpkg-gencontrol. closes: Bug#58771 . * Other changes: + * Fixed an upgrade bug when /usr/doc happens to be a symlink, and does + not point to /usr/share/doc. A couple of people were bitten by this. * Added policy-process to document current procedures. * Installed FHS version 2.1 * Policy recommends packaging manual and vice versa + * Added FHS details to copyright file -- -debian-policy (3.1.1.3) unstable; urgency=low - - * Fixed an upgrade bug when /usr/doc happens to be a symlink, and does - not point to /usr/share/doc. A couple of people were bitten by this. - - -- Manoj Srivastava Mon, 28 Feb 2000 22:27:05 -0600 - -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/copyright b/debian/copyright index 207e309..741d483 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,12 +1,16 @@ +This is the Debian package of Debian Policy Manual, the Filesystem +Hierarchy Standard, the Linux Filesystem Standard and related +documents. It was originally assembled by Christian Schwarz and is now +maintained by the Debian Policy Group +. -This is the Debian package of Debian Policy Manual, the Linux -Filesystem Standard and related documents. It was assembled by -Christian Schwarz . +The FHS and FSSTND documents were downloaded from +http://www.pathname.com/fhs/. ------------------------------------------------------------------------------ Copyright of the Debian Policy Manual: -Copyright ©1996 Ian Jackson. +Copyright (C) 1996 Ian Jackson. This manual is free software; you may redistribute it and/or modify it under the terms of the GNU General Public License as published by the @@ -25,6 +29,37 @@ Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ------------------------------------------------------------------------------ + +Copyright of the Filesystem Hierarchy Standard (FHS) + +Copyright (C) 1994-2000 Daniel Quinlan + +Permission is granted to make and distribute verbatim copies of this +standard provided the copyright and this permission notice are preserved +on all copies. + +[troff source includes the following paragraph: +Permission is granted to process this file through a typesetter (such as +troff) and print the results, provided the printed document carries a +permission notice identical to this one except for the removal of this +paragraph (this paragraph not being relevant to the printed document).] + +Permission is granted to copy and distribute modified versions of this +standard under the conditions for verbatim copying, provided also that +the title page is labeled as modified including a reference to the +original standard, provided that information on retrieving the original +standard is included, and provided that the entire resulting derived +work is distributed under the terms of a permission notice identical to +this one. + +Permission is granted to copy and distribute translations of this +standard into another language, under the above conditions for modified +versions, except that this permission notice may be stated in a +translation approved by the copyright holder. + + +------------------------------------------------------------------------------ + Copyright of the Linux Filesystem Standard (FSSTND). diff --git a/debian/rules b/debian/rules index 7b00902..e032c4a 100755 --- a/debian/rules +++ b/debian/rules @@ -83,10 +83,14 @@ stamp-build: gzip -9f $$file.text; \ done tar zfx $(FHS_ARCHIVE) - # Need to use a patched tmac.m macro file; can remove this - # bit once groff is fixed - cp /usr/share/groff/tmac/tmac.m fhs - cd fhs && patch -p1 < ../mm1.32-patch + # Need to use a patched tmac.m macro file if we're using a pre-1.16 + # groff; version 1.16 is apparently fixed + if [ dpkg --compare-versions \ + `dpkg -s groff | sed -n -e 's/Version: //p'` lt 1.16 ]; then \ + cp /usr/share/groff/tmac/tmac.m fhs && \ + cd fhs && patch -p1 < ../mm1.32-patch; \ + fi + # The extra '.' in the tmac path doesn't matter if GROFF_TMAC_PATH=. cd fhs && $(MAKE) all lynx -dump fhs-changes-2.1.html > fhs/fhs-changes-2.1.text lynx -dump upgrading-checklist.html > upgrading-checklist.text diff --git a/policy.sgml b/policy.sgml index cd08d49..e03f778 100644 --- a/policy.sgml +++ b/policy.sgml @@ -589,8 +589,9 @@

Packages may not depend on packages with lower priority - values (excluding build-time dependencies). If this does - happen, one of the priority values will have to be adapted. + values (excluding build-time dependencies). In order to + ensure this, the priorities of one or more packages may have + to be adjusted.

@@ -2559,6 +2560,21 @@ maintainer scripts during installation (or at any other time).

+

+ In order to ensure that local changes are preserved + correctly, no package may contain or make hard links to + conffiles. + +

+ Rationale: There are two problems with hard links. + The first is that some editors break the link while + editing one of the files, so that the two files may + unwittingly become different. The second is that + dpkg might break the hard link while + upgrading conffiles. +

+ +

The other way to do it is to via the maintainer scripts. In this case, the configuration file must not be listed as @@ -2600,6 +2616,7 @@ not be mixed, for that way lies madness: dpkg will ask about overwriting the file every time the package is upgraded.

+ -- 2.39.5