[Pkg-cli-apps-commits] [gnome-do] 02/05: Transition to DBus# 2.0

[Christopher Halse Rogers]

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

raof-guest pushed a commit to branch master
in repository gnome-do.

commit 0e53c121e8e2d3a29fc69fdc524a7183434161d3
Author: Christopher James Halse Rogers <raof at ubuntu.com>
Date:   Sun Dec 29 12:56:45 2013 +0800

    Transition to DBus# 2.0
---
 debian/control                      |  4 ++--
 debian/patches/03_dbus_sharp_2.diff | 13 +++++++++++++
 debian/patches/series               |  1 +
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/debian/control b/debian/control
index 4a96def..14f3dfb 100644
--- a/debian/control
+++ b/debian/control
@@ -11,8 +11,8 @@ Build-Depends: debhelper (>= 7.0.50),
                autotools-dev,
                automake,
     	       libtool,
-               libdbus1.0-cil-dev,
-               libdbus-glib1.0-cil-dev,
+               libdbus2.0-cil-dev,
+               libdbus-glib2.0-cil-dev,
                libnunit-cil-dev,
                libmono-cairo2.0-cil,
                cli-common-dev (>= 0.5.7),
diff --git a/debian/patches/03_dbus_sharp_2.diff b/debian/patches/03_dbus_sharp_2.diff
new file mode 100644
index 0000000..ac855e3
--- /dev/null
+++ b/debian/patches/03_dbus_sharp_2.diff
@@ -0,0 +1,13 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -97,8 +97,8 @@
+ AC_SUBST([GKEYFILE_SHARP_LIBS])
+ 
+ dnl -- Use D-Bus# where available.
+-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_SHARP_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_SHARP_GLIB=no)
+ 
+ if test "x$HAVE_DBUS_SHARP" = "xyes" ; then
+ 	DBUS_BUILD_DEFINES=-define:USE_DBUS_SHARP
diff --git a/debian/patches/series b/debian/patches/series
index b227865..b3a005f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 01_fix_libX11_linkage.diff
 02_use_cli_for_wrapper.diff
+03_dbus_sharp_2.diff

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