[Pkg-cli-apps-commits] [SCM] banshee branch, master, updated. debian/1.5.1-1-9-g833ed40

[Chow Loong Jin]

The following commit has been merged in the master branch:
commit 3e101818f6b89f8e9d7d47cdeda1fc644da8760b
Author: Chow Loong Jin <hyperair at gmail.com>
Date:   Thu Dec 3 01:41:08 2009 +0800

    Dropped 01_fix-ipod-sharp-ftbfs patch
    
    * debian/patches/01_fix-ipod-sharp-ftbfs:
      + Dropped, applied upstream

diff --git a/debian/changelog b/debian/changelog
index d6d1a82..3dafeb3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -41,8 +41,10 @@ banshee (1.5.2-1) unstable; urgency=low
       - Fix System.DivideByZeroException when rescanning (LP: #452366)
 
   * debian/control:
-    - Bump libipod{,ui}-cil dependency versions to 0.8.5
-    - Build-depend on -dev packages for libipod{,ui}-cil
+    + Bump libipod{,ui}-cil dependency versions to 0.8.5
+    + Build-depend on -dev packages for libipod{,ui}-cil
+  * debian/patches/01_fix-ipod-sharp-ftbfs:
+    + Dropped, applied upstream
 
  -- Chow Loong Jin <hyperair at ubuntu.com>  Thu, 03 Dec 2009 00:40:41 +0800
 
diff --git a/debian/patches/01_fix-ipod-sharp-ftbfs b/debian/patches/01_fix-ipod-sharp-ftbfs
deleted file mode 100644
index 608d9e4..0000000
--- a/debian/patches/01_fix-ipod-sharp-ftbfs
+++ /dev/null
@@ -1,28 +0,0 @@
-Index: banshee/build/m4/banshee/dap-ipod.m4
-===================================================================
---- banshee.orig/build/m4/banshee/dap-ipod.m4	2009-10-14 13:11:17.458912413 +0800
-+++ banshee/build/m4/banshee/dap-ipod.m4	2009-10-14 13:12:48.751474506 +0800
-@@ -18,7 +18,8 @@
- 	if test "x$enable_ipodsharp" = "xyes"; then
- 		asms="`$PKG_CONFIG --variable=Libraries ipod-sharp` `$PKG_CONFIG --variable=Libraries ipod-sharp-ui`"
- 		for asm in $asms; do
--			IPODSHARP_ASSEMBLIES="$IPODSHARP_ASSEMBLIES $asm $asm.mdb"
-+			IPODSHARP_ASSEMBLIES="$IPODSHARP_ASSEMBLIES $asm"
-+			test -f $asm.mdb && IPODSHARP_ASSEMBLIES+=" $asm.mdb"
- 		done
- 		AC_SUBST(IPODSHARP_ASSEMBLIES)
- 		AC_SUBST(IPODSHARP_LIBS)
-Index: banshee/configure
-===================================================================
---- banshee.orig/configure	2009-10-14 13:14:36.758892385 +0800
-+++ banshee/configure	2009-10-14 13:15:31.478916576 +0800
-@@ -17830,7 +17830,8 @@
- 	if test "x$enable_ipodsharp" = "xyes"; then
- 		asms="`$PKG_CONFIG --variable=Libraries ipod-sharp` `$PKG_CONFIG --variable=Libraries ipod-sharp-ui`"
- 		for asm in $asms; do
--			IPODSHARP_ASSEMBLIES="$IPODSHARP_ASSEMBLIES $asm $asm.mdb"
-+			IPODSHARP_ASSEMBLIES="$IPODSHARP_ASSEMBLIES $asm"
-+			test -f $asm.mdb && IPODSHARP_ASSEMBLIES+=" $asm.mdb"
- 		done
- 
- 
diff --git a/debian/patches/series b/debian/patches/series
index 1e76233..2497acb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-01_fix-ipod-sharp-ftbfs
 99_ltmain_as-needed.patch

-- 
banshee