[Pkg-cli-apps-commits] [SCM] banshee branch, experimental, updated. debian/2.2.0-1-10-g2ccd323

[Chow Loong Jin]

The following commit has been merged in the experimental branch:
commit 2ccd32314aac46bc98fb5400be6595063ad1c7c1
Author: Chow Loong Jin <hyperair at ubuntu.com>
Date:   Thu Nov 3 11:19:19 2011 +0800

    Revert "Lower mono-addins build-dep to 0.6-1-2~ (0.6.2 not packaged yet)"
    
    This reverts commit 8efa0115fb6fa46772ae6434831e3e2a541fec17.
    
    Git-Dch: Ignore

diff --git a/debian/changelog b/debian/changelog
index 3250d13..632e7f5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -36,7 +36,6 @@ banshee (2.3.1-1) UNRELEASED; urgency=low
       - bgo#661467: AmazonMp3: Handle plain text AMZ files now sent by Amazon
         (LP: #882347)
   * [e180004] Bump mono-addins build-dep (0.3.1 → 0.6.2)
-  * [8efa011] Lower mono-addins build-dep to 0.6-1-2~ (0.6.2 not packaged yet)
   * [6dc2a9b] Fix unused-but-set wanted_size variable
 
  -- Chow Loong Jin <hyperair at ubuntu.com>  Thu, 03 Nov 2011 09:57:29 +0800
diff --git a/debian/control b/debian/control
index a6d45cd..65c4d71 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,7 @@ Build-Depends: debhelper (>= 7.0.50),
                libboo-cil-dev (>= 0.8.1),
                libdbus1.0-cil-dev (>= 0.7),
                libdbus-glib1.0-cil-dev (>= 0.5),
-               libmono-addins-cil-dev (>= 0.6.1-2~),
+               libmono-addins-cil-dev (>= 0.6.2),
                libtaglib-cil-dev (>= 2.0.3.7),
                libmono-zeroconf-cil-dev (>= 0.7.3),
                libnotify-cil-dev,
diff --git a/debian/patches/0001-Revert-build-require-MonoAddins-0.6.2.patch b/debian/patches/0001-Revert-build-require-MonoAddins-0.6.2.patch
deleted file mode 100644
index e1c2c83..0000000
--- a/debian/patches/0001-Revert-build-require-MonoAddins-0.6.2.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 67fde03c364f03ba9e9f9a5797e9efbcdf20121c Mon Sep 17 00:00:00 2001
-From: Chow Loong Jin <hyperair at ubuntu.com>
-Date: Thu, 3 Nov 2011 08:48:31 +0800
-Subject: [PATCH] Revert "build: require MonoAddins 0.6.2"
-
-This reverts commit 5eb059861de87b2e32804b753ec7155d499d431c.
----
- build/m4/banshee/mono-addins.m4 |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/build/m4/banshee/mono-addins.m4 b/build/m4/banshee/mono-addins.m4
-index 572ef9d..99ea5a6 100644
---- a/build/m4/banshee/mono-addins.m4
-+++ b/build/m4/banshee/mono-addins.m4
-@@ -1,9 +1,9 @@
- AC_DEFUN([BANSHEE_CHECK_MONO_ADDINS],
- [
--	PKG_CHECK_MODULES(MONO_ADDINS, mono-addins >= 0.6.2)
-+	PKG_CHECK_MODULES(MONO_ADDINS, mono-addins >= 0.3.1)
- 	AC_SUBST(MONO_ADDINS_LIBS)
- 
--	PKG_CHECK_MODULES(MONO_ADDINS_SETUP, mono-addins-setup >= 0.6.2)
-+	PKG_CHECK_MODULES(MONO_ADDINS_SETUP, mono-addins-setup >= 0.3.1)
- 	AC_SUBST(MONO_ADDINS_SETUP_LIBS)
- ])
- 
--- 
-1.7.5.4
-
diff --git a/debian/patches/series b/debian/patches/series
index 423773a..06400c1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,6 +9,5 @@
 workaround-clideps-winmm.patch
 workaround-clideps-meego.patch
 fix-libgpod-wrong-cast-ftbfs.patch
-0001-Revert-build-require-MonoAddins-0.6.2.patch
 0001-libbanshee-Remove-unused-wanted_size-variable.patch
 99_ltmain_as-needed.patch

-- 
banshee