Merge changes made in Gnus trunk.

gnus-msg.el (gnus-bug): Add Package and Version pseudo-headers to bug reports.
gnus.el (gnus-bug-package): Use "gnus."
 (gnus-maintainer): Direct bug reports to submit@debbugs.gnu.org.

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 839bd519d49b2f73595bdd7e40cf0f02c15e2cb0..ec7cca9fdff8cfeedd2619e2f05a1003710183c8 100644 (file)
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,11 @@
+2011-06-28  Teodor Zlatanov  <tzz@lifelogs.com>
+
+       * gnus-msg.el (gnus-bug): Add Package and Version pseudo-headers to bug
+       reports.
+
+       * gnus.el (gnus-bug-package): Use "gnus."
+       (gnus-maintainer): Direct bug reports to submit@debbugs.gnu.org.
+
 2011-06-26  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
        * gnus-art.el (gnus-article-stop-animations): New function to stop any

diff --git a/lisp/gnus/gnus-msg.el b/lisp/gnus/gnus-msg.el
index e256446c01656c262d7a2a332e322a6fd729ab9c..8e382e02cc356a91fe8297d4d78fb82a69e2e31f 100644 (file)
--- a/lisp/gnus/gnus-msg.el
+++ b/lisp/gnus/gnus-msg.el
@@ -1461,6 +1461,8 @@ If YANK is non-nil, include the original article."
     (goto-char (point-min))
     (re-search-forward (concat "^" (regexp-quote mail-header-separator) "$"))
     (forward-line 1)
+    (insert (format "Package: %s\n" gnus-bug-package))
+    (insert (format "Version: %s\n" (gnus-continuum-version)))
     (insert (gnus-version) "\n"
            (emacs-version) "\n")
     (when (and (boundp 'nntp-server-type)

diff --git a/lisp/gnus/gnus.el b/lisp/gnus/gnus.el
index 20986d259428feb72d0b4ed0ecfba554206a3212..9204fcf66b7b6712154e557f78f178d5d3a067fa 100644 (file)
--- a/lisp/gnus/gnus.el
+++ b/lisp/gnus/gnus.el
@@ -2655,9 +2655,13 @@ such as a mark that says whether an article is stored in the cache
 (defvar gnus-have-read-active-file nil)
 
 (defconst gnus-maintainer
-  "bugs@gnus.org (The Gnus Bugfixing Girls + Boys)"
+  "submit@debbugs.gnu.org (The Gnus Bugfixing Girls + Boys)"
   "The mail address of the Gnus maintainers.")
 
+(defconst gnus-bug-package
+  "gnus"
+  "The package to use in the bug submission.")
+
 (defvar gnus-info-nodes
   '((gnus-group-mode "(gnus)Group Buffer")
     (gnus-summary-mode "(gnus)Summary Buffer")