Merge lp:~ubuntu-branches/ubuntu/lucid/gnome-control-center/lucid-201003081418 into lp:ubuntu/lucid/gnome-control-center

[James Westby]

The package history in the archive and the history in the bzr branch differ. As the archive is authoritative the history of lp:ubuntu/lucid/gnome-control-center now reflects that and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/lucid/gnome-control-center/lucid-201003081418. A merge should be performed if necessary.

[James Westby (james-w)]

Already included.

Unmerged revisions

133. By Daniel T Chen on 2010-03-07

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

=== modified file 'debian/changelog'
--- debian/changelog	2010-03-08 14:17:02 +0000
+++ debian/changelog	2010-03-08 14:22:21 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 gnome-control-center (1:2.29.92-0ubuntu1) lucid; urgency=low
 
   [ Alex Launi ]
@@ -13,6 +14,16 @@
 
  -- Didier Roche <[e-mail]>  Mon, 08 Mar 2010 14:17:02 +0100
 
+=======
+gnome-control-center (1:2.29.91-0ubuntu4) UNRELEASED; urgency=low
+
+  * debian/patches/112_banshee_in_media_dropdown.patch
+    - Update preferred applications xml file for banshee to use
+      banshee-1 instead of banshee executable (lp: #533888).
+
+ -- Alex Launi <[e-mail]>  Sun, 07 Mar 2010 12:44:20 -0500
+
+>>>>>>> MERGE-SOURCE
 gnome-control-center (1:2.29.91-0ubuntu3) lucid; urgency=low
 
   * debian/patches/03_use_libunique.patch:

=== added file 'debian/patches/112_banshee_in_media_dropdown.patch'
--- debian/patches/112_banshee_in_media_dropdown.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/112_banshee_in_media_dropdown.patch	2010-03-08 14:22:21 +0000
@@ -0,0 +1,15 @@
+Index: gnome-control-center/capplets/default-applications/gnome-default-applications.xml.in
+===================================================================
+--- gnome-control-center.orig/capplets/default-applications/gnome-default-applications.xml.in	2010-03-07 11:51:56.573220885 -0500
++++ gnome-control-center/capplets/default-applications/gnome-default-applications.xml.in	2010-03-07 11:53:41.000000000 -0500
+@@ -312,8 +312,8 @@
+   <media-players>
+     <media-player>
+       <_name>Banshee Music Player</_name>
+-      <executable>banshee</executable>
+-      <command>banshee</command>
++      <executable>banshee-1</executable>
++      <command>banshee-1</command>
+       <icon-name>music-player-banshee</icon-name>
+       <run-in-terminal>false</run-in-terminal>
+     </media-player>

=== renamed file 'debian/patches/112_banshee_in_media_dropdown.patch' => 'debian/patches/112_banshee_in_media_dropdown.patch.moved'
=== modified file 'debian/patches/series'
--- debian/patches/series	2010-03-08 14:17:02 +0000
+++ debian/patches/series	2010-03-08 14:22:21 +0000
@@ -1,3 +1,4 @@
+112_banshee_in_media_dropdown.patch
 01_remove_debian_default_applications.patch
 02_use_application_indicator.patch
 03_use_libunique.patch