Switch from pseudo-tags to usertags, and update the documentation.

diff --git a/ChangeLog b/ChangeLog
index 407ed3dd1eb85834dc5d4e411838e125aa3eeed1..3a0a4a57935c3f2e66291b73ef8f720c130addb1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-03-23  Guillem Jover  <guillem@debian.org>
+
+       * debian/pseudo-tags: Renamed to ...
+       * debian/usertags: ... this. Updated with the usertags information.
+       * debian/dpkg.docs: Install usertags instead of pseudo-tags.
+
 2007-03-21  Jeffrey W. Baker  <jwbaker@acm.org>
             Guillem Jover  <guillem@debian.org>
 

diff --git a/TODO b/TODO
index 9ce35ba30eebc869173991c092e76c0083451c03..7bedfd8dcc1a449efafceff499b4c8c344fe250f 100644 (file)
--- a/TODO
+++ b/TODO
@@ -11,8 +11,6 @@ lenny
  * Triage as much bugs as possible to get the bug count below 300 ;) and
    merge as much patches as possible.
 
- * Change the BTS pages to use usertags instead of pseudo-tags.
-
 1.14.0
 ------
 

diff --git a/debian/changelog b/debian/changelog
index 9b5f77d9ed35c1edca20b8a9605d2dc8666b7cc9..d32044f9217b1de18ae6cd63e248f6a380dac98b 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -57,6 +57,7 @@ dpkg (1.14.0) UNRELEASED; urgency=low
   * Show the epoch (if present) when displaying package versions.
     Closes: #107449, #179913, #345594, #393924, #405668
     Based on a patch by Jeffrey W. Baker.
+  * Switch from pseudo-tags to usertags, and update the documentation.
 
   [ Updated dpkg translations ]
   * Romanian (Eddy Petrișor).

diff --git a/debian/dpkg.docs b/debian/dpkg.docs
index 2fa7d0bc18c8a8d7f9796df4ff005a69f3193aa1..caa7b8bcb5106b36c1704204fcba641bd9c63750 100644 (file)
--- a/debian/dpkg.docs
+++ b/debian/dpkg.docs
@@ -1,3 +1,3 @@
 AUTHORS
 THANKS
-debian/pseudo-tags
+debian/usertags

diff --git a/debian/pseudo-tags b/debian/pseudo-tags
deleted file mode 100644 (file)
index 9a7b520..0000000
--- a/debian/pseudo-tags
+++ /dev/null
@@ -1,53 +0,0 @@
-To make management of bugs against the dpkg suite easier we add as many of
-the following “pseudo-tags” to the start of the subject (title) as apply
-to the bug.
-
-When filing bugs, please do the same to aid triage.
-
-[ASSERT]               Errors caused by assert().
-[SEGFAULT]             Errors that cause segmentation faults.
-[CONFFILE]             Issues with configuration file handling.
-[DEPENDS]              Issues with dependency relationship handling.
-[TRIVIAL]              Bug should be trivial to fix.
-[PERF]                 Performance problems.
-[DOC]                  Documentation bugs, including --help and manpages.
-[UTF-8]                        Conversion to the UTF-8 encoding.
-[ARCH]                 Updates to ‘cputable’, ‘ostable’ and porting patches.
-                       Include the dpkg architecture name in the tag,
-                       e.g. [ARCH:sparc]
-[INTL]                 New or updated translations and bugs affecting
-                       translation.  Include the language code in the tag,
-                       e.g. [INTL:cy_GB]
-
-
-Each program in the dpkg suite has its own pseudo-tag:
-
-dpkg:
-[DPKG]
-[DPKG-DEB]
-[DPKG-DIVERT]
-[DPKG-QUERY]
-[DPKG-SPLIT]
-[DPKG-STATOVERRIDE]
-[S-S-D]                        start-stop-daemon
-[CLEANUP-INFO]
-[INSTALL-INFO]
-[U-A]                  update-alternatives
-
-dpkg-dev:
-[822-DATE]
-[DPKG-ARCHITECTURE]
-[DPKG-BUILDPACKAGE]
-[DPKG-CHECKBUILDDEPS]
-[DPKG-DISTADDFILE]
-[DPKG-GENCHANGES]
-[DPKG-GENCONTROL]
-[DPKG-NAME]
-[DPKG-PARSECHANGELOG]
-[DPKG-SCANPACKAGES]
-[DPKG-SCANSOURCES]
-[DPKG-SHLIBDEPS]
-[DPKG-SOURCE]
-
-dselect:
-[DSELECT]

diff --git a/debian/usertags b/debian/usertags
new file mode 100644 (file)
index 0000000..1bf62b8
--- /dev/null
+++ b/debian/usertags
@@ -0,0 +1,130 @@
+To make management of bugs against the dpkg suite easier we add as many of
+the following usertags as apply to the bug.
+
+When filing bugs, please do the same to aid triage, by including in the
+bug report pseudo-header:
+
+       User: dpkg@packages.debian.org
+       Usertags: <usertag...>
+
+Those are the currently used usertags (and the matchings against the old
+“pseudo-tags”, which were encoded in the bug title):
+
+Generic tags
+============
+
+usertag                pseudo-tag      description
+-------                ----------      -----------
+
+assert         [ASSERT]        Errors caused by assert().
+segfault       [SEGFAULT]      Errors that cause segmentation faults.
+conffile       [CONFFILE]      Issues with configuration file handling.
+               [DEPENDS]       Issues with dependency relationship handling.
+trivial                [TRIVIAL]       Bug should be trivial to fix.
+perf           [PERF]          Performance problems.
+wig-and-pen                    Wig&Pen (aka dpkg-source v2).
+not-debian                     Errors not affecting Debian systems.
+               [ARCH]          Updates to ‘cputable’, ‘ostable’ and porting
+                               patches.
+utf-8          [UTF-8]         Conversion to the UTF-8 encoding.
+doc            [DOC]           Documentation bugs, including --help and manpages.
+l10n           [INTL]          New or updated translations and bugs affecting
+                               translation. Include the language code in the
+                               tag, e.g. [INTL:cy_GB].
+
+after-etch                     Bugs to be fixed after this release.
+apt-feature                    ??
+
+Program tags
+============
+
+usertag                        pseudo-tag              description
+-------                        ----------              -----------
+
+dpkg                   [DPKG]
+dpkg-architecture      [DPKG-ARCHITECTURE]
+dpkg-buildpackage      [DPKG-BUILDPACKAGE]
+dpkg-checkbuilddeps    [DPKG-CHECKBUILDDEPS]
+dpkg-deb               [DPKG-DEB]
+dpkg-distaddfile       [DPKG-DISTADDFILE]
+dpkg-divert            [DPKG-DIVERT]
+dpkg-genchanges                [DPKG-GENCHANGES]
+dpkg-gencontrol                [DPKG-GENCONTROL]
+dpkg-name              [DPKG-NAME]
+dpkg-parsechangelog    [DPKG-PARSECHANGELOG]
+dpkg-query             [DPKG-QUERY]
+dpkg-scanpackages      [DPKG-SCANPACKAGES]
+dpkg-scansources       [DPKG-SCANSOURCES]
+dpkg-shlibdeps         [DPKG-SHLIBDEPS]
+dpkg-source            [DPKG-SOURCE]
+dpkg-split             [DPKG-SPLIT]
+dpkg-statoverride      [DPKG-STATOVERRIDE]
+s-s-d                  [S-S-D]                 start-stop-daemon
+u-a                    [U-A]                   update-alternatives
+
+cleanup-info           [CLEANUP-INFO]
+install-info           [INSTALL-INFO]
+822-date               [822-DATE]
+
+dpkg-dev                                       Those should be reassigned to
+                                               the dpkg-dev package.
+                       [DSELECT]               Those should be reassigned to
+                                               the dselect package.
+
+Current classification
+======================
+
+dpkg
+----
+
+  <http://bugs.debian.org/cgi-bin/pkgreport.cgi?pkg=dpkg;ordering=dpkg-maint>
+
+,--- Definition ---
+user dpkg@packages.debian.org
+
+usercategory dpkg-maint
+ * dpkg-class
+ * status
+ * severity
+ * classification
+
+usercategory dpkg-class
+ * Classification [tag=]
+  + Conffile handling [conffile]
+  + Performance issues [perf]
+  + Assertion failures [assert]
+  + Segfaults [segfault]
+  + dpkg-deb [dpkg-deb]
+  + dpkg-query [dpkg-query]
+  + start-stop-daemon [s-s-d]
+  + update-alternatives [u-a]
+  + install-info [install-info]
+  + dpkg-divert [dpkg-divert]
+  + Documentation [doc]
+  + Others []
+`---
+
+dpkg-dev
+--------
+
+ <http://bugs.debian.org/cgi-bin/pkgreport.cgi?pkg=dpkg-dev;users=team@dpkg.org;ordering=dpkg-dev-maint>
+
+,--- Definition ---
+user dpkg@packages.debian.org
+
+usercategory dpkg-dev-maint
+ * dpkg-dev-program
+ * status
+ * severity
+ * classification
+
+usercategory dpkg-dev-program
+ * Program [tag=]
+  + dpkg-source [dpkg-source]
+  + dpkg-buildpackage [dpkg-buildpackage]
+  + dpkg-gencontrol [dpkg-gencontrol]
+  + dpkg-shlibdeps [dpkg-shlibdeps]
+  + dpkg-parsechangelog [dpkg-parsechangelog]
+  + Others []
+`---
+