Ubuntu
rhythmbox package

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

  1. Quantal (12.10)
  2. quantal-201205140516
  3. Merge into quantal
Proposed by Ubuntu Package Importer
Status: Needs review
Proposed branch: lp:~ubuntu-branches/ubuntu/quantal/rhythmbox/quantal-201205140516
Merge into: lp:ubuntu/quantal/rhythmbox
Diff against target: 91 lines (+39/-16) (has conflicts)
3 files modified
debian/changelog (+18/-0)
debian/rhythmbox.install (+1/-1)
debian/source_rhythmbox.py (+20/-15)
Text conflict in debian/changelog
To merge this branch: bzr merge lp:~ubuntu-branches/ubuntu/quantal/rhythmbox/quantal-201205140516
Reviewer Review Type Date Requested Status
Ubuntu branches Pending
Review via email: mp+105608@code.launchpad.net

Description of the change

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)

To post a comment you must log in.

Unmerged revisions

210. By Bryce Harrington

* 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

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

208. By Bryce Harrington

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)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2012-05-14 16:11:13 +0000
3+++ debian/changelog 2012-05-14 05:21:19 +0000
4@@ -1,3 +1,4 @@
5+<<<<<<< TREE
6 rhythmbox (2.96-0ubuntu5) quantal; urgency=low
7
8 * debian/control:
9@@ -8,6 +9,23 @@
10
11 -- Robert Ancell <robert.ancell@canonical.com> Mon, 14 May 2012 16:11:13 +1200
12
13+=======
14+rhythmbox (2.96-0ubuntu5) UNRELEASED; urgency=low
15+
16+ * debian/rhythmbox.install: Fix installation of apport hook to correct
17+ directory. Otherwise, the hook won't be used when running ubuntu-bug
18+ rhythmbox.
19+ (LP: #992355)
20+ * debian/source_rhythmbox.py:
21+ - Improve categorization wording.
22+ (LP: #543948)
23+ - Only prompt user to specify type of bug if it isn't a crash.
24+ (I.e., if there is no stacktrace present.)
25+ (LP: #737598)
26+
27+ -- Bryce Harrington <bryce@ubuntu.com> Mon, 30 Apr 2012 19:56:25 -0700
28+
29+>>>>>>> MERGE-SOURCE
30 rhythmbox (2.96-0ubuntu4) precise; urgency=low
31
32 * debian/patches/git_mpris_playlists.patch:
33
34=== modified file 'debian/rhythmbox.install'
35--- debian/rhythmbox.install 2012-03-09 07:24:47 +0000
36+++ debian/rhythmbox.install 2012-05-14 05:21:19 +0000
37@@ -1,4 +1,4 @@
38-debian/source_rhythmbox.py usr/share/apport/package_hooks
39+debian/source_rhythmbox.py usr/share/apport/package-hooks
40 debian/rhythmbox-small.xpm usr/share/pixmaps
41 usr/bin
42 usr/lib/rhythmbox/rhythmbox-metadata
43
44=== modified file 'debian/source_rhythmbox.py'
45--- debian/source_rhythmbox.py 2011-12-16 13:45:33 +0000
46+++ debian/source_rhythmbox.py 2012-05-14 05:21:19 +0000
47@@ -27,24 +27,29 @@
48 if "ubuntuone" in stacktrace or "webkit" in stacktrace:
49 report.add_package_info("rhythmbox-ubuntuone-music-store")
50 return
51-
52-
53- 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)
54-
55- if response == None: # user cancelled
56- raise StopIteration
57-# TODO: port to gsettings
58+ else:
59+ response = ui.choice("How would you describe the issue?", [
60+ "problem with the interface",
61+ "problem with sound",
62+ "problem with playback of audio files",
63+ "problem with Ubuntu One Music Store",
64+ "other problem",
65+ ], False)
66+
67+ if response == None: # user cancelled
68+ raise StopIteration
69+# TODO: port to gsettings
70 # if response[0] == 0: # an issue about rhythmbox interface
71 # apport.hookutils.attach_gconf(report, 'rhythmbox')
72 # report['GConfNonDefault'] = mask_values(report['GConfNonDefault'])
73- if response[0] == 1: # the issue is a sound one
74- os.execlp('apport-bug', 'apport-bug', 'audio')
75- if response[0] == 2: # the issue is a codec one
76- report.add_package_info("libgstreamer0.10-0")
77- return
78- if response[0] == 3: # problem with the music store
79- report.add_package_info("rhythmbox-ubuntuone-music-store")
80- return
81+ if response[0] == 1: # the issue is a sound one
82+ os.execlp('apport-bug', 'apport-bug', 'audio')
83+ if response[0] == 2: # the issue is a codec one
84+ report.add_package_info("libgstreamer0.10-0")
85+ return
86+ if response[0] == 3: # problem with the music store
87+ report.add_package_info("rhythmbox-ubuntuone-music-store")
88+ return
89
90 report["LogAlsaMixer"] = apport.hookutils.command_output(["/usr/bin/amixer"])
91 report["GstreamerVersions"] = apport.hookutils.package_versions("gstreamer*")

Subscribers

People subscribed via source and target branches

to all changes: