[Pkg-cli-apps-commits] [SCM] banshee-coverwallpaper branch, master, updated. debian/0.1.1-2-1-gad50591

[Chow Loong Jin]

The following commit has been merged in the master branch:
commit ad50591752cd25226fbab5411b1ac866fd2d1f08
Author: Chow Loong Jin <hyperair at gmail.com>
Date:   Fri Feb 12 15:34:43 2010 +0800

    Fix build with new Banshee version
    
    * debian/control, debian/rules:
      + Binary depend on current Banshee version or above
      + Quiltify package
      + Build-dep on cli-common-dev >= 0.5.7
    * debian/patches/01_fix-banshee-1.5.3.patch:
      + Patch to build with new Banshee (Closes: #569439)

diff --git a/debian/changelog b/debian/changelog
index 56128d5..6b04a18 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+banshee-coverwallpaper (0.1.1-3) UNRELEASED; urgency=low
+
+  * debian/control, debian/rules:
+    + Binary depend on current Banshee version or above
+    + Quiltify package
+    + Build-dep on cli-common-dev >= 0.5.7
+  * debian/patches/01_fix-banshee-1.5.3.patch:
+    + Patch to build with new Banshee (Closes: #569439)
+
+ -- Chow Loong Jin <hyperair at ubuntu.com>  Fri, 12 Feb 2010 15:34:27 +0800
+
 banshee-coverwallpaper (0.1.1-2) unstable; urgency=low
 
   * debian/control,
diff --git a/debian/control b/debian/control
index 819eb3f..27715dc 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: Chow Loong Jin <hyperair at gmail.com>
 Build-Depends: debhelper (>= 7.0.50),
                autotools-dev,
                mono-devel (>= 2.4.3),
-               cli-common-dev (>= 0.5.4),
+               cli-common-dev (>= 0.5.7),
                banshee (>= 1.0),
                libwebkit-cil-dev,
                libgconf2.0-cil-dev,
@@ -23,7 +23,7 @@ Homepage: http://banshee-unofficial-plugins.googlecode.com
 
 Package: banshee-extension-coverwallpaper
 Architecture: all
-Depends: banshee (>= 1.0),
+Depends: banshee (>= ${banshee:Version}),
          ${cli:Depends},
          ${shlibs:Depends},
          ${misc:Depends}
diff --git a/debian/patches/01_fix-banshee-1.5.3.patch b/debian/patches/01_fix-banshee-1.5.3.patch
new file mode 100644
index 0000000..bcc55d6
--- /dev/null
+++ b/debian/patches/01_fix-banshee-1.5.3.patch
@@ -0,0 +1,31 @@
+Index: banshee-coverwallpaper/Banshee.CoverWallpaper/CoverWallpaperService.cs
+===================================================================
+--- banshee-coverwallpaper.orig/Banshee.CoverWallpaper/CoverWallpaperService.cs	2010-02-12 14:24:54.995390597 +0800
++++ banshee-coverwallpaper/Banshee.CoverWallpaper/CoverWallpaperService.cs	2010-02-12 14:26:04.630120535 +0800
+@@ -36,6 +36,8 @@
+ using Banshee.ServiceStack;
+ using Banshee.Sources;
+ using Banshee.MediaEngine;
++using Banshee.Base;
++using Hyena;
+ 
+ namespace Banshee.CoverWallpaper
+ {
+@@ -59,7 +61,7 @@
+         {  
+             artwork_manager_service = ServiceManager.Get<ArtworkManager> ();
+             
+-            Banshee.Base.ThreadAssist.AssertInMainThread ();
++            ThreadAssist.AssertInMainThread ();
+             
+             ServiceManager.PlayerEngine.ConnectEvent (OnPlayerEvent,
+                PlayerEvent.StartOfStream |
+@@ -80,7 +82,7 @@
+             if (disposed)
+                 return;
+ 
+-            Banshee.Base.ThreadAssist.ProxyToMain (delegate {
++            ThreadAssist.ProxyToMain (delegate {
+                 ServiceManager.PlayerEngine.DisconnectEvent (OnPlayerEvent);
+                 artwork_manager_service = null;
+                 current_track = null;
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..74758af
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+01_fix-banshee-1.5.3.patch
diff --git a/debian/rules b/debian/rules
index 9546d51..69361fe 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,6 +2,7 @@
 # -*- makefile -*-
 
 include /usr/share/cli-common/cli.make
+include /usr/share/quilt/quilt.make
 
 # some variables for get-orig-source
 MAKEFILE = $(firstword $(MAKEFILE_LIST))
@@ -10,6 +11,7 @@ SOURCE_DIR = $(DEBIAN_DIR)/..
 PACKAGE = $(shell sed -n 's/^Source: //p' $(DEBIAN_DIR)/control)
 VERSION = $(shell dpkg-parsechangelog -l$(DEBIAN_DIR)/changelog | \
 		sed -n 's/-.*//; s/^Version: //p')
+BANSHEE_VERSION = $(shell pkg-config --modversion banshee-1-thickclient)
 
 override_dh_auto_configure:
 	dh_auto_configure -- GMCS=/usr/bin/mono-csc
@@ -27,5 +29,10 @@ get-orig-source:
 override_dh_installchangelogs:
 	dh_installchangelogs ChangeLog
 
+override_dh_gencontrol:
+	echo "banshee:Version=$(BANSHEE_VERSION)" >> \
+		debian/banshee-extension-coverwallpaper.substvars
+	dh_gencontrol
+
 %:
-	dh $@
+	dh --with=quilt $@

-- 
banshee-coverwallpaper