[Pkg-cli-apps-commits] [SCM] banshee-community-extensions branch, experimental, updated. debian/2.0.1-1-20-g0fb8c30

[Chow Loong Jin]

The following commit has been merged in the experimental branch:
commit 597f885fff3b8c77af2f532875107c86a02bed0f
Author: Chow Loong Jin <hyperair at ubuntu.com>
Date:   Tue Jun 14 01:35:20 2011 +0800

    Cherry-pick liblastfmfpbridge dllmap

diff --git a/debian/patches/0001-LastfmFingerprint-Add-dllmap-for-liblastfmfpbridge.patch b/debian/patches/0001-LastfmFingerprint-Add-dllmap-for-liblastfmfpbridge.patch
new file mode 100644
index 0000000..cde32f6
--- /dev/null
+++ b/debian/patches/0001-LastfmFingerprint-Add-dllmap-for-liblastfmfpbridge.patch
@@ -0,0 +1,58 @@
+From 6c6127c51d4ec676c8f7f085e7757112e499652b Mon Sep 17 00:00:00 2001
+From: Chow Loong Jin <hyperair at ubuntu.com>
+Date: Tue, 14 Jun 2011 01:21:45 +0800
+Subject: [PATCH] LastfmFingerprint: Add dllmap for liblastfmfpbridge
+
+Although mono tries many funky permutations of the dll name, it is only
+documented to try searching for "lib${moduleref}.so"[1].
+
+Hence, the moduleref of liblastfmfpbridge is insufficient, and a dllmap is
+needed to map this appropriately. Dropping the "lib" from the moduleref would
+not work either, as Windows does not prepend "lib" to the library name while
+when loading modulerefs.
+
+[1] http://www.mono-project.com/Interop_with_Native_Libraries
+---
+ src/LastfmFingerprint/.gitignore                   |    1 +
+ .../Banshee.LastfmFingerprint.dll.config           |    3 +++
+ .../Banshee.LastfmFingerprint/Makefile.am          |    4 ++++
+ 3 files changed, 8 insertions(+), 0 deletions(-)
+ create mode 100644 src/LastfmFingerprint/.gitignore
+ create mode 100644 src/LastfmFingerprint/Banshee.LastfmFingerprint/Banshee.LastfmFingerprint.dll.config
+
+diff --git a/src/LastfmFingerprint/.gitignore b/src/LastfmFingerprint/.gitignore
+new file mode 100644
+index 0000000..6d5e34b
+--- /dev/null
++++ b/src/LastfmFingerprint/.gitignore
+@@ -0,0 +1 @@
++!*.dll.config
+diff --git a/src/LastfmFingerprint/Banshee.LastfmFingerprint/Banshee.LastfmFingerprint.dll.config b/src/LastfmFingerprint/Banshee.LastfmFingerprint/Banshee.LastfmFingerprint.dll.config
+new file mode 100644
+index 0000000..7435ff4
+--- /dev/null
++++ b/src/LastfmFingerprint/Banshee.LastfmFingerprint/Banshee.LastfmFingerprint.dll.config
+@@ -0,0 +1,3 @@
++<configuration>
++    <dllmap dll="liblastfmfpbridge" target="liblastfmfpbridge.so" />
++</configuration>
+diff --git a/src/LastfmFingerprint/Banshee.LastfmFingerprint/Makefile.am b/src/LastfmFingerprint/Banshee.LastfmFingerprint/Makefile.am
+index 8bff152..e937890 100644
+--- a/src/LastfmFingerprint/Banshee.LastfmFingerprint/Makefile.am
++++ b/src/LastfmFingerprint/Banshee.LastfmFingerprint/Makefile.am
+@@ -1,4 +1,5 @@
+ ASSEMBLY = Banshee.LastfmFingerprint
++DLLCONFIG = $(ASSEMBLY).dll.config
+ LINK = $(BANSHEE_LIBS) $(BANSHEE_LASTFM_LIBS)
+ 
+ SOURCES =  \
+@@ -15,3 +16,6 @@ RESOURCES =  \
+ 	Resources/GlobalUI.xml
+ 
+ include $(top_srcdir)/build/build.mk
++
++EXTRA_DIST += $(DLLCONFIG)
++module_DATA = $(DLLCONFIG)
+-- 
+1.7.4.1
+
diff --git a/debian/patches/series b/debian/patches/series
index 41d2436..d10c892 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
+0001-LastfmFingerprint-Add-dllmap-for-liblastfmfpbridge.patch
 fsck-intltool.patch

-- 
banshee-community-extensions