Merge lp:~brian-murray/ubiquity/bug-reporting-method into lp:ubiquity

[Brian Murray]

Ubiquity currently recommends that people go to +filebug for ubiquity in Launchpad and asks them to add their log files manually to the report. There is a fair bit of work being done in the ubiquity apport package hook to look for SQUASHFS errors in the syslog file and tag the bug report with the version of ubiquity used - not to mention the other information gathered by apport. So it seems to be that it'd be better if people used ubuntu-bug ubiquity rather than manually filing the bug report.

[Mario Limonciello (superm1)]

Why not go a step further and just ask them if they want to file a bug directly and actually call out ubuntu-bug?

[Robert Roth (evfool)]

Removing the _ from _Install Now might not be the best solution, as that is used for the Mnemonic. Somehow the mnemonic display is wrong, although the use_underline property is set on the button. By removing the _ we will lose the Mnemonic in both KDE and GTK (kde_ui uses text.replace('_','&',1) to get the & before the mnemonic), so there must be a better solution for fixing the _Install now problem.

[lp:~brian-murray/ubiquity/bug-reporting-method]

4791. By Brian Murray on 2011-08-09

remove changes to Install Now

4792. By Brian Murray on 2011-08-09

merge with upstream

[Brian Murray (brian-murray)]

I've reverted the Install Now change.

=== modified file 'debian/changelog'
--- debian/changelog	2011-08-09 08:33:05 +0000
+++ debian/changelog	2011-08-09 15:31:32 +0000
@@ -8,7 +8,10 @@
     Thanks Matthew Paul Thomas.
   * Merge PyGI branch. Ubiquity now uses PyGI and GTK+3.
 
- -- Colin Watson <[e-mail]>  Mon, 18 Jul 2011 12:22:46 +0100
+  [ Brian Murray ]
+  * Instead of sending people to +filebug recommend using apport
+
+ -- Brian Murray <[e-mail]>  Tue, 09 Aug 2011 08:04:40 -0700
 
 ubiquity (2.7.14) oneiric; urgency=low
 

=== modified file 'debian/ubiquity.templates'
--- debian/ubiquity.templates	2011-08-09 08:20:30 +0000
+++ debian/ubiquity.templates	2011-08-09 15:31:32 +0000
@@ -329,12 +329,11 @@
 Template: ubiquity/text/crash_text_label
 Type: text
 _Description:
- We're sorry; the installer crashed. Please file a new bug report at
- https://launchpad.net/ubuntu/+source/ubiquity/+filebug (do not attach your
- details to any existing bug) and a developer will attend to the problem as
- soon as possible. To help the developers understand what went wrong,
- include the following detail in your bug report, and attach the files
- /var/log/syslog and /var/log/partman:
+ We're sorry; the installer crashed. Please file a new bug report using
+ the command 'ubuntu-bug ubiquity' in a terminal. This will gather
+ information about your system and your installation process. The details
+ will be sent to our bug tracker and a developer will attend to the
+ problem as soon as possible. 
 
 Template: ubiquity/text/partition_button_new_label
 Type: text

=== modified file 'gui/gtk/ubiquity.ui'
--- gui/gtk/ubiquity.ui	2011-08-09 08:20:30 +0000
+++ gui/gtk/ubiquity.ui	2011-08-09 15:31:32 +0000
@@ -440,7 +440,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">We're sorry; the installer crashed. Please file a new bug report at https://launchpad.net/ubuntu/+source/ubiquity/+filebug (do not attach your details to any existing bug) and a developer will attend to the problem as soon as possible. To help the developers understand what went wrong, include the following detail in your bug report, and attach the files /var/log/syslog and /var/log/partman:</property>
+                    <property name="label" translatable="yes">We're sorry; the installer crashed. Please file a new bug report using the command 'ubuntu-bug ubiquity' in a terminal. This will gather information about your system and your installation process. The details will be sent to our bug tracker and a developer will attend to the problem as soon as possible.</property>
                     <property name="wrap">True</property>
                   </object>
                   <packing>

=== modified file 'gui/qt/crashdialog.ui'
--- gui/qt/crashdialog.ui	2008-08-08 14:22:31 +0000
+++ gui/qt/crashdialog.ui	2011-08-09 15:31:32 +0000
@@ -86,27 +86,7 @@
         </sizepolicy>
        </property>
        <property name="text" >
-        <string>We're sorry; the installer crashed. Please file a new bug report at</string>
-       </property>
-       <property name="alignment" >
-        <set>Qt::AlignVCenter</set>
-       </property>
-       <property name="wordWrap" >
-        <bool>true</bool>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QLabel" name="beastie_url" >
-       <property name="text" >
-        <string>&lt;a href="https://launchpad.net/ubuntu/+source/ubiquity/+filebug">https://launchpad.net/ubuntu/+source/ubiquity/+filebug&lt;/a></string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QLabel" name="textLabel1" >
-       <property name="text" >
-        <string>(do not attach your details to any existing bug) and a developer will attend to the problem as soon as possible. To help the developers understand what went wrong, include the following detail in your bug report, and attach the files /var/log/syslog and /var/log/partman:</string>
+        <string>We're sorry; the installer crashed. Please file a new bug report using the command 'ubuntu-bug ubiquity' in a terminal. This will gather information about your system and your installation process. The details will be sent to our bug tracker and a developer will attend to the problem as soon as possible.</string>
        </property>
        <property name="alignment" >
         <set>Qt::AlignVCenter</set>