[Reportbug-commits] [SCM] Reportbug - reports bugs in the Debian distribution branch, master, updated. 4.0-29-gb92ef3b

[Sandro Tosi]

The following commit has been merged in the master branch:
commit b92ef3b80cbf02794d34a17017dde5c9541bcf83
Author: Luca Bruno <lethalman88 at gmail.com>
Date:   Thu Apr 2 19:07:55 2009 +0200

    update frontends list in documentation. Closes: #522290

diff --git a/bin/querybts b/bin/querybts
index e52e8c4..a6279dc 100755
--- a/bin/querybts
+++ b/bin/querybts
@@ -40,12 +40,8 @@ from reportbug import urlutils
 
 from reportbug.ui import AVAILABLE_UIS
 
-try:
-    import reportbug.ui.newt_ui as ui
-    ui_mode = 'newt'
-except:
-    import reportbug.ui.text_ui as ui
-    ui_mode = 'text'
+import reportbug.ui.text_ui as ui
+ui_mode = 'text'
 
 from reportbug import VERSION_NUMBER
 
@@ -221,19 +217,10 @@ if __name__ == '__main__':
     try:
         main()
     except KeyboardInterrupt:
-        if ui_mode == 'newt':
-            print chr(27)+'c'
-            os.system('stty sane; clear')
         print "querybts: exiting due to user interrupt."
     except debianbts.Error, x:
-        if ui_mode == 'newt':
-            print chr(27)+'c'
-            os.system('stty sane; clear')
         print 'error accessing BTS: '+str(x)
     except SystemExit:
         pass
     except:
-        if ui_mode == 'newt':
-            print chr(27)+'c'
-            os.system('stty sane; clear')
         raise
diff --git a/conf/reportbug.conf b/conf/reportbug.conf
index 4f7d6df..592ea94 100644
--- a/conf/reportbug.conf
+++ b/conf/reportbug.conf
@@ -75,7 +75,7 @@ compress
 # should be OK with the default.
 # mta /usr/sbin/sendmail
 
-# User interface: text or newt
+# User interface: text, urwid or gtk2
 # querybts and reportbug will use this setting
 # ui text
 
diff --git a/debian/changelog b/debian/changelog
index 3c5f865..a9e39d7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -37,8 +37,13 @@ reportbug (4.1) UNRELEASED; urgency=low
     - added suggests for python-vte and python-gnome2-extras (for spell check)
   * debian/copyright, reportbug/ui/gtk2_ui.py
     - bump copyright years
+  * man/{querybts.1, reportbug.1, reportbug.conf.5}, conf/reportbug.conf
+    - update frontends list; thanks to Raphaël Hertzog for the report;
+      Closes: #522290
+  * bin/querybts
+    - do not try to import newt ui
 
- -- Sandro Tosi <morph at debian.org>  Tue, 31 Mar 2009 23:40:35 +0200
+ -- Luca Bruno <lethalman88 at gmail.com>  Thu, 02 Apr 2009 19:04:14 +0200
 
 reportbug (4.0) unstable; urgency=low
 
diff --git a/man/querybts.1 b/man/querybts.1
index 2b7e822..708b57b 100644
--- a/man/querybts.1
+++ b/man/querybts.1
@@ -50,7 +50,7 @@ Query on source packages, rather than binary packages.
 .TP
 .B \-u, \-\-ui
 Specify the user interface to use.
-Valid options are \fBtext\fP, \fBnewt\fP, \fBurwid\fP, \fBgtk2\fP;
+Valid options are \fBtext\fP, \fBurwid\fP, \fBgtk2\fP;
 default is taken from the reportbug configuration files.
 .TP
 .B \-w, \-\-web
@@ -94,8 +94,6 @@ specifying a hostname, or omitting a port other than 80, WILL NOT WORK).
 Python's getopt module is pickier than GNU getopt() about the order of
 command line arguments; all switches must be specified before the
 package name.
-
-You must have the python-newt package installed to run this program.
 .SH "SEE ALSO"
 reportbug(1), reportbug.conf(5)
 .SH AUTHOR
diff --git a/man/reportbug.1 b/man/reportbug.1
index 106c505..60e94e0 100644
--- a/man/reportbug.1
+++ b/man/reportbug.1
@@ -405,7 +405,7 @@ Output a template report to standard output.
 .TP
 .B \-u, \-\-ui
 Specify the user interface to use.
-Valid options are \fBtext\fP, \fBnewt\fP, \fBurwid\fP, \fBgtk2\fP;
+Valid options are \fBtext\fP, \fBurwid\fP, \fBgtk2\fP;
 default is taken from the reportbug configuration files.
 .TP
 .B \-v, \-\-verify
diff --git a/man/reportbug.conf.5 b/man/reportbug.conf.5
index 243bc98..4dc6633 100644
--- a/man/reportbug.conf.5
+++ b/man/reportbug.conf.5
@@ -235,7 +235,7 @@ Use \fIsubmit\fP as the bug submission address
 Use the template mode, bypasses all prompts and the output it sent to
 stdout
 .TP
-.B ui [\fItext\fP|\fInewt\fP|\fIurwid\fP|\fIgtk2\fP]
+.B ui [\fItext\fP|\fIurwid\fP|\fIgtk2\fP]
 The user interface that
 .B querybts(1)
 and

-- 
Reportbug - reports bugs in the Debian distribution