summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean Whitton <spwhitton@spwhitton.name>2019-07-16 17:48:06 +0100
committerSean Whitton <spwhitton@spwhitton.name>2019-07-16 17:48:06 +0100
commit72fd3a57c0e74f5f22245df8680ace66af57efb2 (patch)
tree11f7d038f9d7ae01832aa1f11a3c636ac85ee909
parentbbd0b23bb5dedba4bb0f9d87386f580f7a52d58d (diff)
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
-rw-r--r--debian/changelog10
-rw-r--r--policy/ch-controlfields.rst7
-rw-r--r--policy/upgrading-checklist.rst14
3 files changed, 25 insertions, 6 deletions
diff --git a/debian/changelog b/debian/changelog
index b3839a8..f6c2d15 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
-debian-policy (4.4.0.1) UNRELEASED; urgency=medium
+debian-policy (4.4.1.0) UNRELEASED; urgency=medium
- * Clarify using more than one VCS-* field.
- Thanks to Guillem Jover for reporting the problem and Russ Allbery for
- the patch.
+ * 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
-- Sean Whitton <spwhitton@spwhitton.name> Mon, 15 Jul 2019 19:02:20 +0100
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/upgrading-checklist.rst b/policy/upgrading-checklist.rst
index ccbe06c..d19450b 100644
--- a/policy/upgrading-checklist.rst
+++ b/policy/upgrading-checklist.rst
@@ -39,6 +39,20 @@ 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.
+
+
Version 4.4.0
-------------