[Pkg-cli-apps-commits] [SCM] banshee branch, experimental, updated. debian/2.3.3-1-9-g2c6b2b7
Chow Loong Jin
hyperair at debian.org
Fri Jan 20 17:19:37 UTC 2012
The following commit has been merged in the experimental branch:
commit 8c8b907565297b86ff0371d6b4e5292dac512364
Author: Chow Loong Jin <hyperair at debian.org>
Date: Fri Jan 20 13:12:10 2012 +0800
Refresh all patches with gbp-pq
diff --git a/debian/patches/01_Debranch-netbook-interface.patch b/debian/patches/0001-Debrand-the-interface-to-Netbook.patch
similarity index 95%
rename from debian/patches/01_Debranch-netbook-interface.patch
rename to debian/patches/0001-Debrand-the-interface-to-Netbook.patch
index 8bcbf00..cc211fe 100644
--- a/debian/patches/01_Debranch-netbook-interface.patch
+++ b/debian/patches/0001-Debrand-the-interface-to-Netbook.patch
@@ -1,9 +1,8 @@
-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
+Subject: 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 +-
@@ -70,5 +69,3 @@ index ffac0f1..4d0ad52 100644
}
--
-1.7.1
-
diff --git a/debian/patches/02_only-show-netbook-panel-on-request.patch b/debian/patches/0002-Only-show-panel-on-client-MeeGo-and-don-t-show-when-.patch
similarity index 82%
rename from debian/patches/02_only-show-netbook-panel-on-request.patch
rename to debian/patches/0002-Only-show-panel-on-client-MeeGo-and-don-t-show-when-.patch
index 090a9fb..d3e9f1c 100644
--- a/debian/patches/02_only-show-netbook-panel-on-request.patch
+++ b/debian/patches/0002-Only-show-panel-on-client-MeeGo-and-don-t-show-when-.patch
@@ -1,9 +1,9 @@
-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
+Subject: Only show panel on --client=MeeGo and don't show when banshee is
+ called
+Bug: https://bugzilla.gnome.org/show_bug.cgi?id=623588
---
.../Banshee.MeeGo/Banshee.MeeGo/MeeGoService.cs | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
@@ -28,5 +28,3 @@ index 4d0ad52..bb7b31a 100644
panel.BuildContents ();
--
-1.7.1
-
diff --git a/debian/patches/03_quit-only-on-explicit-shutdown-request.patch b/debian/patches/0003-Quit-only-on-explicit-shutdown-request.patch
similarity index 81%
rename from debian/patches/03_quit-only-on-explicit-shutdown-request.patch
rename to debian/patches/0003-Quit-only-on-explicit-shutdown-request.patch
index 3551787..eaa18d3 100644
--- a/debian/patches/03_quit-only-on-explicit-shutdown-request.patch
+++ b/debian/patches/0003-Quit-only-on-explicit-shutdown-request.patch
@@ -1,9 +1,8 @@
-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
+Subject: Quit only on explicit shutdown request
+Bug: https://bugzilla.gnome.org/show_bug.cgi?id=623588
---
.../Banshee.MeeGo/Banshee.MeeGo/MeeGoService.cs | 5 -----
1 files changed, 0 insertions(+), 5 deletions(-)
@@ -25,5 +24,3 @@ index bb7b31a..5aae94e 100644
public void PresentPrimaryInterface ()
--
-1.7.1
-
diff --git a/debian/patches/04_enable-switching-between-the-2-interfaces.patch b/debian/patches/0004-Enable-switching-between-the-2-interfaces.patch
similarity index 94%
rename from debian/patches/04_enable-switching-between-the-2-interfaces.patch
rename to debian/patches/0004-Enable-switching-between-the-2-interfaces.patch
index 456a844..d2bba3b 100644
--- a/debian/patches/04_enable-switching-between-the-2-interfaces.patch
+++ b/debian/patches/0004-Enable-switching-between-the-2-interfaces.patch
@@ -1,9 +1,8 @@
-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
+Subject: Enable switching between the 2 interfaces
-This enable switching between the 2 interfaces, even when the classic interface
+This enables switching between the 2 interfaces, even when the classic interface
is started.
---
.../Resources/core-ui-actions-layout.xml | 1 +
@@ -12,7 +11,7 @@ is started.
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
+index 7908e13..0b8edb0 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 @@
@@ -47,7 +46,7 @@ index 6fad319..9f16ba7 100644
}
}
diff --git a/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MeeGoService.cs b/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MeeGoService.cs
-index 5aae94e..16abd6b 100644
+index 5aae94e..d615b4e 100644
--- a/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MeeGoService.cs
+++ b/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MeeGoService.cs
@@ -26,6 +26,7 @@
@@ -140,5 +139,3 @@ index 5aae94e..16abd6b 100644
{
if (panel != null) {
--
-1.7.1
-
diff --git a/debian/patches/0005-Add-Meego-desktop-file.patch b/debian/patches/0005-Add-Meego-desktop-file.patch
new file mode 100644
index 0000000..a6e6bab
--- /dev/null
+++ b/debian/patches/0005-Add-Meego-desktop-file.patch
@@ -0,0 +1,57 @@
+From: Chow Loong Jin <hyperair at debian.org>
+Date: Fri, 20 Jan 2012 23:14:39 +0800
+Subject: Add Meego desktop file
+
+---
+ src/Extensions/Banshee.MeeGo/Makefile.am | 8 ++++++--
+ src/Extensions/Banshee.MeeGo/banshee.desktop.in.in | 11 +++++++++++
+ 2 files changed, 17 insertions(+), 2 deletions(-)
+ create mode 100644 src/Extensions/Banshee.MeeGo/banshee.desktop.in.in
+
+diff --git a/src/Extensions/Banshee.MeeGo/Makefile.am b/src/Extensions/Banshee.MeeGo/Makefile.am
+index bb42b94..de4076b 100644
+--- a/src/Extensions/Banshee.MeeGo/Makefile.am
++++ b/src/Extensions/Banshee.MeeGo/Makefile.am
+@@ -37,7 +37,8 @@ service_DATA = com.meego.UX.Shell.Panels.banshee.service
+ 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.desktop.in
+ desktopfiles_files = $(desktopfiles_in_files:.desktop.in=.desktop)
+ desktopfilesdir = $(MEEGO_PANELS_DIR)
+ desktopfiles_DATA = $(desktopfiles_files)
+@@ -52,10 +53,13 @@ endif
+ 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.desktop \
++ banshee.desktop.in
+
+ EXTRA_DIST += \
+ Banshee.MeeGo.dll.config \
+ meego-panel-banshee \
+ com.meego.UX.Shell.Panels.banshee.service.in \
+ meego-panel-banshee.desktop.in.in
++ banshee.desktop.in.in
+diff --git a/src/Extensions/Banshee.MeeGo/banshee.desktop.in.in b/src/Extensions/Banshee.MeeGo/banshee.desktop.in.in
+new file mode 100644
+index 0000000..edff676
+--- /dev/null
++++ b/src/Extensions/Banshee.MeeGo/banshee.desktop.in.in
+@@ -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/0006-Enable-MPRIS-extension-by-default.patch b/debian/patches/0006-Enable-MPRIS-extension-by-default.patch
new file mode 100644
index 0000000..b2f950e
--- /dev/null
+++ b/debian/patches/0006-Enable-MPRIS-extension-by-default.patch
@@ -0,0 +1,22 @@
+From: Chow Loong Jin <hyperair at debian.org>
+Date: Fri, 20 Jan 2012 23:14:39 +0800
+Subject: Enable MPRIS extension by default
+
+---
+ .../Banshee.Mpris/Banshee.Mpris.addin.xml | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/Extensions/Banshee.Mpris/Banshee.Mpris.addin.xml b/src/Extensions/Banshee.Mpris/Banshee.Mpris.addin.xml
+index a97cfd1..730cbb0 100644
+--- a/src/Extensions/Banshee.Mpris/Banshee.Mpris.addin.xml
++++ b/src/Extensions/Banshee.Mpris/Banshee.Mpris.addin.xml
+@@ -8,7 +8,7 @@
+ description="Control Banshee using the MPRIS D-Bus interface."
+ author="John Millikin, Bertrand Lorentz"
+ category="Utilities"
+- defaultEnabled="false">
++ defaultEnabled="true">
+
+ <Dependencies>
+ <Addin id="Banshee.Services" version="1.0" />
+--
diff --git a/debian/patches/0007-Remove-irrelevant-media.patch b/debian/patches/0007-Remove-irrelevant-media.patch
new file mode 100644
index 0000000..92755a8
--- /dev/null
+++ b/debian/patches/0007-Remove-irrelevant-media.patch
@@ -0,0 +1,22 @@
+From: Chow Loong Jin <hyperair at debian.org>
+Date: Fri, 20 Jan 2012 23:14:39 +0800
+Subject: Remove irrelevant media
+
+---
+ .../Banshee.MeeGo/MediaPanelContents.cs | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MediaPanelContents.cs b/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MediaPanelContents.cs
+index e67bc7e..ca6e334 100644
+--- a/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MediaPanelContents.cs
++++ b/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MediaPanelContents.cs
+@@ -71,7 +71,7 @@ namespace Banshee.MeeGo
+ RedrawOnAllocate = true;
+ AppPaintable = true;
+
+- BuildHeader ();
++ //BuildHeader ();
+ BuildLibrary ();
+ BuildNowPlaying ();
+ ConnectEvents ();
+--
diff --git a/debian/patches/0001-Revert-ArtworkManager-Cache-null-artwork-for-fast-lo.patch b/debian/patches/0008-Revert-ArtworkManager-Cache-null-artwork-for-fast-lo.patch
similarity index 75%
rename from debian/patches/0001-Revert-ArtworkManager-Cache-null-artwork-for-fast-lo.patch
rename to debian/patches/0008-Revert-ArtworkManager-Cache-null-artwork-for-fast-lo.patch
index d931b9d..9bee83d 100644
--- a/debian/patches/0001-Revert-ArtworkManager-Cache-null-artwork-for-fast-lo.patch
+++ b/debian/patches/0008-Revert-ArtworkManager-Cache-null-artwork-for-fast-lo.patch
@@ -1,18 +1,17 @@
-From 38beaaccc53077199f4416ed62f4a0746297b602 Mon Sep 17 00:00:00 2001
From: Chow Loong Jin <hyperair at ubuntu.com>
Date: Mon, 22 Nov 2010 04:36:40 +0800
-Subject: [PATCH] Revert "[ArtworkManager] Cache null artwork for fast lookup"
+Subject: Revert "[ArtworkManager] Cache null artwork for fast lookup"
This reverts commit 768c76da611a990054ff0921f24d566de86ac749.
---
.../Banshee.Collection.Gui/ArtworkManager.cs | 15 ---------------
1 files changed, 0 insertions(+), 15 deletions(-)
-Index: banshee/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ArtworkManager.cs
-===================================================================
---- banshee.orig/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ArtworkManager.cs 2011-07-25 14:18:38.960048322 +0100
-+++ banshee/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ArtworkManager.cs 2011-07-25 14:22:38.728100902 +0100
-@@ -50,7 +50,6 @@
+diff --git a/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ArtworkManager.cs b/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ArtworkManager.cs
+index 6e1aa47..fe5f25e 100644
+--- a/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ArtworkManager.cs
++++ b/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ArtworkManager.cs
+@@ -50,7 +50,6 @@ namespace Banshee.Collection.Gui
{
private Dictionary<int, SurfaceCache> scale_caches = new Dictionary<int, SurfaceCache> ();
private HashSet<int> cacheable_cover_sizes = new HashSet<int> ();
@@ -20,7 +19,7 @@ Index: banshee/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ArtworkManage
private class SurfaceCache : LruCache<string, Cairo.ImageSurface>
{
-@@ -122,13 +121,8 @@
+@@ -122,13 +121,8 @@ namespace Banshee.Collection.Gui
return surface;
}
@@ -34,7 +33,7 @@ Index: banshee/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ArtworkManage
return null;
}
-@@ -168,17 +162,12 @@
+@@ -168,17 +162,12 @@ namespace Banshee.Collection.Gui
return null;
}
@@ -52,7 +51,7 @@ Index: banshee/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ArtworkManage
return null;
}
}
-@@ -195,7 +184,6 @@
+@@ -195,7 +184,6 @@ namespace Banshee.Collection.Gui
Pixbuf pixbuf = new Pixbuf (unconverted_path);
if (pixbuf.Width < 50 || pixbuf.Height < 50) {
Hyena.Log.DebugFormat ("Ignoring cover art {0} because less than 50x50", unconverted_path);
@@ -60,7 +59,7 @@ Index: banshee/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ArtworkManage
return null;
}
-@@ -236,7 +224,6 @@
+@@ -236,7 +224,6 @@ namespace Banshee.Collection.Gui
} catch {}
}
@@ -68,7 +67,7 @@ Index: banshee/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ArtworkManage
return null;
}
-@@ -256,8 +243,6 @@
+@@ -256,8 +243,6 @@ namespace Banshee.Collection.Gui
scale_caches[size].Remove (id);
}
@@ -77,3 +76,4 @@ Index: banshee/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ArtworkManage
if (inMemoryCacheOnly) {
return;
}
+--
diff --git a/debian/patches/0009-Drop-unnecessary-winmm-moduleref.patch b/debian/patches/0009-Drop-unnecessary-winmm-moduleref.patch
new file mode 100644
index 0000000..c0615db
--- /dev/null
+++ b/debian/patches/0009-Drop-unnecessary-winmm-moduleref.patch
@@ -0,0 +1,48 @@
+From: Chow Loong Jin <hyperair at debian.org>
+Date: Fri, 20 Jan 2012 23:14:39 +0800
+Subject: Drop unnecessary winmm moduleref
+
+---
+ src/Libraries/MusicBrainz/Makefile.am | 1 -
+ src/Libraries/MusicBrainz/Makefile.in | 1 -
+ src/Libraries/MusicBrainz/MusicBrainz/LocalDisc.cs | 2 +-
+ 3 files changed, 1 insertions(+), 3 deletions(-)
+
+diff --git a/src/Libraries/MusicBrainz/Makefile.am b/src/Libraries/MusicBrainz/Makefile.am
+index 006b834..1141b75 100644
+--- a/src/Libraries/MusicBrainz/Makefile.am
++++ b/src/Libraries/MusicBrainz/Makefile.am
+@@ -5,7 +5,6 @@ SOURCES = \
+ MusicBrainz/Artist.cs \
+ MusicBrainz/Disc.cs \
+ MusicBrainz/DiscLinux.cs \
+- MusicBrainz/DiscWin32.cs \
+ MusicBrainz/Event.cs \
+ MusicBrainz/Label.cs \
+ MusicBrainz/LocalDisc.cs \
+diff --git a/src/Libraries/MusicBrainz/Makefile.in b/src/Libraries/MusicBrainz/Makefile.in
+index ef8b1b0..2c5abc0 100644
+--- a/src/Libraries/MusicBrainz/Makefile.in
++++ b/src/Libraries/MusicBrainz/Makefile.in
+@@ -402,7 +402,6 @@ SOURCES = \
+ MusicBrainz/Artist.cs \
+ MusicBrainz/Disc.cs \
+ MusicBrainz/DiscLinux.cs \
+- MusicBrainz/DiscWin32.cs \
+ MusicBrainz/Event.cs \
+ MusicBrainz/Label.cs \
+ MusicBrainz/LocalDisc.cs \
+diff --git a/src/Libraries/MusicBrainz/MusicBrainz/LocalDisc.cs b/src/Libraries/MusicBrainz/MusicBrainz/LocalDisc.cs
+index e129126..5127642 100644
+--- a/src/Libraries/MusicBrainz/MusicBrainz/LocalDisc.cs
++++ b/src/Libraries/MusicBrainz/MusicBrainz/LocalDisc.cs
+@@ -141,7 +141,7 @@ namespace MusicBrainz
+ //case PlatformID.Win32NT:
+ //return new DiscWin32NT (device);
+ default:
+- return new DiscWin32 (device);
++ return null;
+ }
+ } catch (Exception exception) {
+ throw new LocalDiscException (exception);
+--
diff --git a/debian/patches/workaround-clideps-meego.patch b/debian/patches/0010-Drop-unnecessary-libmeego-panel-moduleref.patch
similarity index 71%
rename from debian/patches/workaround-clideps-meego.patch
rename to debian/patches/0010-Drop-unnecessary-libmeego-panel-moduleref.patch
index 5aa1657..ce4729c 100644
--- a/debian/patches/workaround-clideps-meego.patch
+++ b/debian/patches/0010-Drop-unnecessary-libmeego-panel-moduleref.patch
@@ -1,38 +1,17 @@
-Description: Workaround dh_clideps failing on a broken libmeego-panel DllImport
-Author: Chow Loong Jin <hyperair at ubuntu.com>
-Forwarded: not-needed
-Applied-Upstream: no
-Index: banshee/src/Extensions/Banshee.MeeGo/Makefile.am
-===================================================================
---- banshee.orig/src/Extensions/Banshee.MeeGo/Makefile.am 2011-05-14 21:51:44.254191395 +0800
-+++ banshee/src/Extensions/Banshee.MeeGo/Makefile.am 2011-05-14 21:51:44.347524133 +0800
-@@ -15,8 +15,6 @@
- Banshee.MeeGo/PlaybackBox.cs \
- Banshee.MeeGo/SearchEntry.cs \
- MeeGo.Panel/PanelButtonState.cs \
-- MeeGo.Panel/PanelClient.cs \
-- MeeGo.Panel/PanelGtk.cs \
- MeeGo.Panel/SetPositionHandler.cs \
- MeeGo.Panel/SetSizeHandler.cs
-
-Index: banshee/src/Extensions/Banshee.MeeGo/Makefile.in
-===================================================================
---- banshee.orig/src/Extensions/Banshee.MeeGo/Makefile.in 2011-05-14 21:51:44.254191395 +0800
-+++ banshee/src/Extensions/Banshee.MeeGo/Makefile.in 2011-05-14 21:51:44.347524133 +0800
-@@ -407,8 +407,6 @@
- Banshee.MeeGo/PlaybackBox.cs \
- Banshee.MeeGo/SearchEntry.cs \
- MeeGo.Panel/PanelButtonState.cs \
-- MeeGo.Panel/PanelClient.cs \
-- MeeGo.Panel/PanelGtk.cs \
- MeeGo.Panel/SetPositionHandler.cs \
- MeeGo.Panel/SetSizeHandler.cs
-
-Index: banshee/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MeeGoPanel.cs
-===================================================================
---- banshee.orig/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MeeGoPanel.cs 2011-05-14 21:51:44.194191779 +0800
-+++ banshee/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MeeGoPanel.cs 2011-05-14 21:59:34.871221818 +0800
-@@ -40,7 +40,7 @@
+From: Chow Loong Jin <hyperair at debian.org>
+Date: Fri, 20 Jan 2012 23:14:39 +0800
+Subject: Drop unnecessary libmeego-panel moduleref
+
+---
+ .../Banshee.MeeGo/Banshee.MeeGo/MeeGoPanel.cs | 57 ++++++++++----------
+ src/Extensions/Banshee.MeeGo/Makefile.am | 2 -
+ 2 files changed, 29 insertions(+), 30 deletions(-)
+
+diff --git a/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MeeGoPanel.cs b/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MeeGoPanel.cs
+index 9f16ba7..2d05388 100644
+--- a/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MeeGoPanel.cs
++++ b/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MeeGoPanel.cs
+@@ -40,7 +40,7 @@ namespace Banshee.MeeGo
{
public static MeeGoPanel Instance { get; private set; }
@@ -41,7 +20,7 @@ Index: banshee/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MeeGoPanel.cs
private Window window_panel;
public MediaPanelContents Contents { get; private set; }
-@@ -55,25 +55,25 @@
+@@ -55,25 +55,25 @@ namespace Banshee.MeeGo
var timer = Log.DebugTimerStart ();
@@ -85,7 +64,7 @@ Index: banshee/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MeeGoPanel.cs
Log.DebugTimerPrint (timer, "Netbook panel created: {0}");
}
-@@ -89,9 +89,10 @@
+@@ -89,9 +89,10 @@ namespace Banshee.MeeGo
Contents.ShowAll ();
Log.DebugTimerPrint (timer, "Netbook panel contents created: {0}");
@@ -99,7 +78,7 @@ Index: banshee/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MeeGoPanel.cs
window_panel.Add (Contents);
window_panel.SetDefaultSize (1000, 500);
window_panel.WindowPosition = WindowPosition.Center;
-@@ -106,17 +107,17 @@
+@@ -106,17 +107,17 @@ namespace Banshee.MeeGo
public void Hide ()
{
window_panel.Hide ();
@@ -123,3 +102,17 @@ Index: banshee/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MeeGoPanel.cs
}
}
}
+diff --git a/src/Extensions/Banshee.MeeGo/Makefile.am b/src/Extensions/Banshee.MeeGo/Makefile.am
+index de4076b..0fb45b7 100644
+--- a/src/Extensions/Banshee.MeeGo/Makefile.am
++++ b/src/Extensions/Banshee.MeeGo/Makefile.am
+@@ -15,8 +15,6 @@ SOURCES = \
+ Banshee.MeeGo/PlaybackBox.cs \
+ Banshee.MeeGo/SearchEntry.cs \
+ MeeGo.Panel/PanelButtonState.cs \
+- MeeGo.Panel/PanelClient.cs \
+- MeeGo.Panel/PanelGtk.cs \
+ MeeGo.Panel/SetPositionHandler.cs \
+ MeeGo.Panel/SetSizeHandler.cs
+
+--
diff --git a/debian/patches/0011-Fix-FTBFS-involving-bad-cast-libgpod-forwardport.patch b/debian/patches/0011-Fix-FTBFS-involving-bad-cast-libgpod-forwardport.patch
new file mode 100644
index 0000000..3203d74
--- /dev/null
+++ b/debian/patches/0011-Fix-FTBFS-involving-bad-cast-libgpod-forwardport.patch
@@ -0,0 +1,22 @@
+From: Chow Loong Jin <hyperair at debian.org>
+Date: Fri, 20 Jan 2012 23:14:40 +0800
+Subject: Fix FTBFS involving bad cast (libgpod forwardport)
+
+---
+ .../AppleDeviceTrackInfo.cs | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceTrackInfo.cs b/src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceTrackInfo.cs
+index 178266d..b8549f7 100644
+--- a/src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceTrackInfo.cs
++++ b/src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceTrackInfo.cs
+@@ -215,7 +215,7 @@ namespace Banshee.Dap.AppleDevice
+ track.CDs = DiscCount;
+ track.CDNumber = DiscNumber;
+ track.TrackLength = (int) Duration.TotalMilliseconds;
+- track.Size = (int)FileSize;
++ track.Size = (uint)FileSize;
+ track.Grouping = Grouping;
+ try {
+ track.TimePlayed = LastPlayed;
+--
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
deleted file mode 100644
index 17a0977..0000000
--- a/debian/patches/05_show-a-empty-library-message-in-banshee.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-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
deleted file mode 100644
index a92ce0e..0000000
--- a/debian/patches/06_add-meego-desktop-file.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-Index: banshee/src/Extensions/Banshee.MeeGo/Makefile.am
-===================================================================
---- banshee.orig/src/Extensions/Banshee.MeeGo/Makefile.am 2011-04-06 18:12:30.206516528 +0800
-+++ banshee/src/Extensions/Banshee.MeeGo/Makefile.am 2011-04-06 18:12:50.843060075 +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.desktop.in
- desktopfiles_files = $(desktopfiles_in_files:.desktop.in=.desktop)
- desktopfilesdir = $(MEEGO_PANELS_DIR)
- 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.desktop \
-+ banshee.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.desktop.in.in
-Index: banshee/src/Extensions/Banshee.MeeGo/Makefile.in
-===================================================================
---- banshee.orig/src/Extensions/Banshee.MeeGo/Makefile.in 2011-04-06 18:12:30.139850258 +0800
-+++ banshee/src/Extensions/Banshee.MeeGo/Makefile.in 2011-04-06 18:12:50.843060075 +0800
-@@ -639,12 +639,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.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.desktop.in.in
- @HAVE_MEEGO_TRUE at CLEANFILES = $(OUTPUT_FILES)
- @HAVE_MEEGO_TRUE at DISTCLEANFILES = *.pidb
- @HAVE_MEEGO_TRUE at MAINTAINERCLEANFILES = Makefile.in
-@@ -652,7 +654,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.desktop.in
- @HAVE_MEEGO_TRUE at desktopfiles_files = $(desktopfiles_in_files:.desktop.in=.desktop)
- @HAVE_MEEGO_TRUE at desktopfilesdir = $(MEEGO_PANELS_DIR)
- @HAVE_MEEGO_TRUE at desktopfiles_DATA = $(desktopfiles_files)
-Index: banshee/src/Extensions/Banshee.MeeGo/banshee.desktop.in.in
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ banshee/src/Extensions/Banshee.MeeGo/banshee.desktop.in.in 2011-04-06 18:12:50.843060075 +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
deleted file mode 100644
index 7052394..0000000
--- a/debian/patches/07_enable-library-watch-by-default.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: banshee/src/Extensions/Banshee.LibraryWatcher/Banshee.LibraryWatcher.addin.xml
-===================================================================
---- banshee.orig/src/Extensions/Banshee.LibraryWatcher/Banshee.LibraryWatcher.addin.xml 2011-02-24 01:32:02.518568233 +0800
-+++ banshee/src/Extensions/Banshee.LibraryWatcher/Banshee.LibraryWatcher.addin.xml 2011-02-24 01:43:50.081026033 +0800
-@@ -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/07_enable-mpris-by-default.patch b/debian/patches/07_enable-mpris-by-default.patch
deleted file mode 100644
index 23d413a..0000000
--- a/debian/patches/07_enable-mpris-by-default.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: banshee.git/src/Extensions/Banshee.Mpris/Banshee.Mpris.addin.xml
-===================================================================
---- banshee.git.orig/src/Extensions/Banshee.Mpris/Banshee.Mpris.addin.xml 2010-11-25 10:59:38.508369431 +0000
-+++ banshee.git/src/Extensions/Banshee.Mpris/Banshee.Mpris.addin.xml 2010-11-25 10:59:36.008175572 +0000
-@@ -8,7 +8,7 @@
- description="Control Banshee using the MPRIS D-Bus interface."
- author="John Millikin, Bertrand Lorentz"
- category="Utilities"
-- 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
deleted file mode 100644
index bb2e649..0000000
--- a/debian/patches/08_remove_unrelevant_media.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-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/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MediaPanelContents.cs
-===================================================================
---- banshee.orig/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MediaPanelContents.cs 2011-04-16 18:47:44.123536120 +0800
-+++ banshee/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MediaPanelContents.cs 2011-04-16 18:48:34.613256082 +0800
-@@ -71,7 +71,7 @@
- RedrawOnAllocate = true;
- AppPaintable = true;
-
-- BuildHeader ();
-+ //BuildHeader ();
- BuildLibrary ();
- BuildNowPlaying ();
- ConnectEvents ();
diff --git a/debian/patches/fix-libgpod-wrong-cast-ftbfs.patch b/debian/patches/fix-libgpod-wrong-cast-ftbfs.patch
deleted file mode 100644
index 565ca5f..0000000
--- a/debian/patches/fix-libgpod-wrong-cast-ftbfs.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: banshee/src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceTrackInfo.cs
-===================================================================
---- banshee.orig/src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceTrackInfo.cs 2011-09-08 10:01:03.674380855 +0800
-+++ banshee/src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceTrackInfo.cs 2011-09-08 10:01:08.834410073 +0800
-@@ -215,7 +215,7 @@
- track.CDs = DiscCount;
- track.CDNumber = DiscNumber;
- track.TrackLength = (int) Duration.TotalMilliseconds;
-- track.Size = (int)FileSize;
-+ track.Size = (uint)FileSize;
- track.Grouping = Grouping;
- try {
- track.TimePlayed = LastPlayed;
diff --git a/debian/patches/series b/debian/patches/series
index 72162ac..9c8a042 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,11 +1,11 @@
-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
-06_add-meego-desktop-file.patch
-07_enable-mpris-by-default.patch
-08_remove_unrelevant_media.patch
-0001-Revert-ArtworkManager-Cache-null-artwork-for-fast-lo.patch
-workaround-clideps-winmm.patch
-workaround-clideps-meego.patch
-fix-libgpod-wrong-cast-ftbfs.patch
+0001-Debrand-the-interface-to-Netbook.patch
+0002-Only-show-panel-on-client-MeeGo-and-don-t-show-when-.patch
+0003-Quit-only-on-explicit-shutdown-request.patch
+0004-Enable-switching-between-the-2-interfaces.patch
+0005-Add-Meego-desktop-file.patch
+0006-Enable-MPRIS-extension-by-default.patch
+0007-Remove-irrelevant-media.patch
+0008-Revert-ArtworkManager-Cache-null-artwork-for-fast-lo.patch
+0009-Drop-unnecessary-winmm-moduleref.patch
+0010-Drop-unnecessary-libmeego-panel-moduleref.patch
+0011-Fix-FTBFS-involving-bad-cast-libgpod-forwardport.patch
diff --git a/debian/patches/workaround-clideps-winmm.patch b/debian/patches/workaround-clideps-winmm.patch
deleted file mode 100644
index d99be9c..0000000
--- a/debian/patches/workaround-clideps-winmm.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-Description: Workaround dh_clideps failing on a broken winmm DllImport
-Author: Chow Loong Jin <hyperair at ubuntu.com>
-Forwarded: not-needed
-Applied-Upstream: no
-Index: banshee/src/Libraries/MusicBrainz/Makefile.am
-===================================================================
---- banshee.orig/src/Libraries/MusicBrainz/Makefile.am 2011-05-14 18:59:01.846280827 +0800
-+++ banshee/src/Libraries/MusicBrainz/Makefile.am 2011-05-14 19:03:01.195144698 +0800
-@@ -5,7 +5,6 @@
- MusicBrainz/Artist.cs \
- MusicBrainz/Disc.cs \
- MusicBrainz/DiscLinux.cs \
-- MusicBrainz/DiscWin32.cs \
- MusicBrainz/Event.cs \
- MusicBrainz/Label.cs \
- MusicBrainz/LocalDisc.cs \
-Index: banshee/src/Libraries/MusicBrainz/Makefile.in
-===================================================================
---- banshee.orig/src/Libraries/MusicBrainz/Makefile.in 2011-05-14 18:59:01.829614239 +0800
-+++ banshee/src/Libraries/MusicBrainz/Makefile.in 2011-05-14 19:03:01.195144698 +0800
-@@ -396,7 +396,6 @@
- MusicBrainz/Artist.cs \
- MusicBrainz/Disc.cs \
- MusicBrainz/DiscLinux.cs \
-- MusicBrainz/DiscWin32.cs \
- MusicBrainz/Event.cs \
- MusicBrainz/Label.cs \
- MusicBrainz/LocalDisc.cs \
-Index: banshee/src/Libraries/MusicBrainz/MusicBrainz/LocalDisc.cs
-===================================================================
---- banshee.orig/src/Libraries/MusicBrainz/MusicBrainz/LocalDisc.cs 2011-05-14 19:03:42.338284757 +0800
-+++ banshee/src/Libraries/MusicBrainz/MusicBrainz/LocalDisc.cs 2011-05-14 19:04:07.578166429 +0800
-@@ -141,7 +141,7 @@
- //case PlatformID.Win32NT:
- //return new DiscWin32NT (device);
- default:
-- return new DiscWin32 (device);
-+ return null;
- }
- } catch (Exception exception) {
- throw new LocalDiscException (exception);
--
banshee
More information about the Pkg-cli-apps-commits
mailing list