Merge branch 'next'

6 files changed, 101 insertions, 10 deletions

diff --git a/copyright-format-1.0.xml b/copyright-format-1.0.xml
index 0423202..b8df359 100644
--- a/copyright-format-1.0.xml
+++ b/copyright-format-1.0.xml
@@ -659,6 +659,17 @@ Copyright 2009, 2010 Angela Watts</programlisting>
         Exclusions are only supported by adding <varname>Files</varname>
         paragraphs to override the previous match.
       </para>
+      <para>
+        This syntax does not distinguish file names from directory
+        names; a trailing slash in a pattern will never match any
+        actual path. A whole directory tree may be selected with a
+        pattern like "foo/*".
+      </para>
+      <para>
+        The space character, used to separate patterns, cannot be
+        escaped with a backslash. A path like "foo bar" may be
+        selected with a pattern like "foo?bar".
+      </para>
     </section>
 
   </section>
diff --git a/debian/changelog b/debian/changelog
index daff1ad..a3d352a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,30 @@
+debian-policy (4.4.1.0) UNRELEASED; urgency=medium
+
+  * Policy: Only one Vcs-<type> field is permitted
+    Wording: Russ Allbery <rra@debian.org>
+    Seconded: Sean Whitton <spwhitton@spwhitton.name>
+    Seconded: Guillem Jover <guillem@debian.org>
+    Closes: #931975
+  * Policy: Document /run/reboot-required mechanism
+    Wording: Karl O. Pinc <kop@meme.com>
+    Seconded: Sean Whitton <spwhitton@spwhitton.name>
+    Seconded: Holger Levsen <holger@layer-acht.org>
+    Seconded: Russ Allbery <rra@debian.org>
+    Seconded: Simon McVittie <smcv@debian.org>
+    Closes: #919507
+  * Policy: doc-base now optional, not recommended
+    Wording: Sean Whitton <spwhitton@spwhitton.name>
+    Seconded: Russ Allbery <rra@debian.org>
+    Seconded: Ansgar Burchardt <ansgar@debian.org>
+    Closes: #910783
+  * Copyright format: state syntactical restrictions on Files: field
+    Wording: Nicolas Boulenguez <nicolas@debian.org>
+    Seconded: Sean Whitton <spwhitton@spwhitton.name>
+    Seconded: Russ Allbery <rra@debian.org>
+    Closes: #688481
+
+ -- Sean Whitton <spwhitton@spwhitton.name>  Mon, 15 Jul 2019 19:02:20 +0100
+
 debian-policy (4.4.0.1) unstable; urgency=medium
 
   * Rebuild against newer libjs-sphinxdoc (Closes: #932359).
diff --git a/policy/ch-controlfields.rst b/policy/ch-controlfields.rst
index fb2b6e5..60edc82 100644
--- a/policy/ch-controlfields.rst
+++ b/policy/ch-controlfields.rst
@@ -979,8 +979,11 @@ repository where the Debian source package is developed.
     or ``hg clone`` command. If no branch is specified, the packaging
     should be on the default branch.
 
-    More than one ``Vcs-<type>`` field may be specified for the same
-    package, but only if the <type> parameters are all unique.
+    A package control file must not have more than one ``Vcs-<type>``
+    field.  If the package is maintained in multple version control
+    systems, the maintainer should specify the one that they would
+    prefer other people to use as the basis for proposing changes to
+    the package.
 
 For both fields, any URLs given should use a scheme that provides
 confidentiality (``https``, for example, rather than ``http`` or ``git``)
diff --git a/policy/ch-customized-programs.rst b/policy/ch-customized-programs.rst
index 529aa66..dbba4fc 100644
--- a/policy/ch-customized-programs.rst
+++ b/policy/ch-customized-programs.rst
@@ -151,9 +151,8 @@ web servers and web applications in the Debian system.
 
    Web Applications should try to avoid storing files in the Web
    Document Root. Instead they should use the /usr/share/doc/package
-   directory for documents and register the Web Application via the
-   doc-base package. If access to the web document root is unavoidable
-   then use
+   directory for documents. If access to the web document root is
+   unavoidable then use
 
    ::
 
diff --git a/policy/ch-opersys.rst b/policy/ch-opersys.rst
index 6e0c020..3e685cf 100644
--- a/policy/ch-opersys.rst
+++ b/policy/ch-opersys.rst
@@ -976,11 +976,11 @@ Here is an example of a wrapper script for this purpose:
 Registering Documents using doc-base
 ------------------------------------
 
-The doc-base package implements a flexible mechanism for handling and
-presenting documentation. The recommended practice is for every Debian
-package that provides online documentation (other than just manual
-pages) to register these documents with doc-base by installing a
-doc-base control file in ``/usr/share/doc-base/``.
+The doc-base package implements a mechanism for handling and
+presenting documentation. Debian packages that provides online
+documentation (other than just manual pages) may register these
+documents with doc-base by installing a doc-base control file in
+``/usr/share/doc-base/``.
 
 Please refer to the documentation that comes with the doc-base package
 for information and details.
@@ -1040,3 +1040,33 @@ Debian, so this section has been removed.
    activate the trigger. In that case, it can be done by calling
    ``dpkg-trigger --no-await /usr/lib/mime/packages`` from the
    maintainer script after creating, modifying, or removing the file.
+
+.. index::
+   pair: signaling; reboot
+
+.. _s-signalingreboot
+
+Signaling that a reboot is required
+-----------------------------------
+
+.. index::
+   single: reboot-required
+   single: reboot-required.pkgs
+
+Programs can signal that a reboot is required by ``touch``\ing
+``/run/reboot-required``.  It is conventional to add the name of the
+package(s) requiring the reboot to
+``/run/reboot-required.pkgs``. Programs should not add a package name
+to ``/run/reboot-required.pkgs`` if it is already present there.
+
+.. index:
+   single: postinst
+
+The ``/run/reboot-required`` mechanism is used when a reboot is
+needed to fully apply the changes introduced by package
+installation or upgrade.  Typically it is the ``postinst``
+maintainer script that touches ``/run/reboot-required``, at the end
+of a successful configuration of the package.
+
+There are no guarantees provided by the ``/run/reboot-required``
+convention as to when or whether the requested reboot will occur.
diff --git a/policy/upgrading-checklist.rst b/policy/upgrading-checklist.rst
index ccbe06c..ddf9ec4 100644
--- a/policy/upgrading-checklist.rst
+++ b/policy/upgrading-checklist.rst
@@ -39,6 +39,27 @@ The sections in this checklist match the values for the
 except in the two anomalous historical cases where normative
 requirements were changed in a minor patch release.
 
+Version 4.4.1
+-------------
+
+Unreleased.
+
+5.6.26
+    A package control file must not have more than one ``Vcs-<type>``
+    field.
+
+    If the package is maintained in multple version control systems,
+    the maintainer should specify the one that they would prefer other
+    people to use as the basis for proposing changes to the package.
+
+9.10 & 11.5
+    doc-base registration is now optional, from being recommended.
+
+copyright-format
+    State some syntactical restrictions on the ``Files:`` field.
+    Wildcards are required to match the contents of directories, and
+    the space character separates patterns and cannot be escaped.
+
 Version 4.4.0
 -------------