[Reportbug-commits] [SCM] Reportbug - reports bugs in the Debian distribution branch, master, updated. 4.8-16-gd08173f

[Sandro Tosi]

The following commit has been merged in the master branch:
commit b090a74a7ff70c64141288729acdd589448f9497
Author: Sandro Tosi <morph at debian.org>
Date:   Sat Nov 21 15:54:05 2009 +0100

    run the GTK+ UI into a terminal: this way we can fall back to 'text' UI if GTK+ is not usable; thanks to Filipus Klutiero and Philipp Kern for the reports; Closes #554504, #543147

diff --git a/debian/changelog b/debian/changelog
index 2cb63fd..7b7646c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -26,8 +26,12 @@ reportbug (4.8+WIP) UNRELEASED; urgency=low
   * bin/reportbug
     - '--template' option forces the 'text' UI (it's only useful with that);
       thanks to Johan Kullstam for the report; Closes: #543281
+  * debian/{desktop, menu)
+    - run the GTK+ UI into a terminal: this way we can fall back to 'text' UI if
+      GTK+ is not usable; thanks to Filipus Klutiero and Philipp Kern for the
+      reports; Closes #554504, #543147
 
- -- Sandro Tosi <morph at debian.org>  Sat, 21 Nov 2009 13:04:15 +0100
+ -- Sandro Tosi <morph at debian.org>  Sat, 21 Nov 2009 15:47:35 +0100
 
 reportbug (4.8) unstable; urgency=low
 
diff --git a/debian/desktop b/debian/desktop
index bbd97a1..2367784 100644
--- a/debian/desktop
+++ b/debian/desktop
@@ -6,3 +6,4 @@ Icon=debian-logo
 TryExec=reportbug
 Exec=reportbug --exit-prompt --ui gtk2
 Categories=Application;System;
+Terminal=True
diff --git a/debian/menu b/debian/menu
index dcb779d..19bf73a 100644
--- a/debian/menu
+++ b/debian/menu
@@ -2,6 +2,6 @@
   title="Reportbug" command="/usr/bin/reportbug --exit-prompt" \
   hints="Bug reporting"
 
-?package(reportbug):needs="x11" section="Applications/System/Administration" \
+?package(reportbug):needs="text" section="Applications/System/Administration" \
   title="Reportbug (GTK+)" command="/usr/bin/reportbug --exit-prompt --ui gtk2" \
   hints="Bug reporting"

-- 
Reportbug - reports bugs in the Debian distribution