[Pkg-cli-apps-commits] [SCM] banshee branch, experimental, updated. debian/2.0.1-1-11-ga04568f

[Chow Loong Jin]

The following commit has been merged in the experimental branch:
commit 741d31ae9c8f2bca6757df840050e2c8d7e65e36
Author: Chow Loong Jin <hyperair at ubuntu.com>
Date:   Sat May 14 18:36:02 2011 +0800

    Workaround clideps issue

diff --git a/debian/patches/series b/debian/patches/series
index 9ce1eb5..e87ea7b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,4 +6,5 @@
 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
 99_ltmain_as-needed.patch
diff --git a/debian/patches/workaround-clideps-winmm.patch b/debian/patches/workaround-clideps-winmm.patch
new file mode 100644
index 0000000..d99be9c
--- /dev/null
+++ b/debian/patches/workaround-clideps-winmm.patch
@@ -0,0 +1,41 @@
+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