[Pkg-cli-apps-commits] [SCM] banshee branch, ubuntu/oneiric, updated. debian/2.1.3-1ubuntu1-9-g22e40b0

[Chow Loong Jin]

The following commit has been merged in the ubuntu/oneiric branch:
commit 08dea2c7648d4a83ed6199ef3b34350b0b241dcc
Author: Chow Loong Jin <hyperair at ubuntu.com>
Date:   Thu Sep 15 02:26:31 2011 +0800

    Revert "Fix invalid cast causing ftbfs with libgpod"
    
    This reverts commit 889b2044fbaf57fd1fd0594693d43f17fd96281d.
    
    This patch was to due to the int->uint type change in Gpod.Track.Size,
    introduced in 0.8.2. This shoud be dropped as soon as we get libgpod updated.
    
    Additionally, libgpod-cil-dev (<< 0.8.2) was added to build-dep to prevent
    building against the newer version of libgpod.

diff --git a/debian/control b/debian/control
index fe22fb6..13e2425 100644
--- a/debian/control
+++ b/debian/control
@@ -25,6 +25,7 @@ Build-Depends: debhelper (>= 7.0.50),
                libgio2.0-cil-dev (>= 2.22.3-1~),
                libgtk-sharp-beans2.0-cil-dev (>= 2.8),
                libgpod-cil-dev (>= 0.7.95),
+               libgpod-cil-dev (<< 0.8.2),
                libubuntuone1.0-cil-dev (>= 0.9.2),
                libwebkitgtk-dev (>= 1.2.2) | libwebkit-dev (>= 1.2.2),
                libsoup2.4-dev (>= 2.26),
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 6cc3664..eb496fc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -11,5 +11,4 @@
 90_amazon_url.patch
 workaround-clideps-winmm.patch
 workaround-clideps-meego.patch
-fix-libgpod-wrong-cast-ftbfs.patch
 99_ltmain_as-needed.patch

-- 
banshee