[Pkg-cli-apps-commits] [SCM] banshee branch, master, updated. debian/1.5.0-3-18-g8c9f523

[Chow Loong Jin]

The following commit has been merged in the master branch:
commit acc430afe93c1fcf676b4211eebbdd87ffd90979
Author: Chow Loong Jin <hyperair at gmail.com>
Date:   Wed Oct 14 12:37:42 2009 +0800

    Patch configure instead of Makefile*

diff --git a/debian/patches/01_fix-ipod-sharp-ftbfs b/debian/patches/01_fix-ipod-sharp-ftbfs
index 4f7457f..608d9e4 100644
--- a/debian/patches/01_fix-ipod-sharp-ftbfs
+++ b/debian/patches/01_fix-ipod-sharp-ftbfs
@@ -1,28 +1,28 @@
-Index: banshee/src/Dap/Banshee.Dap.Ipod/Makefile.am
+Index: banshee/build/m4/banshee/dap-ipod.m4
 ===================================================================
---- banshee.orig/src/Dap/Banshee.Dap.Ipod/Makefile.am	2009-10-14 12:09:02.698894628 +0800
-+++ banshee/src/Dap/Banshee.Dap.Ipod/Makefile.am	2009-10-14 12:14:32.161393110 +0800
-@@ -20,6 +20,9 @@
- 
- install-data-hook:
- 	for ASM in $(IPODSHARP_ASSEMBLIES); do \
-+		if echo $(ASM) | grep '.mdb$' >/dev/null && ! test -f $(ASM); then \
-+			continue; \
-+		fi; \
- 		$(INSTALL) -m 0755 $$ASM $(DESTDIR)$(moduledir); \
- 	done;
- 
-Index: banshee/src/Dap/Banshee.Dap.Ipod/Makefile.in
+--- 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/src/Dap/Banshee.Dap.Ipod/Makefile.in	2009-10-14 12:09:02.758892717 +0800
-+++ banshee/src/Dap/Banshee.Dap.Ipod/Makefile.in	2009-10-14 12:15:57.798917732 +0800
-@@ -789,6 +789,9 @@
+--- 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
  
- @ENABLE_IPOD_TRUE at install-data-hook:
- @ENABLE_IPOD_TRUE@	for ASM in $(IPODSHARP_ASSEMBLIES); do \
-+ at ENABLE_IPOD_TRUE@		if echo $(ASM) | grep '.mdb$' >/dev/null && ! test -f $(ASM); then \
-+ at ENABLE_IPOD_TRUE@			continue; \
-+ at ENABLE_IPOD_TRUE@		fi; \
- @ENABLE_IPOD_TRUE@		$(INSTALL) -m 0755 $$ASM $(DESTDIR)$(moduledir); \
- @ENABLE_IPOD_TRUE@	done;
  

-- 
banshee