[Pkg-cli-apps-commits] [SCM] bansheelyricsplugin branch, master, updated. debian/0.8.1-1-5-gbc6014e

[Chow Loong Jin]

The following commit has been merged in the master branch:
commit dce24479dac1c90760ccbf3be13cfcb977738372
Author: Chow Loong Jin <hyperair at gmail.com>
Date:   Fri Jan 29 10:11:25 2010 +0800

    Drop System.Web references and Banshee 1.5.2 support

diff --git a/debian/changelog b/debian/changelog
index abd8f6b..d20754b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,7 @@
 bansheelyricsplugin (0.8.1-2) UNRELEASED; urgency=low
 
   * debian/patches/01_fix-banshee-1.5.3.patch:
-    + Let ThreadAssist symbol be resolved during compile-time via the use
-      of "using" statements. It was moved from Banshee.Base to Hyena
-      between Banshee 1.5.2 and 1.5.3
+    + Fix compilation with Banshee 1.5.3
   * debian/(control, rules, README.source:
     + Quiltify package
 
diff --git a/debian/control b/debian/control
index e97d2b3..646d6a2 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Build-Depends: debhelper (>= 7.0.50),
                cli-common-dev (>= 0.5.7),
                pkg-config (>= 0.9.0),
                mono-devel (>= 2.4.2.3),
-               banshee (>= 0.98),
+               banshee (>= 1.5.3),
                libwebkit-cil-dev,
                libgconf2.0-cil-dev,
                libglib2.0-cil-dev,
@@ -26,7 +26,7 @@ Package: banshee-extension-lyrics
 Architecture: all
 Depends: ${cli:Depends},
          ${misc:Depends},
-         banshee (>= 0.98)
+         banshee (>= 1.5.3)
 Description: Lyrics extension for Banshee
  Banshee Lyrics Plugin is an extension which shows lyrics of songs played in
  Banshee. It supports downloading lyrics from:
diff --git a/debian/patches/01_fix-banshee-1.5.3.patch b/debian/patches/01_fix-banshee-1.5.3.patch
index b746af5..a8267e4 100644
--- a/debian/patches/01_fix-banshee-1.5.3.patch
+++ b/debian/patches/01_fix-banshee-1.5.3.patch
@@ -1,19 +1,8 @@
-Description: Accomodate for movement of ThreadAssist symbol. Fixes compilation
- issue with Banshee 1.5.3 while maintaining compilability with Banshee 1.5.2
-Origin: upstream
 Index: bansheelyricsplugin/src/Banshee.Lyrics/LyricsManager.cs
 ===================================================================
---- bansheelyricsplugin.orig/src/Banshee.Lyrics/LyricsManager.cs	2010-01-29 08:02:27.011493557 +0800
-+++ bansheelyricsplugin/src/Banshee.Lyrics/LyricsManager.cs	2010-01-29 08:35:47.341187943 +0800
-@@ -38,6 +38,7 @@
- using Banshee.Lyrics.IO;
- using Banshee.Lyrics.Gui;
- using Banshee.Streaming;
-+using Banshee.Base;
- 
- using Hyena;
- 
-@@ -106,7 +107,7 @@
+--- bansheelyricsplugin.orig/src/Banshee.Lyrics/LyricsManager.cs	2010-01-29 10:09:44.365689203 +0800
++++ bansheelyricsplugin/src/Banshee.Lyrics/LyricsManager.cs	2010-01-29 10:09:47.558956064 +0800
+@@ -106,7 +106,7 @@
  
              LoadStarted (null, null);
  
@@ -22,7 +11,7 @@ Index: bansheelyricsplugin/src/Banshee.Lyrics/LyricsManager.cs
                  try {
                      if (cache.IsInCache (track)) {
                          lyrics = cache.ReadLyrics (track);
-@@ -128,7 +129,7 @@
+@@ -128,7 +128,7 @@
                      error = e.Message;
                  }
  
@@ -31,7 +20,7 @@ Index: bansheelyricsplugin/src/Banshee.Lyrics/LyricsManager.cs
                      LoadFinished (this, new LoadFinishedEventArgs (lyrics, suggestion, error));});
              });
          }
-@@ -236,7 +237,7 @@
+@@ -236,7 +236,7 @@
                  return;
              }
  
@@ -40,3 +29,44 @@ Index: bansheelyricsplugin/src/Banshee.Lyrics/LyricsManager.cs
                  if (rewrite) {
                      cache.DeleteLyrics (track);
                  }
+Index: bansheelyricsplugin/src/Makefile.am
+===================================================================
+--- bansheelyricsplugin.orig/src/Makefile.am	2010-01-29 10:09:52.519690885 +0800
++++ bansheelyricsplugin/src/Makefile.am	2010-01-29 10:10:50.897777837 +0800
+@@ -1,6 +1,6 @@
+ ASSEMBLY = Banshee.Lyrics.dll
+ TARGET = library
+-MCS_FLAGS = -debug /r:System.Web 
++MCS_FLAGS = -debug
+ ASSEMBLY_COMPILER_FLAGS =  -noconfig -codepage:utf8 -warn:4 -optimize+ -debug
+ CUSTOM_MCS_FLAGS = $(MCS_FLAGS) \
+ 	-unsafe
+@@ -30,7 +30,6 @@
+ 	Resources/LyricsMenu.xml
+ 
+ REFERENCES =  \
+-	System.Web \
+ 	System.Web.Services \ 
+ 	System.Xml \ 
+ 	$(WEBKIT_SHARP_LIBS) \
+Index: bansheelyricsplugin/src/Makefile.in
+===================================================================
+--- bansheelyricsplugin.orig/src/Makefile.in	2010-01-29 10:09:54.601960821 +0800
++++ bansheelyricsplugin/src/Makefile.in	2010-01-29 10:10:59.131690468 +0800
+@@ -180,7 +180,7 @@
+ top_srcdir = @top_srcdir@
+ ASSEMBLY = Banshee.Lyrics.dll
+ TARGET = library
+-MCS_FLAGS = -debug /r:System.Web 
++MCS_FLAGS = -debug
+ ASSEMBLY_COMPILER_FLAGS = -noconfig -codepage:utf8 -warn:4 -optimize+ -debug
+ CUSTOM_MCS_FLAGS = $(MCS_FLAGS) \
+ 	-unsafe
+@@ -212,7 +212,6 @@
+ 	Resources/LyricsMenu.xml
+ 
+ REFERENCES = \
+-	System.Web \
+ 	System.Web.Services \
+ 	System.Xml \
+ 	$(WEBKIT_SHARP_LIBS) \

-- 
bansheelyricsplugin