[Reportbug-commits] r654 - in trunk (5 files)

[morph-guest at users.alioth.debian.org]

    Date: Saturday, September 13, 2008 @ 22:08:37
  Author: morph-guest
Revision: 654

    + added gtk2 ui copyright
  - debian/{control.greportbug,greportbug.menu}
    + removed since no more needed
  - debian/menu
    + added entry for GTK+ ui

Modified:
  trunk/debian/changelog
  trunk/debian/menu
  trunk/reportbug/ui/gtk2_ui.py
Deleted:
  trunk/debian/control.greportbug
  trunk/debian/greportbug.menu

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2008-09-13 14:41:57 UTC (rev 653)
+++ trunk/debian/changelog	2008-09-13 22:08:37 UTC (rev 654)
@@ -40,7 +40,11 @@
     - debian/control
       + added python-gtk2 to suggests
     - debian/copyright
-      - added gtk2 ui copyright
+      + added gtk2 ui copyright
+    - debian/{control.greportbug,greportbug.menu}
+      + removed since no more needed
+    - debian/menu
+      + added entry for GTK+ ui
   
   * reportbug/debianbts.py
     - added buildd.emdebian.org and debian-i18n pseudo-packages
@@ -50,7 +54,7 @@
     - updated location of canonical pseudo-packages list from ftpmaster to
       bugs.d.o; thanks to Josip Rodin for the patch; Closes: #498663
 
- -- Sandro Tosi <matrixhasu at gmail.com>  Fri, 12 Sep 2008 07:40:34 +0200
+ -- Sandro Tosi <matrixhasu at gmail.com>  Sat, 13 Sep 2008 23:59:46 +0200
 
 reportbug (3.45) unstable; urgency=low
 

Deleted: trunk/debian/control.greportbug
===================================================================
--- trunk/debian/control.greportbug	2008-09-13 14:41:57 UTC (rev 653)
+++ trunk/debian/control.greportbug	2008-09-13 22:08:37 UTC (rev 654)
@@ -1,6 +0,0 @@
-Package: greportbug
-Architecture: all
-Depends: python-gtk (>= 0.6.1-1), reportbug (= ${Source-Version})
-Description: Gtk+ interface to report bugs in Debian
- greportbug provides a Gtk+ interface for users under X to report bugs
- in the Debian distribution.

Deleted: trunk/debian/greportbug.menu
===================================================================
--- trunk/debian/greportbug.menu	2008-09-13 14:41:57 UTC (rev 653)
+++ trunk/debian/greportbug.menu	2008-09-13 22:08:37 UTC (rev 654)
@@ -1,2 +0,0 @@
-?package(greportbug):needs=x11 section=Apps/System\
-  title="greportbug" command="/usr/bin/greportbug"

Modified: trunk/debian/menu
===================================================================
--- trunk/debian/menu	2008-09-13 14:41:57 UTC (rev 653)
+++ trunk/debian/menu	2008-09-13 22:08:37 UTC (rev 654)
@@ -1,3 +1,7 @@
 ?package(reportbug):needs="text" section="Applications/System/Administration" \
-  title="reportbug" command="/usr/bin/reportbug --exit-prompt" \
+  title="Reportbug" command="/usr/bin/reportbug --exit-prompt" \
   hints="Bug reporting"
+
+?package(reportbug):needs="x11" section="Applications/System/Administration" \
+  title="Reportbug (GTK+)" command="/usr/bin/reportbug --exit-prompt --ui gtk2" \
+  hints="Bug reporting"

Modified: trunk/reportbug/ui/gtk2_ui.py
===================================================================
--- trunk/reportbug/ui/gtk2_ui.py	2008-09-13 14:41:57 UTC (rev 653)
+++ trunk/reportbug/ui/gtk2_ui.py	2008-09-13 22:08:37 UTC (rev 654)
@@ -1096,7 +1096,6 @@
     def __init__ (self, application):
         gtk.Assistant.__init__ (self)
         self.set_title ('Reportbug')
-        self.set_icon_from_file (DEBIAN_LOGO)
         self.application = application
         self.showing_page = None
         self.requested_page = None
@@ -1265,6 +1264,7 @@
     sys.excepthook = ExceptionDialog.create_excepthook (oldhook)
 
     # GTK settings
+    gtk.window_set_default_icon_from_file (DEBIAN_LOGO)
     gtk.link_button_set_uri_hook (lambda button, uri: launch_browser (uri))
 
     application = ReportbugApplication ()