[Pkg-cli-apps-commits] [tomboy] 01/02: Switch to new DBUS# API.

[Jo Shields]

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

directhex pushed a commit to annotated tag debian/1.14.1-3
in repository tomboy.

commit f8ca6798b5fad70a8ce46c3f1565b2ab2f5485b6
Author: Jo Shields <directhex at apebox.org>
Date:   Sun Oct 27 23:46:50 2013 +0000

    Switch to new DBUS# API.
---
 debian/control                       |  4 ++--
 debian/patches/series                |  1 +
 debian/patches/use_dbussharp_2.patch | 27 +++++++++++++++++++++++++++
 3 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/debian/control b/debian/control
index 80fa921..455b9b5 100644
--- a/debian/control
+++ b/debian/control
@@ -20,8 +20,8 @@ Build-Depends: debhelper (>= 8.1.0),
                libgmime2.6-cil-dev,
                gnome-doc-utils (>= 0.3.2),
                scrollkeeper,
-               libdbus1.0-cil-dev (>= 0.4),
-               libdbus-glib1.0-cil-dev (>= 0.3),
+               libdbus2.0-cil-dev,
+               libdbus-glib2.0-cil-dev,
                libmono-addins-cil-dev (>= 0.3),
                libmono-addins-gui-cil-dev (>= 0.3),
                libproxy-dev
diff --git a/debian/patches/series b/debian/patches/series
index de69945..b8d7b7e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 01_dllmaps.patch
 20_remove_pcfile_requires
+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..10205ec
--- /dev/null
+++ b/debian/patches/use_dbussharp_2.patch
@@ -0,0 +1,27 @@
+Index: tomboy/configure.in
+===================================================================
+--- tomboy.orig/configure.in	2014-01-09 10:41:48.213622716 +0000
++++ tomboy/configure.in	2014-01-09 10:41:48.209622716 +0000
+@@ -175,7 +175,7 @@
+ #
+ # Check for dbus-sharp
+ #
+-PKG_CHECK_MODULES(DBUS, dbus-sharp-1.0 >= 0.4 dbus-sharp-glib-1.0 >= 0.3)
++PKG_CHECK_MODULES(DBUS, dbus-sharp-2.0 >= 0.4 dbus-sharp-glib-2.0 >= 0.3)
+ AC_SUBST(DBUS_LIBS)
+ 
+ #
+Index: tomboy/Tomboy/RemoteControlProxy.cs
+===================================================================
+--- tomboy.orig/Tomboy/RemoteControlProxy.cs	2013-10-27 23:42:50.649722383 +0000
++++ tomboy/Tomboy/RemoteControlProxy.cs	2014-01-09 10:42:13.273621654 +0000
+@@ -55,8 +55,7 @@
+ 				return null;
+ 
+ 			RemoteControl remote_control = new RemoteControl (manager);
+-			Bus.Session.Register (Namespace,
+-			                      new ObjectPath (Path),
++			Bus.Session.Register (new ObjectPath (Path),
+ 			                      remote_control);
+ 			return remote_control;
+ #else

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