[Pkg-cli-apps-commits] [SCM] tangerine branch, master, updated. debian/0.3.3-1-4-ga49c166

[Chow Loong Jin]

The following commit has been merged in the master branch:
commit 9965c777026c35bd12a13a0b1ddc2d8da60b79d4
Author: Chow Loong Jin <hyperair at ubuntu.com>
Date:   Tue Jul 5 02:35:33 2011 +0800

    Port to DBus#

diff --git a/debian/control b/debian/control
index 46c3b46..bd40cac 100644
--- a/debian/control
+++ b/debian/control
@@ -20,7 +20,8 @@ Build-Depends: debhelper (>= 7.0.50),
                libnini-cil-dev,
                libgtk2.0-cil-dev,
                libglade2.0-cil-dev,
-               libndesk-dbus-glib1.0-cil-dev,
+               libdbus1.0-cil-dev,
+               libdbus-glib1.0-cil-dev,
                libsm-dev,
                banshee (>= 1.9.6),
                libglib2.0-dev
diff --git a/debian/patches/dbus-sharp.patch b/debian/patches/dbus-sharp.patch
new file mode 100644
index 0000000..bdb1474
--- /dev/null
+++ b/debian/patches/dbus-sharp.patch
@@ -0,0 +1,58 @@
+Description: Port to DBus#
+Author: Chow Loong Jin <hyperair at ubuntu.com>
+Index: tangerine/plugins/Banshee/src/BansheePlugin.cs
+===================================================================
+--- tangerine.orig/plugins/Banshee/src/BansheePlugin.cs	2011-07-05 02:35:22.087507126 +0800
++++ tangerine/plugins/Banshee/src/BansheePlugin.cs	2011-07-05 02:40:34.013717681 +0800
+@@ -7,7 +7,7 @@
+ using Banshee.Collection.Indexer.RemoteHelper;
+ 
+ using DAAP;
+-using NDesk.DBus;
++using DBus;
+ using Nini;
+ using log4net;
+ 
+Index: tangerine/configure.ac
+===================================================================
+--- tangerine.orig/configure.ac	2011-07-05 02:40:33.923717813 +0800
++++ tangerine/configure.ac	2011-07-05 02:42:24.670222460 +0800
+@@ -103,10 +103,10 @@
+         PKG_CHECK_MODULES(GLADE_SHARP_20, glade-sharp-2.0)
+         AC_SUBST(GLADE_SHARP_LIBS_20)
+ 
+-        PKG_CHECK_MODULES(NDESK_DBUS_10, ndesk-dbus-1.0)
++        PKG_CHECK_MODULES(NDESK_DBUS_10, dbus-sharp-1.0)
+         AC_SUBST([NDESK_DBUS_10_LIBS])
+ 
+-        PKG_CHECK_MODULES(NDESK_DBUS_GLIB_10, ndesk-dbus-glib-1.0)
++        PKG_CHECK_MODULES(NDESK_DBUS_GLIB_10, dbus-sharp-glib-1.0)
+         AC_SUBST([NDESK_DBUS_GLIB_10_LIBS])
+ 
+         PKG_CHECK_MODULES(X_SESSION, sm)
+@@ -127,10 +127,10 @@
+         PKG_CHECK_MODULES(GLADE_SHARP_20, glade-sharp-2.0)
+         AC_SUBST(GLADE_SHARP_LIBS_20)
+ 
+-        PKG_CHECK_MODULES(NDESK_DBUS_10, ndesk-dbus-1.0)
++        PKG_CHECK_MODULES(NDESK_DBUS_10, dbus-sharp-1.0)
+         AC_SUBST([NDESK_DBUS_10_LIBS])
+ 
+-        PKG_CHECK_MODULES(NDESK_DBUS_GLIB_10, ndesk-dbus-glib-1.0)
++        PKG_CHECK_MODULES(NDESK_DBUS_GLIB_10, dbus-sharp-glib-1.0)
+         AC_SUBST([NDESK_DBUS_GLIB_10_LIBS])
+ 
+         PKG_CHECK_MODULES(X_SESSION, sm)
+@@ -151,10 +151,10 @@
+         PKG_CHECK_MODULES(GLADE_SHARP_20, glade-sharp-2.0)
+         AC_SUBST(GLADE_SHARP_LIBS_20)
+ 
+-        PKG_CHECK_MODULES(NDESK_DBUS_10, ndesk-dbus-1.0)
++        PKG_CHECK_MODULES(NDESK_DBUS_10, dbus-sharp-1.0)
+         AC_SUBST([NDESK_DBUS_10_LIBS])
+ 
+-        PKG_CHECK_MODULES(NDESK_DBUS_GLIB_10, ndesk-dbus-glib-1.0)
++        PKG_CHECK_MODULES(NDESK_DBUS_GLIB_10, dbus-sharp-glib-1.0)
+         AC_SUBST([NDESK_DBUS_GLIB_10_LIBS])
+ 
+         PKG_CHECK_MODULES(X_SESSION, sm)
diff --git a/debian/patches/series b/debian/patches/series
index c5f125e..d2c4e4e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 kfreebsd_use_assemblyrefs_in_configure.ac.patch
 CVE-2010-3381-insecure-library-loading
+dbus-sharp.patch

-- 
tangerine