Merge lp:~alexlauni/ubuntu/lucid/gnome-control-center/fix-533888 into lp:ubuntu/lucid/gnome-control-center

Proposed by Alex Launi
Status: Merged
Merged at revision: not available
Proposed branch: lp:~alexlauni/ubuntu/lucid/gnome-control-center/fix-533888
Merge into: lp:ubuntu/lucid/gnome-control-center
Diff against target: 44 lines (+24/-0)
3 files modified
debian/changelog (+8/-0)
debian/patches/112_banshee_in_media_dropdown.patch (+15/-0)
debian/patches/series (+1/-0)
To merge this branch: bzr merge lp:~alexlauni/ubuntu/lucid/gnome-control-center/fix-533888
Reviewer Review Type Date Requested Status
Daniel T Chen Approve
Registry Administrators Pending
Review via email: mp+20869@code.launchpad.net

Description of the change

Changes the executable and command strings for the banshee section of the preferred applications xml.in file from banshee to banshee-1.

To post a comment you must log in.
Revision history for this message
Daniel T Chen (crimsun) wrote :

Tweaked distribution field to reflect not-uploaded status; merged. Thanks for your contribution!

review: Approve

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 2010-03-05 16:22:06 +0000
3+++ debian/changelog 2010-03-07 17:50:28 +0000
4@@ -1,3 +1,11 @@
5+gnome-control-center (1:2.29.91-0ubuntu4) lucid; urgency=low
6+
7+ * debian/patches/112_banshee_in_media_dropdown.patch
8+ - Update preferred applications xml file for banshee to use
9+ banshee-1 instead of banshee executable (lp: #533888).
10+
11+ -- Alex Launi <alex.launi@gmail.com> Sun, 07 Mar 2010 12:44:20 -0500
12+
13 gnome-control-center (1:2.29.91-0ubuntu3) lucid; urgency=low
14
15 * debian/patches/03_use_libunique.patch:
16
17=== added file 'debian/patches/112_banshee_in_media_dropdown.patch'
18--- debian/patches/112_banshee_in_media_dropdown.patch 1970-01-01 00:00:00 +0000
19+++ debian/patches/112_banshee_in_media_dropdown.patch 2010-03-07 17:50:28 +0000
20@@ -0,0 +1,15 @@
21+Index: gnome-control-center/capplets/default-applications/gnome-default-applications.xml.in
22+===================================================================
23+--- gnome-control-center.orig/capplets/default-applications/gnome-default-applications.xml.in 2010-03-07 11:51:56.573220885 -0500
24++++ gnome-control-center/capplets/default-applications/gnome-default-applications.xml.in 2010-03-07 11:53:41.000000000 -0500
25+@@ -312,8 +312,8 @@
26+ <media-players>
27+ <media-player>
28+ <_name>Banshee Music Player</_name>
29+- <executable>banshee</executable>
30+- <command>banshee</command>
31++ <executable>banshee-1</executable>
32++ <command>banshee-1</command>
33+ <icon-name>music-player-banshee</icon-name>
34+ <run-in-terminal>false</run-in-terminal>
35+ </media-player>
36
37=== modified file 'debian/patches/series'
38--- debian/patches/series 2010-03-05 16:22:06 +0000
39+++ debian/patches/series 2010-03-07 17:50:28 +0000
40@@ -1,3 +1,4 @@
41+112_banshee_in_media_dropdown.patch
42 01_remove_debian_default_applications.patch
43 02_use_application_indicator.patch
44 03_use_libunique.patch

Subscribers

People subscribed via source and target branches

to all changes: