[Pkg-cli-apps-commits] [SCM] banshee branch, experimental, updated. debian/1.7.4-1-27-ge8e258a
Chow Loong Jin
hyperair at ubuntu.com
Thu Sep 30 18:54:14 UTC 2010
The following commit has been merged in the experimental branch:
commit a961601f7fa14191aa35474b9608b25e080f9429
Author: Chow Loong Jin <hyperair at ubuntu.com>
Date: Fri Oct 1 01:42:52 2010 +0800
Import Ubuntu's upstreamable patches
* 01_Debranch-netbook-interface.patch
* 02_only-show-netbook-panel-on-request.patch
* 03_quit-only-on-explicit-shutdown-request.patch
* 04_enable-switching-between-the-2-interfaces.patch
* 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
diff --git a/debian/patches/01_Debranch-netbook-interface.patch b/debian/patches/01_Debranch-netbook-interface.patch
new file mode 100644
index 0000000..8bcbf00
--- /dev/null
+++ b/debian/patches/01_Debranch-netbook-interface.patch
@@ -0,0 +1,74 @@
+From d3a51c96cd1f29922be376a0374020e6c2fe2cba Mon Sep 17 00:00:00 2001
+From: Didier Roche <didrocks at ubuntu.com>
+Date: Mon, 5 Jul 2010 13:06:51 +0200
+Subject: [PATCH 1/4] Debrand the interface to "Netbook"
+Upstream bug report: https://bugzilla.gnome.org/show_bug.cgi?id=623588
+
+---
+ .../Banshee.MeeGo/Banshee.MeeGo/MeeGoPanel.cs | 12 ++++++------
+ .../Banshee.MeeGo/Banshee.MeeGo/MeeGoService.cs | 2 +-
+ 2 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MeeGoPanel.cs b/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MeeGoPanel.cs
+index eaad0a3..6fad319 100644
+--- a/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MeeGoPanel.cs
++++ b/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MeeGoPanel.cs
+@@ -48,7 +48,7 @@ namespace Banshee.MeeGo
+ public MeeGoPanel ()
+ {
+ if (Instance != null) {
+- throw new InvalidOperationException ("Only one MeeGoPanel instance should exist");
++ throw new InvalidOperationException ("Only one Netbook Panel (MeegoPanel) instance should exist");
+ }
+
+ Instance = this;
+@@ -56,7 +56,7 @@ namespace Banshee.MeeGo
+ var timer = Log.DebugTimerStart ();
+
+ try {
+- Log.Debug ("Attempting to create MeeGo toolbar panel");
++ Log.Debug ("Attempting to create Netbook toolbar panel");
+ embedded_panel = new PanelGtk ("banshee", Catalog.GetString ("media"),
+ null, "media-button", true);
+ embedded_panel.ShowBeginEvent += (o, e) => {
+@@ -70,12 +70,12 @@ namespace Banshee.MeeGo
+ }
+ } catch (Exception e) {
+ if (!(e is DllNotFoundException)) {
+- Log.Exception ("Could not bind to MeeGo panel", e);
++ Log.Exception ("Could not bind to Netbook panel", e);
+ }
+- window_panel = new Gtk.Window ("MeeGo Media Panel");
++ window_panel = new Gtk.Window ("Netbook Media Panel");
+ }
+
+- Log.DebugTimerPrint (timer, "MeeGo panel created: {0}");
++ Log.DebugTimerPrint (timer, "Netbook panel created: {0}");
+ }
+
+ public void Dispose ()
+@@ -87,7 +87,7 @@ namespace Banshee.MeeGo
+ var timer = Log.DebugTimerStart ();
+ Contents = new MediaPanelContents ();
+ Contents.ShowAll ();
+- Log.DebugTimerPrint (timer, "MeeGo panel contents created: {0}");
++ Log.DebugTimerPrint (timer, "Netbook panel contents created: {0}");
+
+ if (embedded_panel != null) {
+ embedded_panel.SetChild (Contents);
+diff --git a/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MeeGoService.cs b/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MeeGoService.cs
+index ffac0f1..4d0ad52 100644
+--- a/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MeeGoService.cs
++++ b/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MeeGoService.cs
+@@ -100,7 +100,7 @@ namespace Banshee.MeeGo
+ panel = MeeGoPanel.Instance ?? new MeeGoPanel ();
+
+ if (panel == null) {
+- Log.Warning ("MeeGo extension initialized without a panel");
++ Log.Warning ("Netbook extension initialized without a panel");
+ return;
+ }
+
+--
+1.7.1
+
diff --git a/debian/patches/02_only-show-netbook-panel-on-request.patch b/debian/patches/02_only-show-netbook-panel-on-request.patch
new file mode 100644
index 0000000..090a9fb
--- /dev/null
+++ b/debian/patches/02_only-show-netbook-panel-on-request.patch
@@ -0,0 +1,32 @@
+From 81958438f88a673a4521f7f47862373bbca0eb9c Mon Sep 17 00:00:00 2001
+From: Didier Roche <didrocks at ubuntu.com>
+Date: Mon, 5 Jul 2010 13:12:49 +0200
+Subject: [PATCH 2/4] Only show panel on --client=MeeGo and don't show when banshee is called
+Upstream bug report: https://bugzilla.gnome.org/show_bug.cgi?id=623588
+
+---
+ .../Banshee.MeeGo/Banshee.MeeGo/MeeGoService.cs | 4 +++-
+ 1 files changed, 3 insertions(+), 1 deletions(-)
+
+diff --git a/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MeeGoService.cs b/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MeeGoService.cs
+index 4d0ad52..bb7b31a 100644
+--- a/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MeeGoService.cs
++++ b/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MeeGoService.cs
+@@ -97,11 +97,13 @@ namespace Banshee.MeeGo
+ // assume we're probably not really running in a MeeGo environment,
+ // so we just create the panel here (which is likely to just be
+ // a separate top-level window for testing).
+- panel = MeeGoPanel.Instance ?? new MeeGoPanel ();
++ panel = MeeGoPanel.Instance;
+
+ if (panel == null) {
+ Log.Warning ("Netbook extension initialized without a panel");
+ return;
++ } else {
++ elements_service.PrimaryWindow.Hide ();
+ }
+
+ panel.BuildContents ();
+--
+1.7.1
+
diff --git a/debian/patches/03_quit-only-on-explicit-shutdown-request.patch b/debian/patches/03_quit-only-on-explicit-shutdown-request.patch
new file mode 100644
index 0000000..3551787
--- /dev/null
+++ b/debian/patches/03_quit-only-on-explicit-shutdown-request.patch
@@ -0,0 +1,29 @@
+From cee1d134ce50e807726a5f2fe15e297b2dad74c2 Mon Sep 17 00:00:00 2001
+From: Didier Roche <didrocks at ubuntu.com>
+Date: Mon, 5 Jul 2010 13:14:37 +0200
+Subject: [PATCH 3/4] quit only on explicit shutdown request
+Upstream bug report: https://bugzilla.gnome.org/show_bug.cgi?id=623588
+
+---
+ .../Banshee.MeeGo/Banshee.MeeGo/MeeGoService.cs | 5 -----
+ 1 files changed, 0 insertions(+), 5 deletions(-)
+
+diff --git a/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MeeGoService.cs b/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MeeGoService.cs
+index bb7b31a..5aae94e 100644
+--- a/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MeeGoService.cs
++++ b/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MeeGoService.cs
+@@ -113,11 +113,6 @@ namespace Banshee.MeeGo
+ return true;
+ };
+
+- // Since the Panel is running, we don't actually ever want to quit!
+- Banshee.ServiceStack.Application.ShutdownRequested += () => {
+- elements_service.PrimaryWindow.Hide ();
+- return false;
+- };
+ }
+
+ public void PresentPrimaryInterface ()
+--
+1.7.1
+
diff --git a/debian/patches/04_enable-switching-between-the-2-interfaces.patch b/debian/patches/04_enable-switching-between-the-2-interfaces.patch
new file mode 100644
index 0000000..456a844
--- /dev/null
+++ b/debian/patches/04_enable-switching-between-the-2-interfaces.patch
@@ -0,0 +1,144 @@
+From a362d03054f909be548f919f04a8b2b4bd0fd2e8 Mon Sep 17 00:00:00 2001
+From: Didier Roche <didrocks at ubuntu.com>
+Date: Mon, 5 Jul 2010 13:15:27 +0200
+Subject: [PATCH 4/4] enable switching between the 2 interfaces
+
+This enable switching between the 2 interfaces, even when the classic interface
+is started.
+---
+ .../Resources/core-ui-actions-layout.xml | 1 +
+ .../Banshee.MeeGo/Banshee.MeeGo/MeeGoPanel.cs | 9 ++++
+ .../Banshee.MeeGo/Banshee.MeeGo/MeeGoService.cs | 42 ++++++++++++++++++-
+ 3 files changed, 49 insertions(+), 3 deletions(-)
+
+diff --git a/src/Core/Banshee.ThickClient/Resources/core-ui-actions-layout.xml b/src/Core/Banshee.ThickClient/Resources/core-ui-actions-layout.xml
+index b155bff..260f4f0 100644
+--- a/src/Core/Banshee.ThickClient/Resources/core-ui-actions-layout.xml
++++ b/src/Core/Banshee.ThickClient/Resources/core-ui-actions-layout.xml
+@@ -5,6 +5,7 @@
+ <placeholder name="NextArrowButton"/>
+ <placeholder name="SeekSlider"/>
+ <placeholder name="TrackInfoDisplay"/>
++ <placeholder name="ExtensionToolBarPlaceHolder"/>
+ <placeholder name="SourceActions">
+ <toolitem name="RefreshSmartPlaylist" action="RefreshSmartPlaylistAction"/>
+ </placeholder>
+diff --git a/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MeeGoPanel.cs b/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MeeGoPanel.cs
+index 6fad319..9f16ba7 100644
+--- a/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MeeGoPanel.cs
++++ b/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MeeGoPanel.cs
+@@ -105,9 +105,18 @@ namespace Banshee.MeeGo
+
+ public void Hide ()
+ {
++ window_panel.Hide ();
+ if (embedded_panel != null) {
+ embedded_panel.Hide ();
+ }
+ }
++
++ public void Show ()
++ {
++ window_panel.Show ();
++ if (embedded_panel != null) {
++ embedded_panel.Show ();
++ }
++ }
+ }
+ }
+diff --git a/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MeeGoService.cs b/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MeeGoService.cs
+index 5aae94e..16abd6b 100644
+--- a/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MeeGoService.cs
++++ b/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MeeGoService.cs
+@@ -26,6 +26,7 @@
+ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ //
+
++using Mono.Unix;
+ using System;
+ using Gtk;
+ using MeeGo.Panel;
+@@ -38,6 +39,7 @@ using Banshee.Sources;
+ using Banshee.ServiceStack;
+ using Banshee.MediaEngine;
+ using Banshee.Gui;
++using Banshee.Gui.Widgets;
+
+ namespace Banshee.MeeGo
+ {
+@@ -84,6 +86,7 @@ namespace Banshee.MeeGo
+ }
+
+ Initialize ();
++ AddSwitchToPrimaryInterface ();
+
+ ServiceManager.ServiceStarted -= OnServiceStarted;
+
+@@ -100,12 +103,12 @@ namespace Banshee.MeeGo
+ panel = MeeGoPanel.Instance;
+
+ if (panel == null) {
+- Log.Warning ("Netbook extension initialized without a panel");
++ Log.Information ("Netbook extension initialized with hidden panel");
++ //AddSwitchToPrimaryInterface ();
+ return;
+- } else {
+- elements_service.PrimaryWindow.Hide ();
+ }
+
++ elements_service.PrimaryWindow.Hide ();
+ panel.BuildContents ();
+
+ elements_service.PrimaryWindowClose = () => {
+@@ -115,8 +118,30 @@ namespace Banshee.MeeGo
+
+ }
+
++ private void AddSwitchToPrimaryInterface ()
++ {
++ // Add switcher to primary interface:
++ var app_button = new Button (new Image () {
++ IconSize = (int)IconSize.LargeToolbar,
++ IconName = "media-player-banshee"
++ }) {
++ TooltipText = Catalog.GetString ("Show the Netbook interface")
++ };
++ app_button.Clicked += (o, e) => {
++ //ServiceManager.SourceManager.SetActiveSource (ServiceManager.SourceManager.MusicLibrary);
++ ServiceManager.Get<MeeGoService> ().PresentNetbookInterface ();
++ };
++ Toolbar header_toolbar;
++ InterfaceActionService action_service;
++ action_service = ServiceManager.Get<InterfaceActionService> ();
++ header_toolbar = (Toolbar)action_service.UIManager.GetWidget ("/HeaderToolbar");
++ app_button.ShowAll ();
++ action_service.PopulateToolbarPlaceholder (header_toolbar, "/HeaderToolbar/ExtensionToolBarPlaceHolder", app_button);
++ }
++
+ public void PresentPrimaryInterface ()
+ {
++ Log.Information ("Switch to traditional interface");
+ elements_service.PrimaryWindow.Maximize ();
+ elements_service.PrimaryWindow.Present ();
+ if (panel != null) {
+@@ -124,6 +149,17 @@ namespace Banshee.MeeGo
+ }
+ }
+
++ public void PresentNetbookInterface ()
++ {
++ Log.Information ("Switch to Netbook interface");
++ if (panel == null) {
++ panel = new MeeGoPanel ();
++ Initialize ();
++ }
++ panel.Show ();
++ elements_service.PrimaryWindow.Hide ();
++ }
++
+ public void Dispose ()
+ {
+ if (panel != null) {
+--
+1.7.1
+
diff --git a/debian/patches/05_show-a-empty-library-message-in-banshee.patch b/debian/patches/05_show-a-empty-library-message-in-banshee.patch
new file mode 100644
index 0000000..17a0977
--- /dev/null
+++ b/debian/patches/05_show-a-empty-library-message-in-banshee.patch
@@ -0,0 +1,70 @@
+From 5543c28330668e5290518cade47b79ad966d404c Mon Sep 17 00:00:00 2001
+From: Didier Roche <didrocks at ubuntu.com>
+Date: Mon, 5 Jul 2010 13:16:55 +0200
+Upstream bug report: https://bugzilla.gnome.org/show_bug.cgi?id=623588
+Subject: [PATCH 5/5] show a empty library message in banshee
+
+This enables showing to banshee and netbook interface a message if the library
+us empty (Bertrand Lorentz and Alex Launi)
+---
+ .../Banshee.Library/MusicLibrarySource.cs | 9 +++++++++
+ .../Banshee.MeeGo/MediaPanelContents.cs | 12 +++++++++++-
+ 2 files changed, 20 insertions(+), 1 deletions(-)
+
+Index: banshee.git/src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs
+===================================================================
+--- banshee.git.orig/src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs 2010-09-06 18:33:02.595809037 +0100
++++ banshee.git/src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs 2010-09-06 18:33:18.868187362 +0100
+@@ -85,6 +85,15 @@
+ DatabaseTrackModel.Reload ();
+ }
+ ));
++
++ DatabaseTrackModel.Reloaded += delegate {
++ if (TrackModel.Count == 0) {
++ SetStatus (String.Format ("Please move your music to {0}", GetDefaultBaseDirectory ()),
++ false, false, "dialog-info");
++ } else {
++ HideStatus ();
++ }
++ };
+ }
+
+ public override string GetPluralItemCountString (int count)
+Index: banshee.git/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MediaPanelContents.cs
+===================================================================
+--- banshee.git.orig/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MediaPanelContents.cs 2010-09-06 18:33:02.585807567 +0100
++++ banshee.git/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MediaPanelContents.cs 2010-09-06 18:33:18.868187362 +0100
+@@ -62,7 +62,7 @@
+ {
+ }
+
+- public MediaPanelContents () : base (2, 2, false)
++ public MediaPanelContents () : base (3, 2, false)
+ {
+ BorderWidth = 5;
+ RowSpacing = 6;
+@@ -73,6 +73,7 @@
+ BuildHeader ();
+ BuildLibrary ();
+ BuildNowPlaying ();
++ BuildMessageBar ();
+ ConnectEvents ();
+
+ SetSource (ServiceManager.SourceManager.ActiveSource);
+@@ -189,6 +190,15 @@
+ 0, 0);
+ }
+
++ private void BuildMessageBar ()
++ {
++ ConnectedMessageBar bar = new ConnectedMessageBar ();
++ Attach (bar, 0, 2, 2, 3,
++ AttachOptions.Expand | AttachOptions.Fill,
++ AttachOptions.Shrink, 0, 0);
++ bar.ShowAll ();
++ }
++
+ private ScrolledWindow SetupView (Widget view)
+ {
+ var scrolled = new ScrolledWindow () {
diff --git a/debian/patches/06_add-meego-desktop-file.patch b/debian/patches/06_add-meego-desktop-file.patch
new file mode 100644
index 0000000..bce53be
--- /dev/null
+++ b/debian/patches/06_add-meego-desktop-file.patch
@@ -0,0 +1,88 @@
+Index: banshee/src/Extensions/Banshee.MeeGo/Makefile.am
+===================================================================
+--- banshee.orig/src/Extensions/Banshee.MeeGo/Makefile.am 2010-09-18 14:13:50.000000000 +0800
++++ banshee/src/Extensions/Banshee.MeeGo/Makefile.am 2010-09-18 14:13:55.420497653 +0800
+@@ -37,7 +37,8 @@
+ com.meego.UX.Shell.Panels.banshee.service: com.meego.UX.Shell.Panels.banshee.service.in $(top_builddir)/config.log
+ sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
+
+-desktopfiles_in_files = meego-panel-banshee.desktop.in
++desktopfiles_in_files = meego-panel-banshee.desktop.in \
++ banshee-1.desktop.in
+ desktopfiles_files = $(desktopfiles_in_files:.desktop.in=.desktop)
+ desktopfilesdir = $(datadir)/mutter-meego/panels
+ desktopfiles_DATA = $(desktopfiles_files)
+@@ -48,7 +49,9 @@
+ clean-local:
+ rm -f com.meego.UX.Shell.Panels.banshee.service \
+ meego-panel-banshee.desktop \
+- meego-panel-banshee.desktop.in
++ meego-panel-banshee.desktop.in \
++ banshee-1.desktop \
++ banshee-1.desktop.in
+
+ else
+ EXTRA_DIST = $(SOURCES) $(RESOURCES)
+@@ -59,3 +62,4 @@
+ meego-panel-banshee \
+ com.meego.UX.Shell.Panels.banshee.service.in \
+ meego-panel-banshee.desktop.in.in
++ banshee-1.desktop.in.in
+Index: banshee/src/Extensions/Banshee.MeeGo/Makefile.in
+===================================================================
+--- banshee.orig/src/Extensions/Banshee.MeeGo/Makefile.in 2010-09-18 14:13:50.000000000 +0800
++++ banshee/src/Extensions/Banshee.MeeGo/Makefile.in 2010-09-18 14:14:32.482118523 +0800
+@@ -627,12 +627,14 @@
+ @HAVE_MEEGO_FALSE at EXTRA_DIST = $(SOURCES) $(RESOURCES) \
+ @HAVE_MEEGO_FALSE@ Banshee.MeeGo.dll.config meego-panel-banshee \
+ @HAVE_MEEGO_FALSE@ com.meego.UX.Shell.Panels.banshee.service.in \
+- at HAVE_MEEGO_FALSE@ meego-panel-banshee.desktop.in.in
++ at HAVE_MEEGO_FALSE@ meego-panel-banshee.desktop.in.in \
++ at HAVE_MEEGO_FALSE@ banshee-1.desktop.in.in
+ @HAVE_MEEGO_TRUE at EXTRA_DIST = $(SOURCES_BUILD) $(RESOURCES_EXPANDED) \
+ @HAVE_MEEGO_TRUE@ $(THEME_ICONS_SOURCE) \
+ @HAVE_MEEGO_TRUE@ Banshee.MeeGo.dll.config meego-panel-banshee \
+ @HAVE_MEEGO_TRUE@ com.meego.UX.Shell.Panels.banshee.service.in \
+- at HAVE_MEEGO_TRUE@ meego-panel-banshee.desktop.in.in
++ at HAVE_MEEGO_TRUE@ meego-panel-banshee.desktop.in.in \
++ at HAVE_MEEGO_TRUE@ banshee-1.desktop.in.in
+ @HAVE_MEEGO_TRUE at CLEANFILES = $(OUTPUT_FILES)
+ @HAVE_MEEGO_TRUE at DISTCLEANFILES = *.pidb
+ @HAVE_MEEGO_TRUE at MAINTAINERCLEANFILES = Makefile.in
+@@ -640,7 +642,7 @@
+ @HAVE_MEEGO_TRUE at panel_SCRIPTS = meego-panel-banshee
+ @HAVE_MEEGO_TRUE at servicedir = $(datadir)/dbus-1/services
+ @HAVE_MEEGO_TRUE at service_DATA = com.meego.UX.Shell.Panels.banshee.service
+- at HAVE_MEEGO_TRUE@desktopfiles_in_files = meego-panel-banshee.desktop.in
++ at HAVE_MEEGO_TRUE@desktopfiles_in_files = meego-panel-banshee.desktop.in banshee-1.desktop.in
+ @HAVE_MEEGO_TRUE at desktopfiles_files = $(desktopfiles_in_files:.desktop.in=.desktop)
+ @HAVE_MEEGO_TRUE at desktopfilesdir = $(datadir)/mutter-meego/panels
+ @HAVE_MEEGO_TRUE at desktopfiles_DATA = $(desktopfiles_files)
+@@ -963,7 +965,10 @@
+ @HAVE_MEEGO_TRUE at clean-local:
+ @HAVE_MEEGO_TRUE@ rm -f com.meego.UX.Shell.Panels.banshee.service \
+ @HAVE_MEEGO_TRUE@ meego-panel-banshee.desktop \
+- at HAVE_MEEGO_TRUE@ meego-panel-banshee.desktop.in
++ at HAVE_MEEGO_TRUE@ meego-panel-banshee.desktop.in \
++ at HAVE_MEEGO_TRUE@ banshee-1.desktop \
++ at HAVE_MEEGO_TRUE@ banshee-1.desktop.in
++
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
+Index: banshee/src/Extensions/Banshee.MeeGo/banshee-1.desktop.in.in
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ banshee/src/Extensions/Banshee.MeeGo/banshee-1.desktop.in.in 2010-09-18 14:13:55.430498112 +0800
+@@ -0,0 +1,11 @@
++[Desktop Entry]
++_Name=Banshee Netbook
++_GenericName=Netbook Media Player
++_X-GNOME-FullName=Netbook Banshee Media Player
++_Comment=Play and organize your media collection
++Exec=banshee --client=MeeGo
++Terminal=false
++Type=Application
++Icon=media-player-banshee
++Categories=GNOME;Audio;Music;Player;AudioVideo;
++StartupNotify=true
diff --git a/debian/patches/07_enable-library-watch-by-default.patch b/debian/patches/07_enable-library-watch-by-default.patch
new file mode 100644
index 0000000..f1fba45
--- /dev/null
+++ b/debian/patches/07_enable-library-watch-by-default.patch
@@ -0,0 +1,13 @@
+Index: banshee.git/src/Extensions/Banshee.LibraryWatcher/Banshee.LibraryWatcher.addin.xml
+===================================================================
+--- banshee.git.orig/src/Extensions/Banshee.LibraryWatcher/Banshee.LibraryWatcher.addin.xml 2010-09-06 18:31:43.000000000 +0100
++++ banshee.git/src/Extensions/Banshee.LibraryWatcher/Banshee.LibraryWatcher.addin.xml 2010-09-06 18:38:20.102209984 +0100
+@@ -8,7 +8,7 @@
+ description="Automatically update music and video libraries"
+ author="Christian Martellini, Alexander Hixon, Alexander Kojevnikov"
+ url="http://banshee.fm/"
+- defaultEnabled="false">
++ defaultEnabled="true">
+
+ <Dependencies>
+ <Addin id="Banshee.Services" version="1.0"/>
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 2497acb..e343e61 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,9 @@
+01_Debranch-netbook-interface.patch
+02_only-show-netbook-panel-on-request.patch
+03_quit-only-on-explicit-shutdown-request.patch
+04_enable-switching-between-the-2-interfaces.patch
+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
99_ltmain_as-needed.patch
--
banshee
More information about the Pkg-cli-apps-commits
mailing list