Merge lp:~ubuntu-branches/ubuntu/quantal/rhythmbox/quantal-201205140516 into lp:ubuntu/quantal/rhythmbox

[Ubuntu Package Importer]

The package importer has detected a possible inconsistency between the package history in the archive and the history in bzr. As the archive is authoritative the importer has made lp:ubuntu/quantal/rhythmbox reflect what is in the archive and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/quantal/rhythmbox/quantal-201205140516. This merge proposal was created so that an Ubuntu developer can review the situations and perform a merge/upload if necessary. There are three typical cases where this can happen.
  1. Where someone pushes a change to bzr and someone else uploads the package without that change. This is the reason that this check is done by the importer. If this appears to be the case then a merge/upload should be done if the changes that were in bzr are still desirable.
  2. The importer incorrectly detected the above situation when someone made a change in bzr and then uploaded it.
  3. The importer incorrectly detected the above situation when someone just uploaded a package and didn't touch bzr.

If this case doesn't appear to be the first situation then set the status of the merge proposal to "Rejected" and help avoid the problem in future by filing a bug at https://bugs.launchpad.net/udd linking to this merge proposal.

(this is an automatically generated message)

Unmerged revisions

210. By Bryce Harrington on 2012-05-01

* debian/source_rhythmbox.py:
  - Only prompt user to specify type of bug if it isn't a crash.
    (I.e., if there is no stacktrace present.)
    (LP: #737598)

209. By Bryce Harrington on 2012-05-01

debian/source_rhythmbox.py: Improve categorization wording.
(LP: #543948)

208. By Bryce Harrington on 2012-05-01

debian/rhythmbox.install: Fix installation of apport hook to correct
directory. Otherwise, the hook won't be used when running ubuntu-bug
rhythmbox.
(LP: #992355)

=== modified file 'debian/changelog'
--- debian/changelog	2012-05-14 16:11:13 +0000
+++ debian/changelog	2012-05-14 05:21:19 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 rhythmbox (2.96-0ubuntu5) quantal; urgency=low
 
   * debian/control:
@@ -8,6 +9,23 @@
 
  -- Robert Ancell <[e-mail]>  Mon, 14 May 2012 16:11:13 +1200
 
+=======
+rhythmbox (2.96-0ubuntu5) UNRELEASED; urgency=low
+
+  * debian/rhythmbox.install: Fix installation of apport hook to correct
+    directory.  Otherwise, the hook won't be used when running ubuntu-bug
+    rhythmbox.
+    (LP: #992355)
+  * debian/source_rhythmbox.py:
+    - Improve categorization wording.
+      (LP: #543948)
+    - Only prompt user to specify type of bug if it isn't a crash.
+      (I.e., if there is no stacktrace present.)
+      (LP: #737598)
+
+ -- Bryce Harrington <[e-mail]>  Mon, 30 Apr 2012 19:56:25 -0700
+
+>>>>>>> MERGE-SOURCE
 rhythmbox (2.96-0ubuntu4) precise; urgency=low
 
   * debian/patches/git_mpris_playlists.patch:
 
=== modified file 'debian/rhythmbox.install'
--- debian/rhythmbox.install	2012-03-09 07:24:47 +0000
+++ debian/rhythmbox.install	2012-05-14 05:21:19 +0000
@@ -1,4 +1,4 @@
-debian/source_rhythmbox.py usr/share/apport/package_hooks
+debian/source_rhythmbox.py usr/share/apport/package-hooks
 debian/rhythmbox-small.xpm usr/share/pixmaps
 usr/bin
 usr/lib/rhythmbox/rhythmbox-metadata
 
=== modified file 'debian/source_rhythmbox.py'
--- debian/source_rhythmbox.py	2011-12-16 13:45:33 +0000
+++ debian/source_rhythmbox.py	2012-05-14 05:21:19 +0000
@@ -27,24 +27,29 @@
         if "ubuntuone" in stacktrace or "webkit" in stacktrace:
             report.add_package_info("rhythmbox-ubuntuone-music-store")
             return
-    
-
-    response = ui.choice("How would you describe the issue?", ["The rhythmbox interface is not working correctly", "No sound is being played", "Some audio files are not being played correctly", "The Ubuntu One Music Store is not working correctly"], False)
-
-    if response == None: # user cancelled
-        raise StopIteration
-# TODO: port to gsettings        
+    else:
+        response = ui.choice("How would you describe the issue?", [
+                "problem with the interface",
+                "problem with sound",
+                "problem with playback of audio files",
+                "problem with Ubuntu One Music Store",
+                "other problem",
+                ], False)
+
+        if response == None: # user cancelled
+            raise StopIteration
+# TODO: port to gsettings
 #    if response[0] == 0: # an issue about rhythmbox interface
 #        apport.hookutils.attach_gconf(report, 'rhythmbox')
 #        report['GConfNonDefault'] = mask_values(report['GConfNonDefault'])
-    if response[0] == 1: # the issue is a sound one
-        os.execlp('apport-bug', 'apport-bug', 'audio')
-    if response[0] == 2: # the issue is a codec one
-        report.add_package_info("libgstreamer0.10-0")
-        return
-    if response[0] == 3: # problem with the music store
-        report.add_package_info("rhythmbox-ubuntuone-music-store")
-        return
+        if response[0] == 1: # the issue is a sound one
+            os.execlp('apport-bug', 'apport-bug', 'audio')
+        if response[0] == 2: # the issue is a codec one
+            report.add_package_info("libgstreamer0.10-0")
+            return
+        if response[0] == 3: # problem with the music store
+            report.add_package_info("rhythmbox-ubuntuone-music-store")
+            return
 
     report["LogAlsaMixer"] = apport.hookutils.command_output(["/usr/bin/amixer"])
     report["GstreamerVersions"] = apport.hookutils.package_versions("gstreamer*")