[Reportbug-commits] [SCM] Reportbug - reports bugs in the Debian distribution branch, master, updated. 4.4-7-gd571985

Sandro Tosi morph at debian.org
Sat May 30 09:40:42 UTC 2009 

The following commit has been merged in the master branch:
commit 3d3a87a975334997ab5786d0e3fb81a48fdad9f8
Author: Sandro Tosi <morph at debian.org>
Date:   Sat May 30 11:17:26 2009 +0200

      - removed 'af' mail user agent, since it's no more in Debian; thanks to Carl
        Chenet for the report and (partial) patch; Closes: #529987

diff --git a/bin/reportbug b/bin/reportbug
index 92f4339..409c505 100755
--- a/bin/reportbug
+++ b/bin/reportbug
@@ -714,9 +714,6 @@ def main():
                       help='send the report using mutt')
     parser.add_option('--mirror', action='append', help='add a BTS mirror',
                       dest='mirrors')
-    parser.add_option('-a', '--af', action='store_const', dest='mua',
-                      const=utils.MUA['af'],
-                      help='send the report using af')
     parser.add_option('-n', '--mh', '--nmh', action='store_const', dest='mua',
                       help='send the report using mh/nmh',
                       const=utils.MUA['mh'])
diff --git a/conf/reportbug.conf b/conf/reportbug.conf
index 592ea94..648dd9f 100644
--- a/conf/reportbug.conf
+++ b/conf/reportbug.conf
@@ -16,7 +16,6 @@ submit
 
 # Mailer to use (default is empty, to use internal mailer). One of:
 # mutt
-# af
 # mh
 # nmh
 
diff --git a/debian/changelog b/debian/changelog
index db2a514..5980749 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,8 +9,12 @@ reportbug (4.5) UNRELEASED; urgency=low
   * bin/reportbug
     - offer a default value (text) for UI at configuration time; thanks to Carl
       Chenet for the report and patch; Closes: #529981
+  * bin/reportbug, conf/reportbug.conf, debian/control, man/reportbug.*,
+    po4a/po/*, reportbug/utils.py
+    - removed 'af' mail user agent, since it's no more in Debian; thanks to Carl
+      Chenet for the report and (partial) patch; Closes: #529987
 
- -- Sandro Tosi <morph at debian.org>  Sat, 30 May 2009 11:04:35 +0200
+ -- Sandro Tosi <morph at debian.org>  Sat, 30 May 2009 11:15:17 +0200
 
 reportbug (4.4) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 13e4c66..7439385 100644
--- a/debian/control
+++ b/debian/control
@@ -21,7 +21,7 @@ Description: reports bugs in the Debian distribution
  reportbug is a tool designed to make the reporting of bugs in Debian
  and derived distributions relatively painless.  Its features include:
  .
-  * Integration with the mutt, af, and mh/nmh mail readers.
+  * Integration with mutt and mh/nmh mail readers.
   * Access to outstanding bug reports to make it easier to identify
     whether problems have already been reported.
   * Automatic checking for newer versions of packages.
diff --git a/man/reportbug.1 b/man/reportbug.1
index 60e94e0..6c5f69f 100644
--- a/man/reportbug.1
+++ b/man/reportbug.1
@@ -40,11 +40,6 @@ Show the version of
 .B reportbug
 and exit.
 .TP
-.B \-a, \-\-af
-Instead of spawning an editor to revise the bug report, use the
-.B af
-mail reader to edit and send it.
-.TP
 .B \-A FILENAME, \-\-attach=FILENAME
 Attach a file to the bug report; both text and binary files are
 acceptable.  This routine will create a MIME attachment with the file
@@ -260,9 +255,9 @@ specified MUA (mail user agent) to edit and send it.  The
 .B option
 should be used to tell your mail reader to interpret the report as a
 draft message.  For examples of how this works, see how the
-.B --mutt, --nmh
+.B --mutt
 and
-.B --af
+.B --nmh
 options are processed.
 .TP
 .B \-n, \-\-nmh, \-\-mh
@@ -504,7 +499,7 @@ for available tags, querybts(1)
 Chris Lawrence <lawrencc at debian.org>.
 
 \"  LocalWords:  reportbug debbugs pathname Debian bts fBdebbugs fP filename fB
-\"  LocalWords:  af Debian's BODYFILE config reportbugrc pre DEBEMAIL gnupg gpg
+\"  LocalWords:  Debian's BODYFILE config reportbugrc pre DEBEMAIL gnupg gpg
 \"  LocalWords:  REPORTBUGEMAIL GnuPG MUA debian Dorman severities KEYID keyid
 \"  LocalWords:  PGP maintonly mta MTA smtphost mua nmh mh pgp http realname
 \"  LocalWords:  replyto wishlist ISP's localhost SMTP tls smtpuser USERNAME
diff --git a/man/reportbug.conf.5 b/man/reportbug.conf.5
index 4dc6633..0e42dc5 100644
--- a/man/reportbug.conf.5
+++ b/man/reportbug.conf.5
@@ -55,11 +55,6 @@ Options can be specified in any order.
 .SH OPTIONS
 The summary of possible options (in alphabetical order) is as follows:
 .TP
-.B af
-Use the
-.B af
-mailer
-.TP
 .B bts
 The bug tracking system to use, see
 .B reportbug --bts help
diff --git a/man/reportbug.ja.1 b/man/reportbug.ja.1
index 50088ed..fcfe4da 100644
--- a/man/reportbug.ja.1
+++ b/man/reportbug.ja.1
@@ -31,11 +31,6 @@ reportbug \- debbugs 
 .B reportbug
 ¤Î¥Ð¡¼¥¸¥ç¥ó¤òɽ¼¨¤·¤Æ½ªÎ»¤¹¤ë¡£
 .TP
-.B \-a, \-\-af
-¥Ð¥°Êó¹ð¤Î¹»ÄûÍѤȤ·¤Æ¥¨¥Ç¥£¥¿¤òµ¯Æ°¤¹¤ëÂå¤ï¤ê¤Ë¡¢ÊÔ½¸¤ª¤è¤ÓÁ÷¿®ÍѤȤ·¤Æ
-.B af
-¥á¡¼¥ë¥ê¡¼¥À¤ò»È¤¦¡£
-.TP
 .B \-A ¥Õ¥¡¥¤¥ë̾, \-\-attach=¥Õ¥¡¥¤¥ë̾
 ¥Ð¥°Êó¹ð¤Ë¥Õ¥¡¥¤¥ë¤òźÉÕ¤¹¤ë¡£¥Æ¥­¥¹¥È¤ª¤è¤Ó¥Ð¥¤¥Ê¥ê¥Õ¥¡¥¤¥ë¤ÎξÊý¤¬»ÈÍÑ
 ¤Ç¤­¤ë¡£Ëܥ롼¥Á¥ó¤Ï¡¢´Þ¤á¤¿¥Õ¥¡¥¤¥ëÉդΠMIME źÉÕ¤òºîÀ®¤¹¤ë¡£¤¤¤¯¤Ä¤«¤Î
@@ -236,8 +231,6 @@ PGP/GnuPG 
 .B ¥ª¥×¥·¥ç¥ó
 ¤ò»È¤ï¤Ê¤±¤ì¤Ð¤Ê¤é¤Ê¤¤¡£¤³¤ÎÆ°ºîÎã¤È¤·¤Æ¤Ï¡¢
 .B --mutt, --nmh
-¤ª¤è¤Ó
-.B --af
 ¥ª¥×¥·¥ç¥ó¤Î½èÍý¥×¥í¥»¥¹¤ò»²¾È¤Î¤³¤È¡£
 .TP
 .B \-n, \-\-nmh, \-\-mh
diff --git a/po4a/po/fr.po b/po4a/po/fr.po
index 5778724..f5bdb93 100644
--- a/po4a/po/fr.po
+++ b/po4a/po/fr.po
@@ -145,21 +145,6 @@ msgid "Show the version of B<reportbug> and exit."
 msgstr "Afficher la version de B<reportbug> et s'arrêter."
 
 # type: TP
-#: man/reportbug.1:42
-#, no-wrap
-msgid "B<-a, --af>"
-msgstr "B<-a, --af>"
-
-# type: Plain text
-#: man/reportbug.1:47
-msgid ""
-"Instead of spawning an editor to revise the bug report, use the B<af> mail "
-"reader to edit and send it."
-msgstr ""
-"Utiliser le lecteur de courriel B<af> pour l'édition et l'envoi du rapport "
-"de bogue, plutôt que de lancer un éditeur."
-
-# type: TP
 #: man/reportbug.1:47
 #, no-wrap
 msgid "B<-A FILENAME, --attach=FILENAME>"
@@ -783,7 +768,7 @@ msgid ""
 "Instead of spawning an editor to revise the bug report, use the specified "
 "MUA (mail user agent) to edit and send it.  The B<option> should be used to "
 "tell your mail reader to interpret the report as a draft message.  For "
-"examples of how this works, see how the B<--mutt, --nmh> and B<--af> options "
+"examples of how this works, see how the B<--mutt> and B<--nmh> options "
 "are processed."
 msgstr ""
 "Utiliser le client de messagerie («\\ MUA\\ », Mail User Agent) indiqué pour "
@@ -791,7 +776,7 @@ msgstr ""
 "Le paramètre B<option> doit être utilisé pour préciser à votre lecteur de "
 "courriel qu'il doit interpréter le rapport de bogues en tant de message "
 "brouillon. Pour en savoir plus sur cette façon de fonctionner, regardez "
-"comment les options B<--mutt, --nmh> et B<--af> sont traitées."
+"comment les options B<--mutt> et B<--nmh> sont traitées."
 
 # type: TP
 #: man/reportbug.1:267
diff --git a/po4a/po/reportbug.pot b/po4a/po/reportbug.pot
index 90665d9..bb8f524 100644
--- a/po4a/po/reportbug.pot
+++ b/po4a/po/reportbug.pot
@@ -121,19 +121,6 @@ msgid "Show the version of B<reportbug> and exit."
 msgstr ""
 
 # type: TP
-#: man/reportbug.1:42
-#, no-wrap
-msgid "B<-a, --af>"
-msgstr ""
-
-# type: Plain text
-#: man/reportbug.1:47
-msgid ""
-"Instead of spawning an editor to revise the bug report, use the B<af> mail "
-"reader to edit and send it."
-msgstr ""
-
-# type: TP
 #: man/reportbug.1:47
 #, no-wrap
 msgid "B<-A FILENAME, --attach=FILENAME>"
@@ -620,7 +607,7 @@ msgid ""
 "Instead of spawning an editor to revise the bug report, use the specified "
 "MUA (mail user agent) to edit and send it.  The B<option> should be used to "
 "tell your mail reader to interpret the report as a draft message.  For "
-"examples of how this works, see how the B<--mutt, --nmh> and B<--af> options "
+"examples of how this works, see how the B<--mutt> and B<--nmh> options "
 "are processed."
 msgstr ""
 
diff --git a/reportbug/utils.py b/reportbug/utils.py
index 4b53d16..d663e7e 100644
--- a/reportbug/utils.py
+++ b/reportbug/utils.py
@@ -754,7 +754,6 @@ CONFIG_ARGS = (
 
 MUA = {
     'mutt' : 'mutt -H',
-    'af' : 'af -EH < ',
     'mh' : '/usr/bin/mh/comp -use -file',
     'gnus' : 'REPORTBUG=%s emacs -l /usr/share/reportbug/reportbug.el -f tfheen-reportbug-insert-template',
     }
@@ -762,7 +761,6 @@ MUA['nmh'] = MUA['mh']
 
 MUAVERSION = {
     MUA['mutt'] : 'mutt -v',
-    MUA[ 'af'] : 'af -v ',
     MUA['mh'] : '/usr/bin/mh/comp -use -file',
     MUA['gnus'] : 'emacs --version',
     }

-- 
Reportbug - reports bugs in the Debian distribution

More information about the Reportbug-commits mailing list