[Pkg-cli-apps-commits] [SCM] banshee branch, ubuntu/maverick, updated. debian/1.7.2-1ubuntu1-2-gc22ef84

[Chow Loong Jin]

The following commit has been merged in the ubuntu/maverick branch:
commit 6f103b3eea3ec8bc9188dfcc3c80b16b70fce15c
Author: Didier Roche <didrocks at ubuntu.com>
Date:   Mon Jul 12 18:39:36 2010 +0200

    Imported Debian patch 1.7.2-1ubuntu2

diff --git a/debian/changelog b/debian/changelog
index f8bcd21..dd4d71d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+banshee (1.7.2-1ubuntu2) maverick; urgency=low
+
+  * add debian/patches/08_remove_unrelevant_media.patch:
+    Don't show "media" in netbook interface as this is unrelevant on non
+    meego interface (LP: #602759)
+
+ -- Didier Roche <didrocks at ubuntu.com>  Mon, 12 Jul 2010 18:39:36 +0200
+
 banshee (1.7.2-1ubuntu1) maverick; urgency=low
 
   * Merge from Debian Experimental, remaining changes:
diff --git a/debian/patches/08_remove_unrelevant_media.patch b/debian/patches/08_remove_unrelevant_media.patch
new file mode 100644
index 0000000..120ef94
--- /dev/null
+++ b/debian/patches/08_remove_unrelevant_media.patch
@@ -0,0 +1,17 @@
+Description: Don't show "media" in netbook interface as this is unrelevant in
+             non meego interface
+Bug: https://bugs.launchpad.net/ubuntu/+source/banshee/+bug/602759
+
+Index: banshee-1.7.2/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MediaPanelContents.cs
+===================================================================
+--- banshee-1.7.2.orig/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MediaPanelContents.cs	2010-07-12 17:49:11.107465002 +0200
++++ banshee-1.7.2/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MediaPanelContents.cs	2010-07-12 18:20:41.131465002 +0200
+@@ -70,7 +70,7 @@
+             RedrawOnAllocate = true;
+             AppPaintable = true;
+ 
+-            BuildHeader ();
++            //BuildHeader ();
+             BuildLibrary ();
+             BuildNowPlaying ();
+             BuildMessageBar ();
diff --git a/debian/patches/series b/debian/patches/series
index 1b43ccd..5086cfe 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,5 +5,6 @@
 05_show-a-empty-library-message-in-banshee.patch
 06_add-meego-desktop-file.patch
 07_enable-library-watch-by-default.patch
+08_remove_unrelevant_media.patch
 01_fix-icon-transparency.patch
 99_ltmain_as-needed.patch

-- 
banshee