[Pkg-cli-apps-commits] [SCM] banshee-community-extensions branch, experimental, updated. debian/2.0.1-1-20-g0fb8c30
Chow Loong Jin
hyperair at ubuntu.com
Mon Jun 13 18:34:36 UTC 2011
The following commit has been merged in the experimental branch:
commit b28fd7879fc57aea503a5d5ebb8ac80f04000963
Author: Chow Loong Jin <hyperair at ubuntu.com>
Date: Tue Jun 14 01:55:15 2011 +0800
Drop upstreamed patches
diff --git a/debian/patches/0001-Move-ACLOCAL_AMFLAGS-into-Makefile.am.patch b/debian/patches/0001-Move-ACLOCAL_AMFLAGS-into-Makefile.am.patch
deleted file mode 100644
index 932f612..0000000
--- a/debian/patches/0001-Move-ACLOCAL_AMFLAGS-into-Makefile.am.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From dadeefbc80a2bb88ae4981c0db62de55eaee27c7 Mon Sep 17 00:00:00 2001
-From: Chow Loong Jin <hyperair at ubuntu.com>
-Date: Sat, 28 May 2011 16:00:45 +0800
-Subject: [PATCH] Move ACLOCAL_AMFLAGS into Makefile.am
-
-This is so that autoreconf works when called manually
----
- Makefile.am | 2 ++
- configure.ac | 1 -
- 2 files changed, 2 insertions(+), 1 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index c609bdf..1e26db7 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -1,3 +1,5 @@
-+ACLOCAL_AMFLAGS = -I build/m4/shamrock -I build/m4/shave -I build/m4/extensions ${ACLOCAL_FLAGS}
-+
- SUBDIRS = \
- build \
- help \
-diff --git a/configure.ac b/configure.ac
-index 2eace3a..bb9b864 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -5,7 +5,6 @@ AC_INIT([banshee-community-extensions], 2.0.0,
- AM_INIT_AUTOMAKE([1.9 dist-bzip2 tar-ustar dist-zip foreign])
- AM_MAINTAINER_MODE
- AM_CONFIG_HEADER([config.h])
--AC_SUBST([ACLOCAL_AMFLAGS], ["-I build/m4/shamrock -I build/m4/shave -I build/m4/extensions \${ACLOCAL_FLAGS}"])
-
- IT_PROG_INTLTOOL([0.35.0])
- AC_PROG_LIBTOOL
---
-1.7.4.1
-
diff --git a/debian/patches/0001-Use-C-instead-of-pushd-popd-for-update-pot.patch b/debian/patches/0001-Use-C-instead-of-pushd-popd-for-update-pot.patch
deleted file mode 100644
index ccb6fa1..0000000
--- a/debian/patches/0001-Use-C-instead-of-pushd-popd-for-update-pot.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From f2c2243cb2946a5de4d42d73166051c568e125f5 Mon Sep 17 00:00:00 2001
-From: Chow Loong Jin <hyperair at ubuntu.com>
-Date: Sat, 28 May 2011 19:14:47 +0800
-Subject: [PATCH] Use -C instead of pushd/popd for update-pot
-
----
- Makefile.am | 4 +---
- 1 files changed, 1 insertions(+), 3 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index 1e26db7..91140b0 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -58,9 +58,7 @@ all-local: update-pot
-
- update-pot:
- if [ "x$(top_srcdir)" = "x$(top_builddir)" ]; then \
-- pushd $(top_builddir)/po; \
-- $(MAKE) $(GETTEXT_PACKAGE).pot; \
-- popd; \
-+ $(MAKE) -C "$(top_builddir)/po" $(GETTEXT_PACKAGE).pot; \
- fi;
-
- # ---------------
---
-1.7.4.1
-
diff --git a/debian/patches/0001-Use-DBus-instead-of-NDesk.DBus.patch b/debian/patches/0001-Use-DBus-instead-of-NDesk.DBus.patch
deleted file mode 100644
index 5b216f6..0000000
--- a/debian/patches/0001-Use-DBus-instead-of-NDesk.DBus.patch
+++ /dev/null
@@ -1,365 +0,0 @@
-From d9d9f886e80524396669b54582a8d312ebef7577 Mon Sep 17 00:00:00 2001
-From: Chow Loong Jin <hyperair at ubuntu.com>
-Date: Sat, 28 May 2011 00:45:09 +0800
-Subject: [PATCH] Use DBus# instead of NDesk.DBus
-
----
- src/Awn/Banshee.Awn/AwnPlugin.cs | 6 +-
- .../Banshee.Telepathy.API/Account.cs | 2 +-
- .../Banshee.Telepathy.API/Channels/Channel.cs | 2 +-
- .../Channels/ContactListChannel.cs | 4 +-
- .../Banshee.Telepathy.API/ConnectionLocator.cs | 2 +-
- .../Banshee.Telepathy.API/DBus/DBusConnection.cs | 10 +-
- .../Banshee.Telepathy.API/DBus/DBusUtility.cs | 2 +-
- .../Banshee.Telepathy.API/DBus/EmpathyHandler.cs | 2 +-
- .../Dispatchers/ChannelHandler.cs | 4 +-
- .../Dispatchers/Dispatcher.cs | 2 +-
- .../Banshee.Telepathy.DBus/IMetadataProvider.cs | 2 +-
- .../IMetadataProviderService.cs | 2 +-
- .../Banshee.Telepathy.DBus/IPlaylistProvider.cs | 2 +-
- .../MetadataProviderService.cs | 2 +-
- .../Banshee.Telepathy.DBus/PlaylistProvider.cs | 2 +-
- .../Banshee.Telepathy/TelepathyService.cs | 4 +-
- src/Telepathy/Banshee.Telepathy/Makefile.am | 34 +-
- .../Banshee.Telepathy/Telepathy/MissionControl.cs | 2 +-
- .../Banshee.Telepathy/Telepathy/Telepathy.cs | 2 +-
- 58 files changed, 29 insertions(+), 11898 deletions(-)
-
-diff --git a/src/Awn/Banshee.Awn/AwnPlugin.cs b/src/Awn/Banshee.Awn/AwnPlugin.cs
-index b3b39ae..f839838 100755
---- a/src/Awn/Banshee.Awn/AwnPlugin.cs
-+++ b/src/Awn/Banshee.Awn/AwnPlugin.cs
-@@ -34,7 +34,7 @@ using Hyena;
-
- namespace Banshee.Awn
- {
-- [NDesk.DBus.Interface("com.google.code.Awn")]
-+ [DBus.Interface("com.google.code.Awn")]
- public interface IAvantWindowNavigator
- {
- void SetTaskIconByName (string TaskName, string ImageFileLocation);
-@@ -74,8 +74,8 @@ namespace Banshee.Awn
- try {
- Log.DebugFormat ("BansheeAwn. Starting {0}", Application.ActiveClient.ClientId);
-
-- awn = NDesk.DBus.Bus.Session.GetObject<IAvantWindowNavigator> ("com.google.code.Awn",
-- new NDesk.DBus.ObjectPath ("/com/google/code/Awn"));
-+ awn = DBus.Bus.Session.GetObject<IAvantWindowNavigator> ("com.google.code.Awn",
-+ new DBus.ObjectPath ("/com/google/code/Awn"));
-
- // Dummy call to check that awn is really there
- awn.UnsetTaskIconByName ("banshee-dummy");
-diff --git a/src/Telepathy/Banshee.Telepathy/Banshee.Telepathy.API/Account.cs b/src/Telepathy/Banshee.Telepathy/Banshee.Telepathy.API/Account.cs
-index 7a9f7b2..331224e 100644
---- a/src/Telepathy/Banshee.Telepathy/Banshee.Telepathy.API/Account.cs
-+++ b/src/Telepathy/Banshee.Telepathy/Banshee.Telepathy.API/Account.cs
-@@ -29,7 +29,7 @@
- using System;
- using System.Collections.Generic;
-
--using NDesk.DBus;
-+using DBus;
-
- using Telepathy;
-
-diff --git a/src/Telepathy/Banshee.Telepathy/Banshee.Telepathy.API/Channels/Channel.cs b/src/Telepathy/Banshee.Telepathy/Banshee.Telepathy.API/Channels/Channel.cs
-index 56e5c6d..bf7df0a 100644
---- a/src/Telepathy/Banshee.Telepathy/Banshee.Telepathy.API/Channels/Channel.cs
-+++ b/src/Telepathy/Banshee.Telepathy/Banshee.Telepathy.API/Channels/Channel.cs
-@@ -29,7 +29,7 @@
- using System;
- using System.Collections.Generic;
-
--using NDesk.DBus;
-+using DBus;
-
- using Banshee.Telepathy.API.DBus;
-
-diff --git a/src/Telepathy/Banshee.Telepathy/Banshee.Telepathy.API/Channels/ContactListChannel.cs b/src/Telepathy/Banshee.Telepathy/Banshee.Telepathy.API/Channels/ContactListChannel.cs
-index f680995..fd80971 100644
---- a/src/Telepathy/Banshee.Telepathy/Banshee.Telepathy.API/Channels/ContactListChannel.cs
-+++ b/src/Telepathy/Banshee.Telepathy/Banshee.Telepathy.API/Channels/ContactListChannel.cs
-@@ -31,7 +31,7 @@ using System.Collections.Generic;
-
- using Banshee.Telepathy.API.DBus;
-
--using NDesk.DBus;
-+using DBus;
-
- using Telepathy;
-
-@@ -174,4 +174,4 @@ namespace Banshee.Telepathy.API.Channels
- }
- }
- }
--}
-\ No newline at end of file
-+}
-diff --git a/src/Telepathy/Banshee.Telepathy/Banshee.Telepathy.API/ConnectionLocator.cs b/src/Telepathy/Banshee.Telepathy/Banshee.Telepathy.API/ConnectionLocator.cs
-index c3c599d..cb49932 100644
---- a/src/Telepathy/Banshee.Telepathy/Banshee.Telepathy.API/ConnectionLocator.cs
-+++ b/src/Telepathy/Banshee.Telepathy/Banshee.Telepathy.API/ConnectionLocator.cs
-@@ -29,7 +29,7 @@
- using System;
- using System.Collections.Generic;
-
--using NDesk.DBus;
-+using DBus;
-
- using Telepathy;
-
-diff --git a/src/Telepathy/Banshee.Telepathy/Banshee.Telepathy.API/DBus/DBusConnection.cs b/src/Telepathy/Banshee.Telepathy/Banshee.Telepathy.API/DBus/DBusConnection.cs
-index 1de055c..a50c054 100644
---- a/src/Telepathy/Banshee.Telepathy/Banshee.Telepathy.API/DBus/DBusConnection.cs
-+++ b/src/Telepathy/Banshee.Telepathy/Banshee.Telepathy.API/DBus/DBusConnection.cs
-@@ -29,14 +29,14 @@
- using System;
- using System.Collections.Generic;
-
--using NDesk.DBus;
-+using DBus;
-
- namespace Banshee.Telepathy.API.DBus
- {
- public sealed class DBusConnection
- {
- private string address;
-- private NDesk.DBus.Connection conn = null;
-+ private global::DBus.Connection conn = null;
- private IDictionary <string, object> registered;
-
- private DBusConnection ()
-@@ -47,7 +47,7 @@ namespace Banshee.Telepathy.API.DBus
- public DBusConnection (string address) : this ()
- {
- Address = address;
-- conn = NDesk.DBus.Connection.Open (address);
-+ conn = global::DBus.Connection.Open (address);
- }
-
- public DBusConnection (string address, bool mainloop) : this (address)
-@@ -126,8 +126,8 @@ namespace Banshee.Telepathy.API.DBus
- public void ConnectToMainLoop ()
- {
- if (conn != null) {
-- BusG.Init (conn);
-+ global::DBus.BusG.Init (conn);
- }
- }
- }
--}
-\ No newline at end of file
-+}
-diff --git a/src/Telepathy/Banshee.Telepathy/Banshee.Telepathy.API/DBus/DBusUtility.cs b/src/Telepathy/Banshee.Telepathy/Banshee.Telepathy.API/DBus/DBusUtility.cs
-index 574f75a..3e0fec6 100644
---- a/src/Telepathy/Banshee.Telepathy/Banshee.Telepathy.API/DBus/DBusUtility.cs
-+++ b/src/Telepathy/Banshee.Telepathy/Banshee.Telepathy.API/DBus/DBusUtility.cs
-@@ -30,7 +30,7 @@
- using System;
- using System.Collections.Generic;
-
--using NDesk.DBus;
-+using DBus;
- using org.freedesktop.DBus;
-
- namespace Banshee.Telepathy.API.DBus
-diff --git a/src/Telepathy/Banshee.Telepathy/Banshee.Telepathy.API/DBus/EmpathyHandler.cs b/src/Telepathy/Banshee.Telepathy/Banshee.Telepathy.API/DBus/EmpathyHandler.cs
-index 53a797c..73ff5a9 100644
---- a/src/Telepathy/Banshee.Telepathy/Banshee.Telepathy.API/DBus/EmpathyHandler.cs
-+++ b/src/Telepathy/Banshee.Telepathy/Banshee.Telepathy.API/DBus/EmpathyHandler.cs
-@@ -28,7 +28,7 @@
-
- using System;
-
--using NDesk.DBus;
-+using DBus;
-
- namespace Banshee.Telepathy.API.DBus
- {
-diff --git a/src/Telepathy/Banshee.Telepathy/Banshee.Telepathy.API/Dispatchers/ChannelHandler.cs b/src/Telepathy/Banshee.Telepathy/Banshee.Telepathy.API/Dispatchers/ChannelHandler.cs
-index 696aa32..3cc2059 100644
---- a/src/Telepathy/Banshee.Telepathy/Banshee.Telepathy.API/Dispatchers/ChannelHandler.cs
-+++ b/src/Telepathy/Banshee.Telepathy/Banshee.Telepathy.API/Dispatchers/ChannelHandler.cs
-@@ -29,7 +29,7 @@
- using System;
- using System.Collections.Generic;
-
--using NDesk.DBus;
-+using DBus;
- using org.freedesktop.DBus;
-
- using Telepathy;
-@@ -180,4 +180,4 @@ namespace Banshee.Telepathy.API.DBus
-
- }
- }
--}
-\ No newline at end of file
-+}
-diff --git a/src/Telepathy/Banshee.Telepathy/Banshee.Telepathy.API/Dispatchers/Dispatcher.cs b/src/Telepathy/Banshee.Telepathy/Banshee.Telepathy.API/Dispatchers/Dispatcher.cs
-index 0aec93c..205e655 100644
---- a/src/Telepathy/Banshee.Telepathy/Banshee.Telepathy.API/Dispatchers/Dispatcher.cs
-+++ b/src/Telepathy/Banshee.Telepathy/Banshee.Telepathy.API/Dispatchers/Dispatcher.cs
-@@ -29,7 +29,7 @@
- using System;
- using System.Collections.Generic;
-
--using NDesk.DBus;
-+using DBus;
-
- using Telepathy;
-
-diff --git a/src/Telepathy/Banshee.Telepathy/Banshee.Telepathy.DBus/IMetadataProvider.cs b/src/Telepathy/Banshee.Telepathy/Banshee.Telepathy.DBus/IMetadataProvider.cs
-index b0c14c4..83598de 100644
---- a/src/Telepathy/Banshee.Telepathy/Banshee.Telepathy.DBus/IMetadataProvider.cs
-+++ b/src/Telepathy/Banshee.Telepathy/Banshee.Telepathy.DBus/IMetadataProvider.cs
-@@ -28,7 +28,7 @@
-
- using System;
- using System.Collections.Generic;
--using NDesk.DBus;
-+using DBus;
-
- namespace Banshee.Telepathy.DBus
- {
-diff --git a/src/Telepathy/Banshee.Telepathy/Banshee.Telepathy.DBus/IMetadataProviderService.cs b/src/Telepathy/Banshee.Telepathy/Banshee.Telepathy.DBus/IMetadataProviderService.cs
-index 3546241..b373890 100644
---- a/src/Telepathy/Banshee.Telepathy/Banshee.Telepathy.DBus/IMetadataProviderService.cs
-+++ b/src/Telepathy/Banshee.Telepathy/Banshee.Telepathy.DBus/IMetadataProviderService.cs
-@@ -28,7 +28,7 @@
-
- using System;
- using System.Collections.Generic;
--using NDesk.DBus;
-+using DBus;
-
- namespace Banshee.Telepathy.DBus
- {
-diff --git a/src/Telepathy/Banshee.Telepathy/Banshee.Telepathy.DBus/IPlaylistProvider.cs b/src/Telepathy/Banshee.Telepathy/Banshee.Telepathy.DBus/IPlaylistProvider.cs
-index 14f969a..f73d922 100644
---- a/src/Telepathy/Banshee.Telepathy/Banshee.Telepathy.DBus/IPlaylistProvider.cs
-+++ b/src/Telepathy/Banshee.Telepathy/Banshee.Telepathy.DBus/IPlaylistProvider.cs
-@@ -28,7 +28,7 @@
-
- using System;
- using System.Collections.Generic;
--using NDesk.DBus;
-+using DBus;
-
- namespace Banshee.Telepathy.DBus
- {
-diff --git a/src/Telepathy/Banshee.Telepathy/Banshee.Telepathy.DBus/MetadataProviderService.cs b/src/Telepathy/Banshee.Telepathy/Banshee.Telepathy.DBus/MetadataProviderService.cs
-index 72b4bae..4b5c3d5 100644
---- a/src/Telepathy/Banshee.Telepathy/Banshee.Telepathy.DBus/MetadataProviderService.cs
-+++ b/src/Telepathy/Banshee.Telepathy/Banshee.Telepathy.DBus/MetadataProviderService.cs
-@@ -37,7 +37,7 @@ using Banshee.Telepathy.API.Dispatchables;
-
- using Hyena;
-
--using NDesk.DBus;
-+using DBus;
-
- namespace Banshee.Telepathy.DBus
- {
-diff --git a/src/Telepathy/Banshee.Telepathy/Banshee.Telepathy.DBus/PlaylistProvider.cs b/src/Telepathy/Banshee.Telepathy/Banshee.Telepathy.DBus/PlaylistProvider.cs
-index 7915991..be8566c 100644
---- a/src/Telepathy/Banshee.Telepathy/Banshee.Telepathy.DBus/PlaylistProvider.cs
-+++ b/src/Telepathy/Banshee.Telepathy/Banshee.Telepathy.DBus/PlaylistProvider.cs
-@@ -37,7 +37,7 @@ using Banshee.Telepathy.API.Dispatchables;
-
- using Hyena.Data.Sqlite;
-
--using NDesk.DBus;
-+using DBus;
-
- namespace Banshee.Telepathy.DBus
- {
-diff --git a/src/Telepathy/Banshee.Telepathy/Banshee.Telepathy/TelepathyService.cs b/src/Telepathy/Banshee.Telepathy/Banshee.Telepathy/TelepathyService.cs
-index 4dfccc7..4530f07 100644
---- a/src/Telepathy/Banshee.Telepathy/Banshee.Telepathy/TelepathyService.cs
-+++ b/src/Telepathy/Banshee.Telepathy/Banshee.Telepathy/TelepathyService.cs
-@@ -150,8 +150,8 @@ namespace Banshee.Telepathy
-
- public void DelayedInitialize ()
- {
-- // require for bundled version of NDesk.DBus
-- NDesk.DBus.BusG.Init ();
-+ // require for bundled version of DBus
-+ global::DBus.BusG.Init ();
-
- conn_map = new Dictionary <string, Connection> ();
- source_map = new Dictionary <string, IDictionary <Contact, ContactSource>> ();
-diff --git a/src/Telepathy/Banshee.Telepathy/Makefile.am b/src/Telepathy/Banshee.Telepathy/Makefile.am
-index c28b6a2..7b8aded 100644
---- a/src/Telepathy/Banshee.Telepathy/Makefile.am
-+++ b/src/Telepathy/Banshee.Telepathy/Makefile.am
-@@ -82,39 +82,7 @@ SOURCES = \
- Banshee.Telepathy.DBus/PlaylistProvider.cs \
- Telepathy/Constants.cs \
- Telepathy/MissionControl.cs \
-- Telepathy/Telepathy.cs \
-- NDesk.DBus/Address.cs \
-- NDesk.DBus/Authentication.cs \
-- NDesk.DBus/Bus.cs \
-- NDesk.DBus/BusObject.cs \
-- NDesk.DBus/Connection.cs \
-- NDesk.DBus/DBus.cs \
-- NDesk.DBus/DProxy.cs \
-- NDesk.DBus/ExportObject.cs \
-- NDesk.DBus/GLib.cs \
-- NDesk.DBus/GLib.IO.cs \
-- NDesk.DBus/Introspection.cs \
-- NDesk.DBus/IntrospectionSchema.cs \
-- NDesk.DBus/Mapper.cs \
-- NDesk.DBus/MatchRule.cs \
-- NDesk.DBus/Message.cs \
-- NDesk.DBus/MessageFilter.cs \
-- NDesk.DBus/MessageReader.cs \
-- NDesk.DBus/MessageWriter.cs \
-- NDesk.DBus/PendingCall.cs \
-- NDesk.DBus/Protocol.cs \
-- NDesk.DBus/Server.cs \
-- NDesk.DBus/ServerBus.cs \
-- NDesk.DBus/Signature.cs \
-- NDesk.DBus/SocketTransport.cs \
-- NDesk.DBus/Transport.cs \
-- NDesk.DBus/TypeDefiner.cs \
-- NDesk.DBus/TypeImplementer.cs \
-- NDesk.DBus/Unix.cs \
-- NDesk.DBus/UnixMonoTransport.cs \
-- NDesk.DBus/UnixNativeTransport.cs \
-- NDesk.DBus/UnixTransport.cs \
-- NDesk.DBus/Wrapper.cs
-+ Telepathy/Telepathy.cs
-
- RESOURCES = \
- Resources/ActiveSourceUI.xml \
-diff --git a/src/Telepathy/Banshee.Telepathy/Telepathy/MissionControl.cs b/src/Telepathy/Banshee.Telepathy/Telepathy/MissionControl.cs
-index ef1f059..30d71af 100644
---- a/src/Telepathy/Banshee.Telepathy/Telepathy/MissionControl.cs
-+++ b/src/Telepathy/Banshee.Telepathy/Telepathy/MissionControl.cs
-@@ -23,7 +23,7 @@
-
- using System;
- using System.Collections.Generic;
--using NDesk.DBus;
-+using DBus;
-
- namespace Telepathy.MissionControl
- {
-diff --git a/src/Telepathy/Banshee.Telepathy/Telepathy/Telepathy.cs b/src/Telepathy/Banshee.Telepathy/Telepathy/Telepathy.cs
-index 98172a7..56f824b 100644
---- a/src/Telepathy/Banshee.Telepathy/Telepathy/Telepathy.cs
-+++ b/src/Telepathy/Banshee.Telepathy/Telepathy/Telepathy.cs
-@@ -24,7 +24,7 @@
-
- using System;
- using System.Collections.Generic;
--using NDesk.DBus;
-+using DBus;
-
- namespace Telepathy
- {
---
-1.7.4.1
-
diff --git a/debian/patches/series b/debian/patches/series
index a2eea2e..41d2436 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1 @@
-0001-Use-DBus-instead-of-NDesk.DBus.patch
-0001-Move-ACLOCAL_AMFLAGS-into-Makefile.am.patch
-0001-Use-C-instead-of-pushd-popd-for-update-pot.patch
fsck-intltool.patch
--
banshee-community-extensions
More information about the Pkg-cli-apps-commits
mailing list