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

[Sandro Tosi]

The following commit has been merged in the master branch:
commit ac122275a0c544489db447b49893e0fbb50ef64a
Author: Sandro Tosi <morph at debian.org>
Date:   Thu Nov 26 22:12:57 2009 +0100

    reverting changes to desktop+menu and ack teh bugs to the right changelog entry

diff --git a/debian/changelog b/debian/changelog
index 09f5598..23a20dd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -30,10 +30,6 @@ reportbug (4.8+WIP) UNRELEASED; urgency=low
     - clarified the message displayed when reporting a bug against an orphaned
       packages, requesting to still report the bug if it exists; thanks to Ryan
       Niebur for the report; Closes: #544623
-  * 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
   * man/reportbug.1
     - clarify that if dlocate is installed, the parameters to --filename are
       actually regexp; thanks to Dan Jacobson for the report; Closes: #547091
@@ -47,7 +43,9 @@ reportbug (4.8+WIP) UNRELEASED; urgency=low
   * reportbug/ui/gtk2_ui.py
     - cleaner way of handling the response in error/info dialogs; thanks to
       Julian Andres Klode for the report; Closes: #527259
-    - open a terminal when fallbacking to text mode if stdout is not available
+    - open a terminal when falling back to text mode if stdout is not available
+      (usually when run through the menu); thanks to Filipus Klutiero and
+      Philipp Kern for the reports; Closes #554504, #543147
     - don't show back button as it's not possible to go back;
       thanks to all the people reporting the bug; Closes: #532467
   * bin/reportbug, reportbug/ui/*_ui.py:
@@ -55,7 +53,7 @@ reportbug (4.8+WIP) UNRELEASED; urgency=low
       receive input or not; thanks to Sebastian Dalfuß for the report;
       Closes: #531803
 
- -- Sandro Tosi <morph at debian.org>  Thu, 26 Nov 2009 21:57:15 +0100
+ -- Sandro Tosi <morph at debian.org>  Thu, 26 Nov 2009 22:09:06 +0100
 
 reportbug (4.8) unstable; urgency=low
 
diff --git a/debian/desktop b/debian/desktop
index 2367784..bbd97a1 100644
--- a/debian/desktop
+++ b/debian/desktop
@@ -6,4 +6,3 @@ 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 19bf73a..dcb779d 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="text" section="Applications/System/Administration" \
+?package(reportbug):needs="x11" 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