[Pkg-cli-apps-commits] [SCM] banshee branch, experimental, updated. debian/2.4.1-3-5-ga0003ad

[Chow Loong Jin]

The following commit has been merged in the experimental branch:
commit 40793f9e8949b469287c8a834735dfaafa88ed82
Author: Chow Loong Jin <hyperair at debian.org>
Date:   Fri Aug 24 02:38:32 2012 +0800

    Refresh patches and drop upstreamed Fix-FTBFS….patch

diff --git a/debian/patches/Add-Meego-desktop-file.patch b/debian/patches/Add-Meego-desktop-file.patch
index 41e56e9..5da4a3c 100644
--- a/debian/patches/Add-Meego-desktop-file.patch
+++ b/debian/patches/Add-Meego-desktop-file.patch
@@ -3,13 +3,13 @@ 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/Makefile.am           |   10 +++++++---
  src/Extensions/Banshee.MeeGo/banshee.desktop.in.in |   11 +++++++++++
- 2 files changed, 17 insertions(+), 2 deletions(-)
+ 2 files changed, 18 insertions(+), 3 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
+index bb42b94..7c3dd78 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
diff --git a/debian/patches/Add-dllmaps-for-Banshee.NowPlaying.X11.dll.patch b/debian/patches/Add-dllmaps-for-Banshee.NowPlaying.X11.dll.patch
index f761642..56bad87 100644
--- a/debian/patches/Add-dllmaps-for-Banshee.NowPlaying.X11.dll.patch
+++ b/debian/patches/Add-dllmaps-for-Banshee.NowPlaying.X11.dll.patch
@@ -18,7 +18,7 @@ index 0000000..83f5efc
 +  <dllmap dll="libgobject-2.0.so" target="libgobject-2.0.so.0" os="!windows"/>
 +</configuration>
 diff --git a/src/Backends/Banshee.NowPlaying.X11/Makefile.am b/src/Backends/Banshee.NowPlaying.X11/Makefile.am
-index d8e94fd..738668c 100644
+index d8e94fd..4e0acbe 100644
 --- a/src/Backends/Banshee.NowPlaying.X11/Makefile.am
 +++ b/src/Backends/Banshee.NowPlaying.X11/Makefile.am
 @@ -11,6 +11,7 @@ RESOURCES = Banshee.NowPlaying.X11.addin.xml
diff --git a/debian/patches/Enable-switching-between-the-2-interfaces.patch b/debian/patches/Enable-switching-between-the-2-interfaces.patch
index a923549..330ec48 100644
--- a/debian/patches/Enable-switching-between-the-2-interfaces.patch
+++ b/debian/patches/Enable-switching-between-the-2-interfaces.patch
@@ -11,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 7908e13..0b8edb0 100644
+index 290d330..ac8502c 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 @@
diff --git a/debian/patches/Fix-FTBFS-involving-bad-cast-libgpod-forwardport.patch b/debian/patches/Fix-FTBFS-involving-bad-cast-libgpod-forwardport.patch
deleted file mode 100644
index 6671f91..0000000
--- a/debian/patches/Fix-FTBFS-involving-bad-cast-libgpod-forwardport.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-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 file changed, 1 insertion(+), 1 deletion(-)
-
-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/series b/debian/patches/series
index dca2074..055aa91 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,6 +6,5 @@ Add-Meego-desktop-file.patch
 Enable-MPRIS-extension-by-default.patch
 Remove-irrelevant-media.patch
 Revert-ArtworkManager-Cache-null-artwork-for-fast-lo.patch
-Fix-FTBFS-involving-bad-cast-libgpod-forwardport.patch
 libossifer-Fix-certificate-validation-with-libsoup-2.patch
 Add-dllmaps-for-Banshee.NowPlaying.X11.dll.patch

-- 
banshee