Build-Depend on libdbus-1-dev, use pkg-config for dbus-1

We now use the low-level D-Bus API in the Fremantle code, so we need to
depend on libdbus-1-dev and get the pkg-config information for dbus-1
for correctness.

diff --git a/debian/control b/debian/control
index 01881bd..b12ab0e 100644 (file)
--- 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-glib-1-dev, libgtk2.0-dev, libhildon1-dev, libosso-dev, hildon-control-panel-dev
+Build-Depends: debhelper (>= 5), libdbus-1-dev, libdbus-glib-1-dev, libgtk2.0-dev, libhildon1-dev, libosso-dev, hildon-control-panel-dev
 Standards-Version: 3.8.0
 XSBC-Bugtracker: https://garage.maemo.org/tracker/?group_id=1159
 

diff --git a/debian/rules b/debian/rules
index 04f7738..33738dd 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -17,7 +17,8 @@ ifeq ($(DEB_HOST_ARCH),armel)
        endif
 endif
 
-EXTRA_CPPFLAGS = -DFREMANTLE
+EXTRA_CPPFLAGS = -DFREMANTLE `pkg-config --cflags dbus-1`
+EXTRA_LDFLAGS = `pkg-config --libs dbus-1`
 
 configure: configure-stamp
 configure-stamp:
@@ -29,7 +30,7 @@ build: build-stamp
 build-stamp: configure-stamp 
        dh_testdir
 
-       make EXTRA_CFLAGS="$(EXTRA_CFLAGS)" EXTRA_CPPFLAGS="$(EXTRA_CPPFLAGS)"
+       make EXTRA_CFLAGS="$(EXTRA_CFLAGS)" EXTRA_CPPFLAGS="$(EXTRA_CPPFLAGS)" EXTRA_LDFLAGS="$(EXTRA_LDFLAGS)"
        make -C config-ui EXTRA_CFLAGS="$(EXTRA_CFLAGS)" EXTRA_CPPFLAGS="$(EXTRA_CPPFLAGS)"
 
        touch $@