[Pkg-cli-apps-commits] [SCM] banshee branch, experimental, updated. debian/1.7.4-1-27-ge8e258a

[Chow Loong Jin]

The following commit has been merged in the experimental branch:
commit 72f892eef32160c9d5fb813427433d1b4a89d1de
Author: Chow Loong Jin <hyperair at ubuntu.com>
Date:   Fri Oct 1 01:41:43 2010 +0800

    Drop 0001-Don-t-copy-duplicate-libraries.patch - rejected upstream

diff --git a/debian/patches/0001-Don-t-copy-duplicate-libraries.patch b/debian/patches/0001-Don-t-copy-duplicate-libraries.patch
deleted file mode 100644
index 9fa42ee..0000000
--- a/debian/patches/0001-Don-t-copy-duplicate-libraries.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 1ea0f3d0476d5e26fcbbfbf382fbef7352f10115 Mon Sep 17 00:00:00 2001
-From: Iain Lane <laney at ubuntu.com>
-Date: Sun, 5 Sep 2010 13:36:18 +0100
-Subject: [PATCH 1/2] Don't copy duplicate libraries
-
-GIO# and GTK#Beans both supply the same library, gio-sharp.dll. If we
-try to install both of these then automake falls over. Ensure that we
-only try to copy one of each library.
----
- build/m4/banshee/gio.m4 |    8 ++++++--
- 1 files changed, 6 insertions(+), 2 deletions(-)
-
-Index: banshee/build/m4/banshee/gio.m4
-===================================================================
---- banshee.orig/build/m4/banshee/gio.m4	2010-09-18 01:48:55.000000000 +0800
-+++ banshee/build/m4/banshee/gio.m4	2010-09-18 02:04:25.358986523 +0800
-@@ -16,9 +16,13 @@
- 
- 		asms="`$PKG_CONFIG --variable=Libraries gio-sharp-2.0` `$PKG_CONFIG --variable=Libraries gtk-sharp-beans-2.0`"
- 		for asm in $asms; do
--			GIOSHARP_ASSEMBLIES="$GIOSHARP_ASSEMBLIES $asm"
--			[[ -r "$asm.config" ]] && GIOSHARP_ASSEMBLIES="$GIOSHARP_ASSEMBLIES $asm.config"
--			[[ -r "$asm.mdb" ]] && GIOSHARP_ASSEMBLIES="$GIOSHARP_ASSEMBLIES $asm.mdb"
-+			FILENAME=`basename $asm`
-+			if [[ "`echo $SEENBEFORE | grep $FILENAME`" = "" ]]; then
-+				GIOSHARP_ASSEMBLIES="$GIOSHARP_ASSEMBLIES $asm"
-+				[[ -r "$asm.config" ]] && GIOSHARP_ASSEMBLIES="$GIOSHARP_ASSEMBLIES $asm.config"
-+				[[ -r "$asm.mdb" ]] && GIOSHARP_ASSEMBLIES="$GIOSHARP_ASSEMBLIES $asm.mdb"
-+				SEENBEFORE="$SEENBEFORE $FILENAME"
-+			fi
- 		done
- 		AC_SUBST(GIOSHARP_ASSEMBLIES)
- 
-Index: banshee/configure
-===================================================================
---- banshee.orig/configure	2010-09-18 01:48:55.000000000 +0800
-+++ banshee/configure	2010-09-18 02:06:14.419521065 +0800
-@@ -17454,9 +17454,13 @@
- 
- 		asms="`$PKG_CONFIG --variable=Libraries gio-sharp-2.0` `$PKG_CONFIG --variable=Libraries gtk-sharp-beans-2.0`"
- 		for asm in $asms; do
--			GIOSHARP_ASSEMBLIES="$GIOSHARP_ASSEMBLIES $asm"
--			[ -r "$asm.config" ] && GIOSHARP_ASSEMBLIES="$GIOSHARP_ASSEMBLIES $asm.config"
--			[ -r "$asm.mdb" ] && GIOSHARP_ASSEMBLIES="$GIOSHARP_ASSEMBLIES $asm.mdb"
-+			FILENAME=`basename $asm`
-+			if [ "`echo $SEENBEFORE | grep $FILENAME`" = "" ]; then
-+				GIOSHARP_ASSEMBLIES="$GIOSHARP_ASSEMBLIES $asm"
-+				[ -r "$asm.config" ] && GIOSHARP_ASSEMBLIES="$GIOSHARP_ASSEMBLIES $asm.config"
-+				[ -r "$asm.mdb" ] && GIOSHARP_ASSEMBLIES="$GIOSHARP_ASSEMBLIES $asm.mdb"
-+				SEENBEFORE="$SEENBEFORE $FILENAME"
-+			fi
- 		done
- 
- 
diff --git a/debian/patches/series b/debian/patches/series
index a76127f..2497acb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-0001-Don-t-copy-duplicate-libraries.patch
 99_ltmain_as-needed.patch

-- 
banshee