From: Steven Luo <steven+maemo@steven676.net>
Date: Sat, 19 Dec 2009 02:48:35 +0000 (-0800)
Subject: Depend on libosso-dev instead of libdbus-1-dev for the plugin
X-Git-Tag: diablo-package-3.0rc1-2~1
X-Git-Url: http://git.maemo.org/git/?p=browser-switch;a=commitdiff_plain;h=4f6af7739b8ce73247354ba73785ced6f4d2b56d

Depend on libosso-dev instead of libdbus-1-dev for the plugin

The hildon-control-panel plugin interface needs libosso-dev to compile;
the dependency on libdbus-1-dev and use of pkg-config dbus-1 was just
covering this up.
---

diff --git a/config-ui/Makefile b/config-ui/Makefile
index 8e174d0..4cd2d72 100644
--- a/config-ui/Makefile
+++ b/config-ui/Makefile
@@ -4,11 +4,11 @@ CFLAGS_PLUGIN = -fPIC
 CPPFLAGS = -I../ `pkg-config --cflags gtk+-2.0`
 CPPFLAGS_HILDON = -DHILDON `pkg-config --cflags hildon-1`
 CPPFLAGS_PLUGIN = $(CPPFLAGS_HILDON) -DHILDON_CP_APPLET \
-	`pkg-config --cflags dbus-1` `pkg-config --cflags hildon-control-panel`
+	`pkg-config --cflags libosso` `pkg-config --cflags hildon-control-panel`
 LDFLAGS = `pkg-config --libs gtk+-2.0`
 LDFLAGS_HILDON = `pkg-config --libs hildon-1`
 LDFLAGS_PLUGIN = -shared $(LDFLAGS_HILDON) \
-	`pkg-config --libs dbus-1` `pkg-config --libs hildon-control-panel`
+	`pkg-config --libs libosso` `pkg-config --libs hildon-control-panel`
 PREFIX = /usr
 
 other_obj = ../configfile.o
diff --git a/debian/control b/debian/control
index 9e4773a..385177e 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: browser-switchboard
 Section: user/network
 Priority: extra
 Maintainer: Steven Luo <steven+maemo@steven676.net>
-Build-Depends: debhelper (>= 5), libdbus-1-dev, libdbus-glib-1-dev, libgtk2.0-dev, libhildon1-dev, hildon-control-panel-dev
+Build-Depends: debhelper (>= 5), libdbus-glib-1-dev, libgtk2.0-dev, libhildon1-dev, libosso-dev, hildon-control-panel-dev
 Standards-Version: 3.7.2
 
 Package: browser-switchboard