[Pkg-cli-apps-commits] [SCM] banshee-community-extensions branch, experimental, updated. debian/1.9.0-1-11-gab3bbb8

[Iain Lane]

The following commit has been merged in the experimental branch:
commit aef7f5a01f938fb181d9ca48b8f3501690092b47
Author: Iain Lane <laney at ubuntu.com>
Date:   Thu Dec 23 16:58:30 2010 +0000

    Remove merged patch 0001-Ampache-Fix-compilation-with-banshee-1.9.0.patch

diff --git a/debian/patches/0001-Ampache-Fix-compilation-with-banshee-1.9.0.patch b/debian/patches/0001-Ampache-Fix-compilation-with-banshee-1.9.0.patch
deleted file mode 100644
index 932240d..0000000
--- a/debian/patches/0001-Ampache-Fix-compilation-with-banshee-1.9.0.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 3d3cdd6419b70f5f2f1c169649df153938dc6023 Mon Sep 17 00:00:00 2001
-From: Bertrand Lorentz <bertrand.lorentz at gmail.com>
-Date: Thu, 11 Nov 2010 22:04:48 +0100
-Subject: [PATCH] [Ampache] Fix compilation with banshee 1.9.0
-
-Also add a configure check for banshee 1.9.0.
----
- build/m4/extensions/ampache.m4               |    7 ++++++-
- src/Ampache/Banshee.Ampache/AmpacheSource.cs |    4 ++--
- 2 files changed, 8 insertions(+), 3 deletions(-)
-
-diff --git a/build/m4/extensions/ampache.m4 b/build/m4/extensions/ampache.m4
-index 4c07de2..8ec53ef 100644
---- a/build/m4/extensions/ampache.m4
-+++ b/build/m4/extensions/ampache.m4
-@@ -2,7 +2,12 @@ AC_DEFUN([BCE_AMPACHE],
- [
- 	BCE_ARG_DISABLE([Ampache], [yes])
- 
--	if test "x$enable_Ampache" = "xyes"; then
-+	BCE_CHECK_EXTENSION_DEP([Ampache], [BANSHEE_190],
-+		[banshee-1-services >= 1.9.0],
-+		[Banshee 1.9.0 was not found. Please install it or disable the Ampache extension by passing --disable-ampache])
-+
-+	if test "x$enable_Ampache" = "xyes" \
-+		&& test "x$have_BANSHEE_190" = "xyes"; then
- 		AM_CONDITIONAL(ENABLE_AMPACHE, true)
- 	else
- 		AM_CONDITIONAL(ENABLE_AMPACHE, false)
-diff --git a/src/Ampache/Banshee.Ampache/AmpacheSource.cs b/src/Ampache/Banshee.Ampache/AmpacheSource.cs
-index f5331b4..5c303ed 100755
---- a/src/Ampache/Banshee.Ampache/AmpacheSource.cs
-+++ b/src/Ampache/Banshee.Ampache/AmpacheSource.cs
-@@ -150,12 +150,12 @@ namespace Banshee.Ampache
-             //throw new NotImplementedException ();
-         }
- 
--        public void RemoveSelectedTracks ()
-+        public void RemoveTracks (Hyena.Collections.Selection selection)
-         {
-             //throw new NotImplementedException ();
-         }
- 
--        public void DeleteSelectedTracks ()
-+        public void DeleteTracks (Hyena.Collections.Selection selection)
-         {
-             //throw new NotImplementedException ();
-         }
--- 
-1.7.1
-
diff --git a/debian/patches/series b/debian/patches/series
index a72e58f..90e56bc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 fix-ampache-unicode.patch
-0001-Ampache-Fix-compilation-with-banshee-1.9.0.patch
 fsck-intltool.patch

-- 
banshee-community-extensions