[Pkg-cli-apps-commits] [banshee] 04/12: Merge changes from 2.6.1-5

[Chow Loong Jin]

This is an automated email from the git hooks/post-receive script.

hyperair pushed a commit to branch ubuntu/trusty
in repository banshee.

commit 7357b7321600c90652e21326956b52c5441eafda
Author: Chow Loong Jin <hyperair at debian.org>
Date:   Sun Feb 9 23:05:19 2014 +0800

    Merge changes from 2.6.1-5
---
 debian/control                  | 7 ++++---
 debian/patches/Use-dbus-2.patch | 4 ++--
 debian/patches/series           | 1 +
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/debian/control b/debian/control
index 1331632..9a18e44 100644
--- a/debian/control
+++ b/debian/control
@@ -12,8 +12,8 @@ Build-Depends: debhelper (>= 9),
                intltool (>= 0.35),
                lsb-release,
                mono-devel (>= 2.4.3),
-               libdbus1.0-cil-dev (>= 0.7),
-               libdbus-glib1.0-cil-dev (>= 0.5),
+               libdbus2.0-cil-dev,
+               libdbus-glib2.0-cil-dev,
                libmono-addins-cil-dev (>= 0.6.2),
                libtaglib-cil-dev (>= 2.0.3.7),
                libmono-zeroconf-cil-dev (>= 0.7.3),
@@ -73,7 +73,8 @@ Suggests: gstreamer1.0-plugins-bad,
           banshee-dbg (=${binary:Version})
 Provides: banshee-api-${banshee:API},
           banshee-asm-${banshee:ASM}
-Breaks: banshee-extensions-common (<< 2.0.1-2~)
+Breaks: banshee-extensions-common (<< 2.0.1-2~),
+        banshee-extension-lyrics (<< 2.4.0-3~)
 Description: Media Management and Playback application
  Banshee is a media management and playback application for the GNOME
  desktop, allowing users to import audio from CDs, search their library,
diff --git a/debian/patches/Use-dbus-2.patch b/debian/patches/Use-dbus-2.patch
index d270df7..9ce6764 100644
--- a/debian/patches/Use-dbus-2.patch
+++ b/debian/patches/Use-dbus-2.patch
@@ -38,7 +38,7 @@ index 40636bb..a12b03c 100644
  Libs: -r:${Libraries}
  
 diff --git a/build/pkg-config/banshee-core.pc.in b/build/pkg-config/banshee-core.pc.in
-index 9d4c3b9..09f54e8 100644
+index 9d4c3b9..c217dd8 100644
 --- a/build/pkg-config/banshee-core.pc.in
 +++ b/build/pkg-config/banshee-core.pc.in
 @@ -6,5 +6,5 @@ bansheedir=${libdir}/@PACKAGE@
@@ -46,7 +46,7 @@ index 9d4c3b9..09f54e8 100644
  Description: Core APIs for the Banshee Media Framework
  Version: @VERSION@
 -Requires: taglib-sharp dbus-sharp-1.0 dbus-sharp-glib-1.0 glib-sharp-2.0 mono-addins banshee-hyena banshee-hyena-data-sqlite banshee-musicbrainz
-+Requires: taglib-sharp dbus-sharp-2.0 dbus-sharp-glib-1.0 glib-sharp-2.0 mono-addins banshee-hyena banshee-hyena-data-sqlite banshee-musicbrainz
++Requires: taglib-sharp dbus-sharp-2.0 dbus-sharp-glib-2.0 glib-sharp-2.0 mono-addins banshee-hyena banshee-hyena-data-sqlite banshee-musicbrainz
  Libs: -r:${bansheedir}/Banshee.Core.dll
 diff --git a/src/Core/Banshee.Services/Banshee.ServiceStack/DBusServiceManager.cs b/src/Core/Banshee.Services/Banshee.ServiceStack/DBusServiceManager.cs
 index 698cf02..96e3996 100644
diff --git a/debian/patches/series b/debian/patches/series
index 8b9f8fd..24fef28 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -12,6 +12,7 @@ Initial-port-to-GStreamer-1.0.patch
 Remove-build-time-enable-gapless-playback-option.patch
 Don-t-use-the-new-decoded-pad-signal-of-decodebin.patch
 Use-new-style-GStreamer-1.0-raw-audio-caps-in-the-WA.patch
+Use-dbus-2.patch
 Disable-Notification-area-extension-by-default.patch
 Enable-sound-menu-extension-by-default.patch
 Change-Amazon-redirect-url.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-cli-apps/packages/banshee.git