Deduplicate release related BTS tags and their descriptions

CVS version numbers

english/Bugs/Developer.wml: 1.97 -> 1.98 
english/Bugs/pkgreport-opts.inc: 1.59 -> 1.60

2 files changed, 34 insertions, 130 deletions

diff --git a/english/Bugs/Developer.wml b/english/Bugs/Developer.wml
index 6fb7f7287f3..a3bf4d328d0 100644
--- a/english/Bugs/Developer.wml
+++ b/english/Bugs/Developer.wml
@@ -274,130 +274,19 @@ about the tags:</p>
 <dt><code>l10n</code></dt>
   <dd>This bug is relevant to the localisation of the package.</dd>
 
-<dt><code>potato</code></dt>
-  <dd>This bug particularly applies to the potato release of Debian.</dd>
-
-<dt><code>woody</code></dt>
-  <dd>This bug particularly applies to the woody distribution.</dd>
-
-<dt><code>sarge</code></dt>
-  <dd>This is a distribution tag, which has two effects. When set on a
-    bug, the bug can only affect sarge (though it may also affect other
-    distributions if other distribution tags are set) but otherwise
-    normal buggy/fixed/absent rules apply. The bug also should not be
-    archived until it is fixed in sarge.</dd>
-
-<dt><code>sarge-ignore</code></dt>
-  <dd>This release-critical bug is to be ignored for the purposes of
-  releasing sarge. <strong>This tag should only be used by the release
-  manager; do not set it yourself without explicit authorization from
-  them.</strong></dd>
-
-<dt><code>etch</code></dt>
-  <dd>This is a distribution tag, which has two effects. When set on a
-    bug, the bug can only affect etch (though it may also affect other
-    distributions if other distribution tags are set) but otherwise
-    normal buggy/fixed/absent rules apply. The bug also should not be
-    archived until it is fixed in etch.</dd>
-
-<dt><code>etch-ignore</code></dt>
-  <dd>This release-critical bug is to be ignored for the purposes of
-  releasing etch. <strong>This tag should only be used by the release
-  manager; do not set it yourself without explicit authorization from
-  them.</strong></dd>
-
-<dt><code>lenny</code></dt>
-  <dd>This is a release tag, which has two effects. When set on a
-    bug, the bug can only affect lenny (though it may also affect
-    other releases if other release tags are set) but
-    otherwise normal buggy/fixed/absent rules apply. The bug also
-    should not be archived until it is fixed in lenny.</dd>
-
-<dt><code>lenny-ignore</code></dt>
-  <dd>This release-critical bug is to be ignored for the purposes of
-  releasing lenny. <strong>This tag should only be used by the release
-  manager(s); do not set it yourself without explicit authorization from
-  them.</strong></dd>
-
-<dt><code>squeeze</code></dt>
-  <dd>This is a release tag, which has two effects. When set on a
-    bug, the bug can only affect squeeze (though it may also affect
-    other releases if other release tags are set) but
-    otherwise normal buggy/fixed/absent rules apply. The bug also
-    should not be archived until it is fixed in squeeze.</dd>
-
-<dt><code>squeeze-ignore</code></dt>
-  <dd>This release-critical bug is to be ignored for the purposes of
-  releasing squeeze. <strong>This tag should only be used by the release
-  manager(s); do not set it yourself without explicit authorization from
-  them.</strong></dd>
-
-<dt><code>wheezy</code></dt>
-  <dd>This is a release tag, which has two effects. When set on a
-    bug, the bug can only affect wheezy (though it may also affect
-    other releases if other release tags are set) but
-    otherwise normal buggy/fixed/absent rules apply. The bug also
-    should not be archived until it is fixed in wheezy.</dd>
-
-<dt><code>wheezy-ignore</code></dt>
-  <dd>This release-critical bug is to be ignored for the purposes of
-  releasing wheezy. <strong>This tag should only be used by the release
-  manager(s); do not set it yourself without explicit authorization from
-  them.</strong></dd>
-
-<dt><code>jessie</code></dt>
-  <dd>This is a release tag, which has two effects. When set on a
-    bug, the bug can only affect jessie (though it may also affect
-    other releases if other release tags are set) but
-    otherwise normal buggy/fixed/absent rules apply. The bug also
-    should not be archived until it is fixed in jessie.</dd>
-
-<dt><code>jessie-ignore</code></dt>
-  <dd>This release-critical bug is to be ignored for the purposes of
-  releasing jessie. <strong>This tag should only be used by the release
-  manager(s); do not set it yourself without explicit authorization from
-  them.</strong></dd>
-
-<dt><code>stretch</code></dt>
-  <dd>This is a release tag, which has two effects. When set on a
-    bug, the bug can only affect stretch (though it may also affect
-    other releases if other release tags are set) but
-    otherwise normal buggy/fixed/absent rules apply. The bug also
-    should not be archived until it is fixed in stretch.</dd>
-
-<dt><code>stretch-ignore</code></dt>
-  <dd>This release-critical bug is to be ignored for the purposes of
-  releasing stretch. <strong>This tag should only be used by the release
-  manager(s); do not set it yourself without explicit authorization from
-  them.</strong></dd>
-
-<dt><code>buster</code></dt>
-  <dd>This is a release tag, which has two effects. When set on a
-    bug, the bug can only affect buster (though it may also affect
-    other releases if other release tags are set) but
-    otherwise normal buggy/fixed/absent rules apply. The bug also
-    should not be archived until it is fixed in buster.</dd>
+<dt><bts_release_tags></dt>
+  <dd>These are release tags, which have two effects. When set on a bug,
+    the bug can only affect the particular release (though it may also affect
+    other releases if other release tags are set) but otherwise normal
+    buggy/fixed/absent rules apply. The bug also should not be
+    archived until it is fixed in the release.</dd>
 
-<dt><code>buster-ignore</code></dt>
+<dt><bts_release_ignore_tags></dt>
   <dd>This release-critical bug is to be ignored for the purposes of
-  releasing buster. <strong>This tag should only be used by the release
+  releasing the particular release. <strong>These tags should only be used by the release
   manager(s); do not set it yourself without explicit authorization from
   them.</strong></dd>
 
-<dt><code>sid</code></dt>
-  <dd>This is a release tag, which has two effects. When set on a
-    bug, the bug can only affect sid (though it may also affect
-    other releases if other release tags are set) but
-    otherwise normal buggy/fixed/absent rules apply. The bug also
-    should not be archived until it is fixed in sid.</dd>
-
-<dt><code>experimental</code></dt>
-  <dd>This is a release tag, which has two effects. When set on a bug,
-    the bug can only affect experimental (though it may also affect
-    other releases if other release tags are set) but otherwise normal
-    buggy/fixed/absent rules apply. The bug also should not be
-    archived until it is fixed in experimental.</dd>
-
 </dl>
 
 <p>Some info on distribution-specific tags:
diff --git a/english/Bugs/pkgreport-opts.inc b/english/Bugs/pkgreport-opts.inc
index 0fb828a1f55..e986cba790b 100644
--- a/english/Bugs/pkgreport-opts.inc
+++ b/english/Bugs/pkgreport-opts.inc
@@ -174,6 +174,30 @@
 <bts_severities>, <bts_severities_obsolete></define-tag>
 
 # bug tags. See debbugs/etc/config
+<define-tag bts_release_tags>
+<code>potato</code>,
+<code>woody</code>, 
+<code>sarge</code>,
+<code>etch</code>,
+<code>lenny</code>,
+<code>squeeze</code>,
+<code>wheezy</code>,
+<code>jessie</code>,
+<code>stretch</code>,
+<code>buster</code>,
+<code>sid</code>, 
+<code>experimental</code></define-tag>
+
+<define-tag bts_release_ignore_tags>
+<code>sarge-ignore</code>, 
+<code>etch-ignore</code>, 
+<code>lenny-ignore</code>, 
+<code>squeeze-ignore</code>, 
+<code>wheezy-ignore</code>, 
+<code>jessie-ignore</code>, 
+<code>stretch-ignore</code>, 
+<code>buster-ignore</code></define-tag>
+
 <define-tag bts_tags>
 <code>patch</code>, <code>wontfix</code>, <code>moreinfo</code>, 
 <code>unreproducible</code>, <code>help</code>, <code>newcomer</code>, <code>pending</code>, 
@@ -181,15 +205,6 @@
 <code>fixed</code>, <code>fixed-upstream</code>, 
 <code>fixed-in-experimental</code>, <code>d-i</code>, <code>ipv6</code>, 
 <code>lfs</code>, <code>l10n</code>, 
-<code>potato</code>, <code>woody</code>, 
-<code>sarge</code>, <code>sarge-ignore</code>, 
-<code>etch</code>, <code>etch-ignore</code>, 
-<code>lenny</code>, <code>lenny-ignore</code>, 
-<code>squeeze</code>, <code>squeeze-ignore</code>, 
-<code>wheezy</code>, <code>wheezy-ignore</code>, 
-<code>jessie</code>, <code>jessie-ignore</code>, 
-<code>stretch</code>, <code>stretch-ignore</code>, 
-<code>buster</code>, <code>buster-ignore</code>, 
-<code>sid</code>, 
-<code>experimental</code></define-tag>
+<bts_release_tags>
+<bts_release_ignore_tags></define-tag>