[Pkg-cli-apps-commits] [gnome-do-plugins] 01/02: Use DBus# 2.0 API.

[Jo Shields]

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

directhex pushed a commit to annotated tag debian/0.8.5-2
in repository gnome-do-plugins.

commit 9ce0e96059d8963a19b9205869d7396b2ed9d959
Author: Jo Shields <directhex at apebox.org>
Date:   Wed Oct 30 17:15:46 2013 +0000

    Use DBus# 2.0 API.
---
 debian/control                       |  6 ++----
 debian/patches/series                |  1 +
 debian/patches/use_dbussharp_2.patch | 24 ++++++++++++++++++++++++
 3 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/debian/control b/debian/control
index ee6a5ee..11ae535 100644
--- a/debian/control
+++ b/debian/control
@@ -27,13 +27,11 @@ Build-Depends-Indep:
   libgnome-vfs2.0-cil-dev,
   libmono-addins-cil-dev,
   libmono-addins-gui-cil-dev,
-  libndesk-dbus1.0-cil-dev,
-  libndesk-dbus-glib1.0-cil-dev,
+  libdbus2.0-cil-dev,
+  libdbus-glib2.0-cil-dev,
   libnotify-cil-dev,
   libwnck1.0-cil-dev,
   libgdata-cil-dev,
-  libdbus1.0-cil-dev,
-  libdbus-glib1.0-cil-dev,
   libnewtonsoft-json-cil-dev,
 Standards-Version: 3.9.3
 Homepage: http://do.davebsd.com
diff --git a/debian/patches/series b/debian/patches/series
index ddc9fbe..fecb469 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 00_debian_default_plugins.patch
 01_firefox_iceweasel_rename.patch
+use_dbussharp_2.patch
diff --git a/debian/patches/use_dbussharp_2.patch b/debian/patches/use_dbussharp_2.patch
new file mode 100644
index 0000000..a7c2bd4
--- /dev/null
+++ b/debian/patches/use_dbussharp_2.patch
@@ -0,0 +1,24 @@
+Index: gnome-do-plugins/configure.ac
+===================================================================
+--- gnome-do-plugins.orig/configure.ac	2013-10-16 10:23:32.689392590 +0100
++++ gnome-do-plugins/configure.ac	2013-10-30 17:15:01.713617613 +0000
+@@ -44,7 +44,7 @@
+ AC_MSG_RESULT([$BANSHEE_COLLECTION_INDEXER])
+ 
+ AC_MSG_CHECKING([which DBus implementation Banshee.CollectionIndexer requires])
+-if $PKG_CONFIG --print-requires $BANSHEE_COLLECTION_INDEXER 2>&1 | grep dbus-sharp-1.0 > /dev/null ; then
++if $PKG_CONFIG --print-requires $BANSHEE_COLLECTION_INDEXER 2>&1 | grep dbus-sharp-2.0 > /dev/null ; then
+ 	BANSHEE_USE_DBUS_SHARP=yes
+ 	AC_MSG_RESULT([dbus-sharp])
+ else
+@@ -53,8 +53,8 @@
+ fi
+ 
+ dnl -- DBus# required for Banshee and Telepathy support
+-PKG_CHECK_MODULES([DBUS_SHARP], [dbus-sharp-1.0], HAVE_DBUS_SHARP=yes, HAVE_DBUS_SHARP=no)
+-PKG_CHECK_MODULES([DBUS_SHARP_GLIB], [dbus-sharp-glib-1.0], HAVE_DBUS_SHARP_GLIB=yes, HAVE_DBUS_SNARP_GLIB=no)
++PKG_CHECK_MODULES([DBUS_SHARP], [dbus-sharp-2.0], HAVE_DBUS_SHARP=yes, HAVE_DBUS_SHARP=no)
++PKG_CHECK_MODULES([DBUS_SHARP_GLIB], [dbus-sharp-glib-2.0], HAVE_DBUS_SHARP_GLIB=yes, HAVE_DBUS_SNARP_GLIB=no)
+ 
+ if test "x$HAVE_DBUS_SHARP" = "xyes" ; then
+ 	DBUS_BUILD_DEFINES=-define:USE_DBUS_SHARP

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