From 3e811589a35564770136f2de957c3b343e0e1e9c Mon Sep 17 00:00:00 2001 From: Manoj Srivastava Date: Thu, 16 Jun 2005 05:07:59 +0000 Subject: [PATCH] Fixed a couple of typos, updated ChangeLog, added fileutils (>= 4.0) dependency Author: srivasta Date: 2000/07/11 17:14:58 Fixed a couple of typos, updated ChangeLog, added fileutils (>= 4.0) dependency git-archimport-id: srivasta@debian.org--etch/debian-policy--devel--3.0--patch-54 --- debian/changelog | 21 +++++++++++++++++---- debian/control | 2 ++ packaging.sgml | 2 +- policy.sgml | 5 +++-- 4 files changed, 23 insertions(+), 7 deletions(-) diff --git a/debian/changelog b/debian/changelog index 38afb7c..2f66cfe 100644 --- a/debian/changelog +++ b/debian/changelog @@ -27,7 +27,6 @@ debian-policy (3.2.0.0) unstable; urgency=low * Fixed the ftp location in the manuals. closes: Bug#56407 * Fixed missing urlname entity in the sgml docs (where was it defined before anyway?) closes: Bug#56692 - . * Fixed bugs in packaging-manual package: * We have had doc-base support for a while now. closes: Bug#15709 * packaging manual: Added additional clarification on dpkg @@ -40,17 +39,31 @@ debian-policy (3.2.0.0) unstable; urgency=low versions of dpkg. closes: Bug#53405 * Fixed typo where dpkg-genchanges was used instead of 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. + * Added a dependency on fileutiles >=4.0, since the package would fail + to install with older fileutils. * 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/control b/debian/control index 2b9cef2..3685310 100644 --- a/debian/control +++ b/debian/control @@ -9,6 +9,7 @@ Package: debian-policy Architecture: all Recommends: packaging-manual Suggests: doc-base +Depends: fileutils (>= 4.0) Conflicts: dpkg-dev (<< 1.4.0.9), doc-base (<< 0.6) Description: Debian Policy Manual and related documents This package contains: @@ -20,6 +21,7 @@ Description: Debian Policy Manual and related documents Package: packaging-manual Architecture: all +Depends: fileutils (>= 4.0) Recommends: debian-policy Suggests: doc-base, dpkg (>= 1.4.0.23) Description: Debian Packaging Manual diff --git a/packaging.sgml b/packaging.sgml index 6a4efd9..941ffde 100644 --- a/packaging.sgml +++ b/packaging.sgml @@ -3920,7 +3920,7 @@ which is causing the conflict, otherwise it will halt the installation of the new package with an error. This mechanism specifically doesn't work when the installed - package is tt>Essential, but the new package is not. + package is Essential, but the new package is not.

diff --git a/policy.sgml b/policy.sgml index e03f778..3238eb7 100644 --- a/policy.sgml +++ b/policy.sgml @@ -3317,8 +3317,9 @@ Type 1 fonts should be placed in - /usr/X11R6/lib/X11/fonts/Type1/. If font metric files are - available, they may be placed here as well. + /usr/X11R6/lib/X11/fonts/Type1/. If font + metric files are available, they may be placed here as + well. Subdirectories of /usr/X11R6/lib/X11/fonts/ -- 2.39.2