[SCM] glyr/master: pick upstream commit effb0b0

[emillon-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit bc998fe61dead7f00936ddb6e7a2493559809295
Author: Etienne Millon <me at emillon.org>
Date:   Fri Dec 6 16:50:07 2013 +0100

    pick upstream commit effb0b0

diff --git a/debian/changelog b/debian/changelog
index 1307be7..26787f4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 glyr (1.0.1-2) UNRELEASED; urgency=low
 
   * Update my email address.
+  * Fix lyricswiki provider (Closes: #731542)
+    - cherry-pick upstream commit effb0b0
 
  -- Etienne Millon <me at emillon.org>  Fri, 06 Dec 2013 16:46:00 +0100
 
diff --git a/debian/patches/fix-lyricswiki.patch b/debian/patches/fix-lyricswiki.patch
new file mode 100644
index 0000000..3fc8021
--- /dev/null
+++ b/debian/patches/fix-lyricswiki.patch
@@ -0,0 +1,25 @@
+From effb0b0099e94f83bff7458149adbffe74083561 Mon Sep 17 00:00:00 2001
+From: ok100 <ok100 at openmailbox.org>
+Date: Mon, 25 Nov 2013 09:24:29 +0100
+Subject: [PATCH] Fixed lyricswiki provider
+
+---
+ lib/intern/lyrics/lyricswiki.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/intern/lyrics/lyricswiki.c b/lib/intern/lyrics/lyricswiki.c
+index 6735169..560a96a 100644
+--- a/lib/intern/lyrics/lyricswiki.c
++++ b/lib/intern/lyrics/lyricswiki.c
+@@ -64,7 +64,7 @@ static gboolean lv_cmp_content (const gchar * to_artist, const gchar * to_title,
+ /////////////////////////////////
+ 
+ #define LYR_NODE  "<div class='lyricbox'><div class='rtMatcher'><a href='http://www.ringtonematcher.com"
+-#define LYR_BEGIN "</a></div>"
++#define LYR_BEGIN "</span></div>"
+ #define LYR_ENDIN "<!--"
+ 
+ GList * parse_result_page (GlyrQuery * query, GlyrMemCache * to_parse)
+-- 
+1.8.5.1
+
diff --git a/debian/patches/series b/debian/patches/series
index 6130e6d..815db05 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 0001-Don-t-strip-binaries.patch
+fix-lyricswiki.patch

-- 
glyr packaging