[Pkg-cli-apps-commits] [SCM] banshee branch, master, updated. debian/2.0.1-1-4-g2799496
Chow Loong Jin
hyperair at ubuntu.com
Tue Jul 5 19:49:07 UTC 2011
The following commit has been merged in the master branch:
commit fd5aed27282bac9c7026ba742844faababe9b2e5
Author: Chow Loong Jin <hyperair at ubuntu.com>
Date: Wed Jul 6 00:16:54 2011 +0800
Cherry-pick patch to port Banshee to DBus#
diff --git a/debian/patches/0001-dbus-Replace-NDesk.DBus-references-by-dbus-sharp-bgo.patch b/debian/patches/0001-dbus-Replace-NDesk.DBus-references-by-dbus-sharp-bgo.patch
new file mode 100644
index 0000000..b6c9ac6
--- /dev/null
+++ b/debian/patches/0001-dbus-Replace-NDesk.DBus-references-by-dbus-sharp-bgo.patch
@@ -0,0 +1,657 @@
+From 64a7e2c9fee451e70d0c1e44720a217b11d62932 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?J=E9r=E9mie=20Laval?= <jeremie.laval at gmail.com>
+Date: Thu, 23 Sep 2010 10:36:51 +1000
+Subject: [PATCH] dbus: Replace NDesk.DBus references by dbus-sharp (bgo#629844)
+
+Signed-off-by: Alexander Kojevnikov <alexander at kojevnikov.com>
+---
+ build/build.environment.mk | 4 ++--
+ build/m4/banshee/dbus.m4 | 10 +++++-----
+ configure.ac | 4 ++--
+ .../GnomeScreensaverManager.cs | 2 +-
+ .../Banshee.Hal/Banshee.HalBackend/DkDisk.cs | 2 +-
+ src/Backends/Banshee.Hal/Hal/Device.cs | 2 +-
+ src/Backends/Banshee.Hal/Hal/Manager.cs | 2 +-
+ src/Backends/Banshee.Hal/Hal/Volume.cs | 2 +-
+ src/Clients/Beroe/Beroe/IndexerClient.cs | 2 +-
+ src/Clients/Booter/Booter/Entry.cs | 2 +-
+ src/Clients/Halie/Halie/Client.cs | 2 +-
+ .../IndexerClient.cs | 2 +-
+ .../ICollectionIndexer.cs | 2 +-
+ .../ICollectionIndexerService.cs | 2 +-
+ .../Banshee.CollectionIndexer/Demo/RemoteClient.cs | 2 +-
+ .../Banshee.Core/Banshee.Collection/ITrackInfo.cs | 2 +-
+ .../CollectionIndexerService.cs | 2 +-
+ .../ICollectionIndexer.cs | 2 +-
+ .../ICollectionIndexerService.cs | 2 +-
+ .../Banshee.Collection.Indexer/IIndexerClient.cs | 2 +-
+ .../Banshee.Collection/IExportableModel.cs | 2 +-
+ .../Banshee.MediaEngine/IPlayerEngineService.cs | 2 +-
+ .../Banshee.Networking/NetworkManager.cs | 2 +-
+ .../Banshee.Services/Banshee.Networking/Wicd.cs | 2 +-
+ .../IPlaybackControllerService.cs | 4 ++--
+ .../Banshee.ServiceStack/DBusCommandService.cs | 2 +-
+ .../Banshee.ServiceStack/DBusConnection.cs | 2 +-
+ .../Banshee.ServiceStack/DBusServiceManager.cs | 2 +-
+ .../Banshee.Sources/IFilterableSource.cs | 2 +-
+ .../Banshee.Services/Banshee.Sources/ISource.cs | 2 +-
+ .../Banshee.Sources/ISourceManager.cs | 2 +-
+ .../Banshee.Sources/ITrackModelSource.cs | 2 +-
+ .../Banshee.Gui/IClientWindow.cs | 2 +-
+ .../Banshee.Gui/IGlobalUIActions.cs | 2 +-
+ .../Banshee.Mpris/Banshee.Mpris/IMediaPlayer.cs | 2 +-
+ .../Banshee.Mpris/Banshee.Mpris/IPlayer.cs | 2 +-
+ .../Banshee.Mpris/Banshee.Mpris/MediaPlayer.cs | 2 +-
+ .../Banshee.Mpris/Banshee.Mpris/MprisService.cs | 2 +-
+ .../MultimediaKeysService.cs | 2 +-
+ .../Notifications/Notification.cs | 2 +-
+ .../Notifications/Notifications.cs | 2 +-
+ .../Banshee.PlayQueue/IPlayQueue.cs | 2 +-
+ .../Banshee.Torrent/TorrentFileDownloadTask.cs | 2 +-
+ .../Banshee.Torrent/TorrentService.cs | 2 +-
+ 44 files changed, 51 insertions(+), 51 deletions(-)
+
+Index: banshee/build/build.environment.mk
+===================================================================
+--- banshee.orig/build/build.environment.mk 2011-07-02 10:03:31.000000000 +0800
++++ banshee/build/build.environment.mk 2011-07-06 00:01:31.570740892 +0800
+@@ -19,8 +19,8 @@
+ LINK_GIO = $(GTKSHARP_BEANS_LIBS) $(GIOSHARP_LIBS)
+ LINK_GKEYFILE = $(GKEYFILE_SHARP_LIBS)
+ LINK_GUDEV = $(GUDEV_SHARP_LIBS)
+-LINK_DBUS = $(NDESK_DBUS_LIBS) $(NDESK_DBUS_GLIB_LIBS)
+-LINK_DBUS_NO_GLIB = $(NDESK_DBUS_LIBS)
++LINK_DBUS = $(DBUS_SHARP_LIBS) $(DBUS_SHARP_GLIB_LIBS)
++LINK_DBUS_NO_GLIB = $(DBUS_SHARP_LIBS)
+ LINK_TAGLIB = $(TAGLIB_SHARP_LIBS)
+ LINK_IPOD = $(IPODSHARP_LIBS)
+ LINK_BOO = $(BOO_LIBS)
+Index: banshee/build/m4/banshee/dbus.m4
+===================================================================
+--- banshee.orig/build/m4/banshee/dbus.m4 2011-07-02 10:03:31.000000000 +0800
++++ banshee/build/m4/banshee/dbus.m4 2011-07-06 00:01:31.570740892 +0800
+@@ -1,9 +1,9 @@
+-AC_DEFUN([BANSHEE_CHECK_NDESK_DBUS],
++AC_DEFUN([BANSHEE_CHECK_DBUS_SHARP],
+ [
+- PKG_CHECK_MODULES(NDESK_DBUS_GLIB, ndesk-dbus-glib-1.0 >= 0.3)
+- AC_SUBST(NDESK_DBUS_GLIB_LIBS)
++ PKG_CHECK_MODULES(DBUS_SHARP_GLIB, dbus-sharp-glib-1.0 >= 0.5)
++ AC_SUBST(DBUS_SHARP_GLIB_LIBS)
+
+- PKG_CHECK_MODULES(NDESK_DBUS, ndesk-dbus-1.0 >= 0.5)
+- AC_SUBST(NDESK_DBUS_LIBS)
++ PKG_CHECK_MODULES(DBUS_SHARP, dbus-sharp-1.0 >= 0.7)
++ AC_SUBST(DBUS_SHARP_LIBS)
+ ])
+
+Index: banshee/configure.ac
+===================================================================
+--- banshee.orig/configure.ac 2011-07-02 10:03:31.000000000 +0800
++++ banshee/configure.ac 2011-07-06 00:01:31.584074156 +0800
+@@ -110,8 +110,8 @@
+ PKG_CHECK_MODULES(GDK_2_22, gdk-x11-2.0 >= 2.22, have_gdk_2_22=yes, have_gdk_2_22=no)
+ AM_CONDITIONAL(HAVE_GDK_2_22, test "x$have_gdk_2_22" = "xyes")
+
+-dnl NDesk DBus libraries
+-BANSHEE_CHECK_NDESK_DBUS
++dnl DBus Sharp libraries
++BANSHEE_CHECK_DBUS_SHARP
+
+ dnl Mono.Addins libraries
+ BANSHEE_CHECK_MONO_ADDINS
+Index: banshee/src/Backends/Banshee.Gnome/Banshee.GnomeBackend/GnomeScreensaverManager.cs
+===================================================================
+--- banshee.orig/src/Backends/Banshee.Gnome/Banshee.GnomeBackend/GnomeScreensaverManager.cs 2011-07-02 10:03:35.000000000 +0800
++++ banshee/src/Backends/Banshee.Gnome/Banshee.GnomeBackend/GnomeScreensaverManager.cs 2011-07-06 00:01:31.624073949 +0800
+@@ -26,7 +26,7 @@
+ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ //
+ using System;
+-using NDesk.DBus;
++using DBus;
+ using Mono.Unix;
+
+ using Banshee.PlatformServices;
+Index: banshee/src/Backends/Banshee.Hal/Banshee.HalBackend/DkDisk.cs
+===================================================================
+--- banshee.orig/src/Backends/Banshee.Hal/Banshee.HalBackend/DkDisk.cs 2011-07-02 10:03:35.000000000 +0800
++++ banshee/src/Backends/Banshee.Hal/Banshee.HalBackend/DkDisk.cs 2011-07-06 00:01:31.624073949 +0800
+@@ -28,7 +28,7 @@
+
+ using System;
+
+-using NDesk.DBus;
++using DBus;
+
+ namespace Banshee.HalBackend
+ {
+Index: banshee/src/Backends/Banshee.Hal/Hal/Device.cs
+===================================================================
+--- banshee.orig/src/Backends/Banshee.Hal/Hal/Device.cs 2011-07-02 10:03:35.000000000 +0800
++++ banshee/src/Backends/Banshee.Hal/Hal/Device.cs 2011-07-06 00:01:31.754073279 +0800
+@@ -30,7 +30,7 @@
+ using System.Collections;
+ using System.Collections.Generic;
+
+-using NDesk.DBus;
++using DBus;
+
+ namespace Hal
+ {
+Index: banshee/src/Backends/Banshee.Hal/Hal/Manager.cs
+===================================================================
+--- banshee.orig/src/Backends/Banshee.Hal/Hal/Manager.cs 2011-07-02 10:03:35.000000000 +0800
++++ banshee/src/Backends/Banshee.Hal/Hal/Manager.cs 2011-07-06 00:01:31.754073279 +0800
+@@ -30,7 +30,7 @@
+ using System.Collections;
+ using System.Collections.Generic;
+
+-using NDesk.DBus;
++using DBus;
+ using org.freedesktop.DBus;
+
+ namespace Hal
+Index: banshee/src/Backends/Banshee.Hal/Hal/Volume.cs
+===================================================================
+--- banshee.orig/src/Backends/Banshee.Hal/Hal/Volume.cs 2011-07-02 10:03:35.000000000 +0800
++++ banshee/src/Backends/Banshee.Hal/Hal/Volume.cs 2011-07-06 00:01:31.824072916 +0800
+@@ -30,7 +30,7 @@
+ using System.Collections;
+ using System.Collections.Generic;
+
+-using NDesk.DBus;
++using DBus;
+
+ namespace Hal
+ {
+Index: banshee/src/Clients/Beroe/Beroe/IndexerClient.cs
+===================================================================
+--- banshee.orig/src/Clients/Beroe/Beroe/IndexerClient.cs 2011-07-02 10:03:35.000000000 +0800
++++ banshee/src/Clients/Beroe/Beroe/IndexerClient.cs 2011-07-06 00:01:31.824072916 +0800
+@@ -31,7 +31,7 @@
+ using System.Reflection;
+ using System.Diagnostics;
+
+-using NDesk.DBus;
++using DBus;
+ using Hyena;
+
+ using Banshee.Base;
+Index: banshee/src/Clients/Booter/Booter/Entry.cs
+===================================================================
+--- banshee.orig/src/Clients/Booter/Booter/Entry.cs 2011-07-02 10:03:35.000000000 +0800
++++ banshee/src/Clients/Booter/Booter/Entry.cs 2011-07-06 00:01:31.827406233 +0800
+@@ -58,7 +58,7 @@
+
+ using Mono.Unix;
+
+-using NDesk.DBus;
++using DBus;
+
+ using Hyena;
+ using Hyena.CommandLine;
+Index: banshee/src/Clients/Halie/Halie/Client.cs
+===================================================================
+--- banshee.orig/src/Clients/Halie/Halie/Client.cs 2011-07-02 10:03:35.000000000 +0800
++++ banshee/src/Clients/Halie/Halie/Client.cs 2011-07-06 00:01:31.827406233 +0800
+@@ -30,7 +30,7 @@
+ using System.IO;
+ using System.Collections.Generic;
+
+-using NDesk.DBus;
++using DBus;
+
+ using Hyena;
+ using Banshee.Base;
+Index: banshee/src/Core/Banshee.CollectionIndexer/Banshee.Collection.Indexer.RemoteHelper/IndexerClient.cs
+===================================================================
+--- banshee.orig/src/Core/Banshee.CollectionIndexer/Banshee.Collection.Indexer.RemoteHelper/IndexerClient.cs 2011-07-02 10:03:35.000000000 +0800
++++ banshee/src/Core/Banshee.CollectionIndexer/Banshee.Collection.Indexer.RemoteHelper/IndexerClient.cs 2011-07-06 00:01:31.854072760 +0800
+@@ -31,7 +31,7 @@
+
+ using Hyena;
+
+-using NDesk.DBus;
++using DBus;
+ using org.freedesktop.DBus;
+
+ using Banshee.Collection.Indexer;
+Index: banshee/src/Core/Banshee.CollectionIndexer/Banshee.Collection.Indexer/ICollectionIndexer.cs
+===================================================================
+--- banshee.orig/src/Core/Banshee.CollectionIndexer/Banshee.Collection.Indexer/ICollectionIndexer.cs 2011-07-02 10:03:35.000000000 +0800
++++ banshee/src/Core/Banshee.CollectionIndexer/Banshee.Collection.Indexer/ICollectionIndexer.cs 2011-07-06 00:01:31.860739394 +0800
+@@ -28,7 +28,7 @@
+
+ using System;
+ using System.Collections.Generic;
+-using NDesk.DBus;
++using DBus;
+
+ namespace Banshee.Collection.Indexer
+ {
+Index: banshee/src/Core/Banshee.CollectionIndexer/Banshee.Collection.Indexer/ICollectionIndexerService.cs
+===================================================================
+--- banshee.orig/src/Core/Banshee.CollectionIndexer/Banshee.Collection.Indexer/ICollectionIndexerService.cs 2011-07-02 10:03:35.000000000 +0800
++++ banshee/src/Core/Banshee.CollectionIndexer/Banshee.Collection.Indexer/ICollectionIndexerService.cs 2011-07-06 00:01:31.860739394 +0800
+@@ -27,7 +27,7 @@
+ //
+
+ using System;
+-using NDesk.DBus;
++using DBus;
+
+ namespace Banshee.Collection.Indexer
+ {
+Index: banshee/src/Core/Banshee.Core/Banshee.Collection/ITrackInfo.cs
+===================================================================
+--- banshee.orig/src/Core/Banshee.Core/Banshee.Collection/ITrackInfo.cs 2011-07-02 10:03:35.000000000 +0800
++++ banshee/src/Core/Banshee.Core/Banshee.Collection/ITrackInfo.cs 2011-07-06 00:01:31.860739394 +0800
+@@ -26,7 +26,7 @@
+ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ //
+
+-using NDesk.DBus;
++using DBus;
+
+ namespace Banshee.Collection
+ {
+Index: banshee/src/Core/Banshee.Services/Banshee.Collection.Indexer/CollectionIndexerService.cs
+===================================================================
+--- banshee.orig/src/Core/Banshee.Services/Banshee.Collection.Indexer/CollectionIndexerService.cs 2011-07-02 10:03:35.000000000 +0800
++++ banshee/src/Core/Banshee.Services/Banshee.Collection.Indexer/CollectionIndexerService.cs 2011-07-06 00:01:31.860739394 +0800
+@@ -29,7 +29,7 @@
+ using System;
+ using System.Collections.Generic;
+
+-using NDesk.DBus;
++using DBus;
+
+ using Hyena.Query;
+ using Hyena.Data.Sqlite;
+Index: banshee/src/Core/Banshee.Services/Banshee.Collection.Indexer/ICollectionIndexer.cs
+===================================================================
+--- banshee.orig/src/Core/Banshee.Services/Banshee.Collection.Indexer/ICollectionIndexer.cs 2011-07-02 10:03:35.000000000 +0800
++++ banshee/src/Core/Banshee.Services/Banshee.Collection.Indexer/ICollectionIndexer.cs 2011-07-06 00:01:31.864072711 +0800
+@@ -28,7 +28,7 @@
+
+ using System;
+ using System.Collections.Generic;
+-using NDesk.DBus;
++using DBus;
+
+ namespace Banshee.Collection.Indexer
+ {
+Index: banshee/src/Core/Banshee.Services/Banshee.Collection.Indexer/ICollectionIndexerService.cs
+===================================================================
+--- banshee.orig/src/Core/Banshee.Services/Banshee.Collection.Indexer/ICollectionIndexerService.cs 2011-07-02 10:03:35.000000000 +0800
++++ banshee/src/Core/Banshee.Services/Banshee.Collection.Indexer/ICollectionIndexerService.cs 2011-07-06 00:01:31.864072711 +0800
+@@ -27,7 +27,7 @@
+ //
+
+ using System;
+-using NDesk.DBus;
++using DBus;
+
+ namespace Banshee.Collection.Indexer
+ {
+Index: banshee/src/Core/Banshee.Services/Banshee.Collection.Indexer/IIndexerClient.cs
+===================================================================
+--- banshee.orig/src/Core/Banshee.Services/Banshee.Collection.Indexer/IIndexerClient.cs 2011-07-02 10:03:35.000000000 +0800
++++ banshee/src/Core/Banshee.Services/Banshee.Collection.Indexer/IIndexerClient.cs 2011-07-06 00:01:31.867406027 +0800
+@@ -27,7 +27,7 @@
+ //
+
+ using System;
+-using NDesk.DBus;
++using DBus;
+
+ namespace Banshee.Collection.Indexer
+ {
+Index: banshee/src/Core/Banshee.Services/Banshee.Collection/IExportableModel.cs
+===================================================================
+--- banshee.orig/src/Core/Banshee.Services/Banshee.Collection/IExportableModel.cs 2011-07-02 10:03:35.000000000 +0800
++++ banshee/src/Core/Banshee.Services/Banshee.Collection/IExportableModel.cs 2011-07-06 00:01:31.867406027 +0800
+@@ -29,7 +29,7 @@
+ using System.Collections.Generic;
+
+ using Banshee.ServiceStack;
+-using NDesk.DBus;
++using DBus;
+
+ namespace Banshee.Collection
+ {
+Index: banshee/src/Core/Banshee.Services/Banshee.MediaEngine/IPlayerEngineService.cs
+===================================================================
+--- banshee.orig/src/Core/Banshee.Services/Banshee.MediaEngine/IPlayerEngineService.cs 2011-07-02 10:03:35.000000000 +0800
++++ banshee/src/Core/Banshee.Services/Banshee.MediaEngine/IPlayerEngineService.cs 2011-07-06 00:01:31.867406027 +0800
+@@ -28,7 +28,7 @@
+
+ using System;
+ using System.Collections.Generic;
+-using NDesk.DBus;
++using DBus;
+
+ using Banshee.ServiceStack;
+
+Index: banshee/src/Core/Banshee.Services/Banshee.Networking/NetworkManager.cs
+===================================================================
+--- banshee.orig/src/Core/Banshee.Services/Banshee.Networking/NetworkManager.cs 2011-07-02 10:03:35.000000000 +0800
++++ banshee/src/Core/Banshee.Services/Banshee.Networking/NetworkManager.cs 2011-07-06 00:01:31.867406027 +0800
+@@ -30,7 +30,7 @@
+ using System.Reflection;
+ using System.Collections;
+ using System.Collections.Generic;
+-using NDesk.DBus;
++using DBus;
+
+ namespace Banshee.Networking
+ {
+Index: banshee/src/Core/Banshee.Services/Banshee.Networking/Wicd.cs
+===================================================================
+--- banshee.orig/src/Core/Banshee.Services/Banshee.Networking/Wicd.cs 2011-07-02 10:03:35.000000000 +0800
++++ banshee/src/Core/Banshee.Services/Banshee.Networking/Wicd.cs 2011-07-06 00:01:31.907405818 +0800
+@@ -30,7 +30,7 @@
+ using System.Reflection;
+ using System.Collections;
+ using System.Collections.Generic;
+-using NDesk.DBus;
++using DBus;
+
+ namespace Banshee.Networking
+ {
+Index: banshee/src/Core/Banshee.Services/Banshee.PlaybackController/IPlaybackControllerService.cs
+===================================================================
+--- banshee.orig/src/Core/Banshee.Services/Banshee.PlaybackController/IPlaybackControllerService.cs 2011-07-02 10:03:35.000000000 +0800
++++ banshee/src/Core/Banshee.Services/Banshee.PlaybackController/IPlaybackControllerService.cs 2011-07-06 00:01:31.907405818 +0800
+@@ -27,7 +27,7 @@
+ //
+
+ using System;
+-using NDesk.DBus;
++using DBus;
+
+ using Banshee.ServiceStack;
+
+@@ -39,7 +39,7 @@
+ public interface IPlaybackControllerService : IDBusExportable
+ {
+ // FIXME: IPlaybackControllerExportable : IPlaybackController
+- // but NDesk DBus has a design flaw where it only exports
++ // but DBus-Sharp has a design flaw where it only exports
+ // members of the top level interface where the [Interface]
+ // attribute is applied
+
+Index: banshee/src/Core/Banshee.Services/Banshee.ServiceStack/DBusCommandService.cs
+===================================================================
+--- banshee.orig/src/Core/Banshee.Services/Banshee.ServiceStack/DBusCommandService.cs 2011-07-02 10:03:35.000000000 +0800
++++ banshee/src/Core/Banshee.Services/Banshee.ServiceStack/DBusCommandService.cs 2011-07-06 00:01:31.920739085 +0800
+@@ -27,7 +27,7 @@
+ //
+
+ using System;
+-using NDesk.DBus;
++using DBus;
+
+ namespace Banshee.ServiceStack
+ {
+Index: banshee/src/Core/Banshee.Services/Banshee.ServiceStack/DBusConnection.cs
+===================================================================
+--- banshee.orig/src/Core/Banshee.Services/Banshee.ServiceStack/DBusConnection.cs 2011-07-02 10:03:35.000000000 +0800
++++ banshee/src/Core/Banshee.Services/Banshee.ServiceStack/DBusConnection.cs 2011-07-06 00:01:31.920739085 +0800
+@@ -29,7 +29,7 @@
+ using System;
+ using System.Collections.Generic;
+
+-using NDesk.DBus;
++using DBus;
+ using org.freedesktop.DBus;
+
+ using Hyena;
+Index: banshee/src/Core/Banshee.Services/Banshee.ServiceStack/DBusServiceManager.cs
+===================================================================
+--- banshee.orig/src/Core/Banshee.Services/Banshee.ServiceStack/DBusServiceManager.cs 2011-07-02 10:03:35.000000000 +0800
++++ banshee/src/Core/Banshee.Services/Banshee.ServiceStack/DBusServiceManager.cs 2011-07-06 00:01:32.024071882 +0800
+@@ -32,7 +32,7 @@
+ using System.Collections.Generic;
+ using System.Reflection;
+
+-using NDesk.DBus;
++using DBus;
+ using org.freedesktop.DBus;
+
+ using Hyena;
+Index: banshee/src/Core/Banshee.Services/Banshee.Sources/IFilterableSource.cs
+===================================================================
+--- banshee.orig/src/Core/Banshee.Services/Banshee.Sources/IFilterableSource.cs 2011-07-02 10:03:35.000000000 +0800
++++ banshee/src/Core/Banshee.Services/Banshee.Sources/IFilterableSource.cs 2011-07-06 00:01:32.024071882 +0800
+@@ -29,7 +29,7 @@
+ using System;
+ using System.Collections.Generic;
+
+-using NDesk.DBus;
++using DBus;
+
+ using Banshee.Collection;
+
+Index: banshee/src/Core/Banshee.Services/Banshee.Sources/ISource.cs
+===================================================================
+--- banshee.orig/src/Core/Banshee.Services/Banshee.Sources/ISource.cs 2011-07-02 10:03:35.000000000 +0800
++++ banshee/src/Core/Banshee.Services/Banshee.Sources/ISource.cs 2011-07-06 00:01:32.024071882 +0800
+@@ -28,7 +28,7 @@
+
+ using System.Collections.Generic;
+
+-using NDesk.DBus;
++using DBus;
+
+ using Banshee.ServiceStack;
+
+Index: banshee/src/Core/Banshee.Services/Banshee.Sources/ISourceManager.cs
+===================================================================
+--- banshee.orig/src/Core/Banshee.Services/Banshee.Sources/ISourceManager.cs 2011-07-02 10:03:35.000000000 +0800
++++ banshee/src/Core/Banshee.Services/Banshee.Sources/ISourceManager.cs 2011-07-06 00:01:32.027405199 +0800
+@@ -29,7 +29,7 @@
+ using System;
+ using System.Collections.Generic;
+
+-using NDesk.DBus;
++using DBus;
+
+ using Banshee.ServiceStack;
+
+Index: banshee/src/Core/Banshee.Services/Banshee.Sources/ITrackModelSource.cs
+===================================================================
+--- banshee.orig/src/Core/Banshee.Services/Banshee.Sources/ITrackModelSource.cs 2011-07-02 10:03:35.000000000 +0800
++++ banshee/src/Core/Banshee.Services/Banshee.Sources/ITrackModelSource.cs 2011-07-06 00:01:32.080738259 +0800
+@@ -29,7 +29,7 @@
+ using System;
+ using System.Collections.Generic;
+
+-using NDesk.DBus;
++using DBus;
+
+ using Banshee.Collection;
+ using Hyena.Collections;
+Index: banshee/src/Core/Banshee.ThickClient/Banshee.Gui/IClientWindow.cs
+===================================================================
+--- banshee.orig/src/Core/Banshee.ThickClient/Banshee.Gui/IClientWindow.cs 2011-07-02 10:03:35.000000000 +0800
++++ banshee/src/Core/Banshee.ThickClient/Banshee.Gui/IClientWindow.cs 2011-07-06 00:01:32.084071575 +0800
+@@ -27,7 +27,7 @@
+ //
+
+ using System;
+-using NDesk.DBus;
++using DBus;
+
+ using Banshee.ServiceStack;
+
+Index: banshee/src/Core/Banshee.ThickClient/Banshee.Gui/IGlobalUIActions.cs
+===================================================================
+--- banshee.orig/src/Core/Banshee.ThickClient/Banshee.Gui/IGlobalUIActions.cs 2011-07-02 10:03:35.000000000 +0800
++++ banshee/src/Core/Banshee.ThickClient/Banshee.Gui/IGlobalUIActions.cs 2011-07-06 00:01:32.134071315 +0800
+@@ -25,7 +25,7 @@
+ // THE SOFTWARE.
+
+ using System;
+-using NDesk.DBus;
++using DBus;
+
+ using Banshee.ServiceStack;
+
+Index: banshee/src/Extensions/Banshee.Mpris/Banshee.Mpris/IMediaPlayer.cs
+===================================================================
+--- banshee.orig/src/Extensions/Banshee.Mpris/Banshee.Mpris/IMediaPlayer.cs 2011-07-02 10:03:35.000000000 +0800
++++ banshee/src/Extensions/Banshee.Mpris/Banshee.Mpris/IMediaPlayer.cs 2011-07-06 00:01:32.167404477 +0800
+@@ -26,7 +26,7 @@
+
+ using System;
+ using System.Collections.Generic;
+-using NDesk.DBus;
++using DBus;
+
+ namespace Banshee.Mpris
+ {
+Index: banshee/src/Extensions/Banshee.Mpris/Banshee.Mpris/IPlayer.cs
+===================================================================
+--- banshee.orig/src/Extensions/Banshee.Mpris/Banshee.Mpris/IPlayer.cs 2011-07-02 10:03:35.000000000 +0800
++++ banshee/src/Extensions/Banshee.Mpris/Banshee.Mpris/IPlayer.cs 2011-07-06 00:01:32.184071059 +0800
+@@ -28,7 +28,7 @@
+
+ using System;
+ using System.Collections.Generic;
+-using NDesk.DBus;
++using DBus;
+
+ namespace Banshee.Mpris
+ {
+Index: banshee/src/Extensions/Banshee.Mpris/Banshee.Mpris/MediaPlayer.cs
+===================================================================
+--- banshee.orig/src/Extensions/Banshee.Mpris/Banshee.Mpris/MediaPlayer.cs 2011-07-02 10:03:35.000000000 +0800
++++ banshee/src/Extensions/Banshee.Mpris/Banshee.Mpris/MediaPlayer.cs 2011-07-06 00:01:32.204070954 +0800
+@@ -33,7 +33,7 @@
+ using System.Linq;
+ using System.Text;
+
+-using NDesk.DBus;
++using DBus;
+ using Hyena;
+
+ using Banshee.Gui;
+Index: banshee/src/Extensions/Banshee.Mpris/Banshee.Mpris/MprisService.cs
+===================================================================
+--- banshee.orig/src/Extensions/Banshee.Mpris/Banshee.Mpris/MprisService.cs 2011-07-02 10:03:35.000000000 +0800
++++ banshee/src/Extensions/Banshee.Mpris/Banshee.Mpris/MprisService.cs 2011-07-06 00:01:32.224070853 +0800
+@@ -30,7 +30,7 @@
+
+ using System;
+ using org.freedesktop.DBus;
+-using NDesk.DBus;
++using DBus;
+ using Hyena;
+ using Banshee.MediaEngine;
+ using Banshee.PlaybackController;
+Index: banshee/src/Extensions/Banshee.MultimediaKeys/Banshee.MultimediaKeys/MultimediaKeysService.cs
+===================================================================
+--- banshee.orig/src/Extensions/Banshee.MultimediaKeys/Banshee.MultimediaKeys/MultimediaKeysService.cs 2011-07-02 10:03:35.000000000 +0800
++++ banshee/src/Extensions/Banshee.MultimediaKeys/Banshee.MultimediaKeys/MultimediaKeysService.cs 2011-07-06 00:01:32.264070645 +0800
+@@ -31,7 +31,7 @@
+ using System;
+ using Mono.Unix;
+
+-using NDesk.DBus;
++using DBus;
+
+ using Hyena;
+ using Banshee.Base;
+Index: banshee/src/Extensions/Banshee.NotificationArea/Notifications/Notification.cs
+===================================================================
+--- banshee.orig/src/Extensions/Banshee.NotificationArea/Notifications/Notification.cs 2011-07-02 10:03:35.000000000 +0800
++++ banshee/src/Extensions/Banshee.NotificationArea/Notifications/Notification.cs 2011-07-06 00:01:32.290737175 +0800
+@@ -30,7 +30,7 @@
+ using Gdk;
+ using Gtk;
+
+-using NDesk.DBus;
++using DBus;
+ using org.freedesktop;
+ using org.freedesktop.DBus;
+
+Index: banshee/src/Extensions/Banshee.NotificationArea/Notifications/Notifications.cs
+===================================================================
+--- banshee.orig/src/Extensions/Banshee.NotificationArea/Notifications/Notifications.cs 2011-07-02 10:03:35.000000000 +0800
++++ banshee/src/Extensions/Banshee.NotificationArea/Notifications/Notifications.cs 2011-07-06 00:01:32.327403652 +0800
+@@ -25,7 +25,7 @@
+ using System;
+ using System.Collections.Generic;
+
+-using NDesk.DBus;
++using DBus;
+ using org.freedesktop;
+ using org.freedesktop.DBus;
+
+Index: banshee/src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/IPlayQueue.cs
+===================================================================
+--- banshee.orig/src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/IPlayQueue.cs 2011-07-02 10:03:35.000000000 +0800
++++ banshee/src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/IPlayQueue.cs 2011-07-06 00:01:32.330736967 +0800
+@@ -27,7 +27,7 @@
+ //
+
+ using System;
+-using NDesk.DBus;
++using DBus;
+
+ namespace Banshee.PlayQueue
+ {
+Index: banshee/src/Extensions/Banshee.Torrent/Banshee.Torrent/TorrentFileDownloadTask.cs
+===================================================================
+--- banshee.orig/src/Extensions/Banshee.Torrent/Banshee.Torrent/TorrentFileDownloadTask.cs 2011-07-02 10:03:35.000000000 +0800
++++ banshee/src/Extensions/Banshee.Torrent/Banshee.Torrent/TorrentFileDownloadTask.cs 2011-07-06 00:01:32.330736967 +0800
+@@ -104,7 +104,7 @@
+ downloader.Stop ();
+ }
+
+- private void OnDownloaderStateChanged (NDesk.DBus.ObjectPath path, TorrentState from, TorrentState to)
++ private void OnDownloaderStateChanged (DBus.ObjectPath path, TorrentState from, TorrentState to)
+ {
+ if (downloader.GetState () == TorrentState.Seeding) {
+ SetProgress (100);
+Index: banshee/src/Extensions/Banshee.Torrent/Banshee.Torrent/TorrentService.cs
+===================================================================
+--- banshee.orig/src/Extensions/Banshee.Torrent/Banshee.Torrent/TorrentService.cs 2011-07-02 10:03:35.000000000 +0800
++++ banshee/src/Extensions/Banshee.Torrent/Banshee.Torrent/TorrentService.cs 2011-07-06 00:01:32.417403187 +0800
+@@ -29,7 +29,7 @@
+ using System;
+ using System.Collections.Generic;
+
+-using NDesk.DBus;
++using DBus;
+ using org.freedesktop.DBus;
+ using MonoTorrent.DBus;
+
+Index: banshee/src/Extensions/Banshee.SoundMenu/Banshee.SoundMenu/SoundMenuProxy.cs
+===================================================================
+--- banshee.orig/src/Extensions/Banshee.SoundMenu/Banshee.SoundMenu/SoundMenuProxy.cs 2011-07-06 00:14:55.524031921 +0800
++++ banshee/src/Extensions/Banshee.SoundMenu/Banshee.SoundMenu/SoundMenuProxy.cs 2011-07-06 00:15:03.717333832 +0800
+@@ -26,7 +26,7 @@
+
+ using System;
+
+-using NDesk.DBus;
++using DBus;
+
+ using Hyena;
+
+Index: banshee/src/Extensions/Banshee.Mpris/Banshee.Mpris/IPlaylists.cs
+===================================================================
+--- banshee.orig/src/Extensions/Banshee.Mpris/Banshee.Mpris/IPlaylists.cs 2011-07-06 00:15:40.663858983 +0800
++++ banshee/src/Extensions/Banshee.Mpris/Banshee.Mpris/IPlaylists.cs 2011-07-06 00:15:47.897164645 +0800
+@@ -25,7 +25,7 @@
+ // THE SOFTWARE.
+
+ using System;
+-using NDesk.DBus;
++using DBus;
+
+ namespace Banshee.Mpris
+ {
diff --git a/debian/patches/series b/debian/patches/series
index 9ce1eb5..fa4de07 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,4 +6,5 @@
07_enable-mpris-by-default.patch
08_remove_unrelevant_media.patch
0001-Revert-ArtworkManager-Cache-null-artwork-for-fast-lo.patch
+0001-dbus-Replace-NDesk.DBus-references-by-dbus-sharp-bgo.patch
99_ltmain_as-needed.patch
--
banshee
More information about the Pkg-cli-apps-commits
mailing list