Fix minor typos in appendix C in the sections on dpkg-shlibdeps and
dpkg-architecture.  Also remove the note that future versions of
dpkg-shlibdeps will be called on shared libraries as well and just
say that it acts on both executables and shared libraries.

Thanks to Sandro Tosi <matrixhasu@gmail.com> for the corrections.
Closes: #481954

Remove the reference to the fixed tag and describe NMU and regular
package uploads the same.  Both close the bug using the version of
the changelog entry.

Thanks to Sandro Tosi for the report.  Closes: #481640

No longer require packages providing files in /etc/X11/Xresources to
conflict with an ancient version of xbase which is no longer even in
oldstable.

Drop the explicit prohibition on /usr/X11R6/lib/X11/app-defaults,
which is no longer used by Debian at all and already covered by the
rest of the paragraph.

Remove old ChangeLog files.  They haven't been updated and the VCS now
records more and better history.  Remove headers from debian/postinst.in,
debian/prerm.in, and debian/rules as now redundant with the VCS metadata.

Document that an empty Debian revision is equivalent to a Debian
revision of 0 and clarify the way version numbers are compared.  Thanks
to Raphael Hertzog for information about what dpkg does.

Combine the discussion of run-time support files for shared libraries
in a renamed section.  Be explicit that shared library packages may not
contain any file whose name does not change when the soname changes,
and be clearer about when files should be put into versioned directories
in the shared library package and when files should go into a separate
package.  Files useful only when compiling against the library should
go into the -devel package (and other run-time support programs should
not).

Suggest -tools instead of -runtime for the package containing support
files or binaries built against a library and usable by any version of
the library.  Thanks, Raphael Hertzog.

body.tmp, head.tmp, and policy.tpt are now generated by the build
process and should be removed.

Underscores are already widely used in debconf template names, even though
not allowed by the specification, and both debconf and cdebconf permit
them.  Patch from Colin Watson.  (Bug#473761)

As of dpkg 1.14.3, source variable substitutions are now documented in
deb-substvars(5) rather than dpkg-source(1).  Update the reference in
Policy.  Patch from Ian Beckwith.

Patches applied:

 * rra@debian.org--lenny/debian-policy--breaks--3.7--base-0
   tag of rra@debian.org--lenny/debian-policy--devel--3.7--patch-27

 * rra@debian.org--lenny/debian-policy--breaks--3.7--patch-1
   New Breaks dependency field

 * rra@debian.org--lenny/debian-policy--convenience--3.7--base-0
   tag of rra@debian.org--lenny/debian-policy--devel--3.7--patch-27

 * rra@debian.org--lenny/debian-policy--convenience--3.7--patch-1
   Debian packages should not use convenience libraries

 * rra@debian.org--lenny/debian-policy--devel--3.7--patch-25
   Mention apt and aptitude as examples of dpkg frontends

 * rra@debian.org--lenny/debian-policy--devel--3.7--patch-26
   Fix capitalization of Idempotency in heading

 * rra@debian.org--lenny/debian-policy--devel--3.7--patch-27
   Mention apt-get, not apt, and fix typo

 * rra@debian.org--lenny/debian-policy--devel--3.7--patch-28
   Support for wrapped Uploaders is mandatory, clarify wrapping

 * rra@debian.org--lenny/debian-policy--devel--3.7--patch-29
   FHS and FSSTND build and copyright cleanup

 * rra@debian.org--lenny/debian-policy--devel--3.7--patch-30
   Add Emacs indent-tab-mode setting

 * rra@debian.org--lenny/debian-policy--devel--3.7--patch-31
   Standardize manual page encoding

 * rra@debian.org--lenny/debian-policy--devel--3.7--patch-32
   Debian packages should not use convenience libraries

 * rra@debian.org--lenny/debian-policy--devel--3.7--patch-33
   New Breaks dependency field

 * rra@debian.org--lenny/debian-policy--devel--3.7--patch-34
   Add Homepage control field

 * rra@debian.org--lenny/debian-policy--devel--3.7--patch-35
   Update section list and base system definition

 * rra@debian.org--lenny/debian-policy--devel--3.7--patch-36
   Add Apache 2.0 to common-licenses

 * rra@debian.org--lenny/debian-policy--devel--3.7--patch-37
   non-free and contrib packages should explain in copyright

 * rra@debian.org--lenny/debian-policy--devel--3.7--patch-38
   Standardize heading spacing in upgrading-checklist

 * rra@debian.org--lenny/debian-policy--devel--3.7--patch-39
   Add md5sums control file

 * rra@debian.org--lenny/debian-policy--devel--3.7--patch-40
   Add parallel=n and move DEB_BUILD_OPTS section

 * rra@debian.org--lenny/debian-policy--devel--3.7--patch-41
   Add README.source and the patch target

 * rra@debian.org--lenny/debian-policy--devel--3.7--patch-42
   Clarify mandatory config files in /etc

 * rra@debian.org--lenny/debian-policy--homepage--3.7--patch-2
   tag of rra@debian.org--lenny/debian-policy--devel--3.7--patch-27

 * rra@debian.org--lenny/debian-policy--homepage--3.7--patch-3
   Add Homepage control field

 * rra@debian.org--lenny/debian-policy--homepage--3.7--patch-4
   Homepage isn't allowed in binary source stanzas

 * rra@debian.org--lenny/debian-policy--homepage--3.7--patch-5
   Homepage is allowed in binary stazas

 * rra@debian.org--lenny/debian-policy--non-free--3.7--base-0
   tag of rra@debian.org--lenny/debian-policy--devel--3.7--patch-29

 * rra@debian.org--lenny/debian-policy--non-free--3.7--patch-1
   non-free and contrib packages should explain in copyright

 * rra@debian.org--lenny/debian-policy--non-free--3.7--patch-2
   Retabify change

 * rra@debian.org--lenny/debian-policy--parallel--3.7--base-0
   tag of rra@debian.org--lenny/debian-policy--devel--3.7--patch-27

 * rra@debian.org--lenny/debian-policy--parallel--3.7--patch-1
   Add parallel=n and move DEB_BUILD_OPTS section

 * rra@debian.org--lenny/debian-policy--parallel--3.7--patch-2
   DEB_BUILD_OPTIONS must start with a lowercase letter

 * rra@debian.org--lenny/debian-policy--readme-source--3.7--base-0
   tag of rra@debian.org--lenny/debian-policy--devel--3.7--patch-30

 * rra@debian.org--lenny/debian-policy--readme-source--3.7--patch-1
   Add README.source and the patched target

 * rra@debian.org--lenny/debian-policy--readme-source--3.7--patch-2
   Fix missing > in README.source change

 * rra@debian.org--lenny/debian-policy--readme-source--3.7--patch-3
   Change patch target, allow external docs

 * rra@debian.org--lenny/debian-policy--sections--3.7--base-0
   tag of rra@debian.org--lenny/debian-policy--devel--3.7--patch-27

 * rra@debian.org--lenny/debian-policy--sections--3.7--patch-1
   Update section list and base system definition


git-archimport-id: debian-policy@lists.debian.org--lenny/debian-policy--devel--3.7--patch-4

Add the /etc/cron.hourly directory to the list of cron directories.
/etc/cron.* files now must be configuration files (upgraded from
should).  Mention the various scripts that must be configuration files
in the section about configuration files.  Thanks, Frank Küster.
Closes #403391.

git-archimport-id: rra@debian.org--lenny/debian-policy--devel--3.7--patch-42

Specifies the debian/README.source file to document any package that
uses a source or package management system or that has a complex source
layout or build system.  Specifies and recommends the patch target
for putting a source package into an editable state.  Allowed referring
to external documentation in README.source if it's specific and not a
general manual.

git-archimport-id: rra@debian.org--lenny/debian-policy--devel--3.7--patch-41

Add the build option parallel=n, requesting a parallel build.  Standardize
the format of DEB_BUILD_OPTIONS, require tags be whitespace-separated,
allow packages to assume non-conflicting tags, and require unknown flags
be ignored.  Move the section documenting DEB_BUILD_OPTS under the
debian/rules section and away from the binaries section, leaving a
cross-reference behind.  Thanks to Loïc Minier, Peter Samuelson,
Robert Millan, and Guillem Jover for wording suggestions.

git-archimport-id: rra@debian.org--lenny/debian-policy--devel--3.7--patch-40

Add an md5sums control file to the debian-policy package.

git-archimport-id: rra@debian.org--lenny/debian-policy--devel--3.7--patch-39

Standardize on one blank line before and after each heading in
upgrading-checklist.

git-archimport-id: rra@debian.org--lenny/debian-policy--devel--3.7--patch-38

Packages in the non-free and contrib categories should state in their
copyright files that the package is not part of the Debian GNU/Linux
distribution and briefly explain why.

git-archimport-id: rra@debian.org--lenny/debian-policy--devel--3.7--patch-37

Add Apache 2.0 to the list of licenses that are in common-licenses and
should be referenced rather than included in debian/copyright.

git-archimport-id: rra@debian.org--lenny/debian-policy--devel--3.7--patch-36

Remove the base section; it's no longer used.  Remove contrib and
non-free sections which probably predate the category/section convention.
Revise the definition of the base system to use priorities instead.
Thanks to Colin Watson for verification and wording suggestions.
Closes #442070.

git-archimport-id: rra@debian.org--lenny/debian-policy--devel--3.7--patch-35

Add a specification for the optional Homepage control field.
Closes #452105.

git-archimport-id: rra@debian.org--lenny/debian-policy--devel--3.7--patch-34

Documents the new Breaks field supported by dpkg.  This is Ian Jackson's
patch with minor formatting changes and an added note that Breaks should
not be used until Debian stable supports it.  Recommend Breaks instead
of versioned Conflicts once Debian stable supports it.

Remove the paragraph about suidmanager in dpkg-statoverride entirely
since that package no longer exists even in oldstable.

Closes #379150.

git-archimport-id: rra@debian.org--lenny/debian-policy--devel--3.7--patch-33

Document that Debian packages should not use convenience copies of
libraries and instead link to the library that's already present in
Debian.  Thanks to Neil McGovern, Bill Allombert, Kurt Roeckx,
Steve Langasek, Colin Watson, and others for wording suggestions.
Closes #392362.

git-archimport-id: rra@debian.org--lenny/debian-policy--devel--3.7--patch-32

Standardize manual page encoding to either the legacy encoding for a
locale or UTF-8.  Country names should not be included in locale-specific
directory names unless there is a significant difference in language.
Characters in the manual page must be representable in the legacy encoding
for now.

Patch from Colin Watson.  Closes #440420.

git-archimport-id: rra@debian.org--lenny/debian-policy--devel--3.7--patch-31

Set indent-tab-mode to t as a local variable for *.sgml files for
consistency with the existing formatting even if a user overrides the
Emacs default and disables use of tabs.

git-archimport-id: rra@debian.org--lenny/debian-policy--devel--3.7--patch-30

Remove the remaining (mostly commented-out) build rules for FHS 2.1 and
FSSTND.  Remove the groff patch needed for building some versions of
FHS 2.1 ourselves.

Remove the (non-free) FSSTND license from debian/copyright since no
FSSTND files are still part of Policy.  FHS replaced it.

Update the copyright years for FHS in debian/copyright.

git-archimport-id: rra@debian.org--lenny/debian-policy--devel--3.7--patch-29

Support for wrapping Uploaders in debian/control is now mandatory since
the stable dpkg supports it.

Clarify that all relationship fields may be wrapped and provide a
suggestion for where to wrap them.

git-archimport-id: rra@debian.org--lenny/debian-policy--devel--3.7--patch-28

Mention apt-get as an example front-end to dpkg rather than aptitude and
spell aptitude correctly.  Thanks to Colin Watson for the catch.

git-archimport-id: rra@debian.org--lenny/debian-policy--devel--3.7--patch-27

Make Idempotency lowercase, matching other headings.  This was the only
remaining uncontroversial wording change in the original bug report
that had not already been made.

git-archimport-id: rra@debian.org--lenny/debian-policy--devel--3.7--patch-26

The discussion of binary dependency fields said that fields other than
Depends were only used by dpkg frontends such as dselect.  List apt and
aptitude before dselect as they're more often used these days.

git-archimport-id: rra@debian.org--lenny/debian-policy--devel--3.7--patch-25

Merge changes from rra@debian.org--lenny/debian-policy--devel--3.7
(at http://archives.eyrie.org/software/arch/).

git-archimport-id: debian-policy@lists.debian.org--lenny/debian-policy--devel--3.7--patch-3

Finalize the 3.7.3.0 date in upgrading-checklist.

git-archimport-id: rra@debian.org--lenny/debian-policy--devel--3.7--patch-24

docbook-xml is not one of the supported format types in the doc-base
specification and all stanzas are supposed to be for a supported
format.  Drop this stanza (and thereby also fix a lintian warning).

git-archimport-id: rra@debian.org--lenny/debian-policy--devel--3.7--patch-23