Merge commit 'diablo-package-3.0rc1-2' into fremantle-package

Conflicts:

	debian/changelog

diff --git a/config-ui/Makefile b/config-ui/Makefile
index 8e174d0..4cd2d72 100644 (file)
--- 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/changelog b/debian/changelog
index 1993fc6..75ca289 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+browser-switchboard (3.0~rc1-2) extras-devel; urgency=low
+
+  * Actually upload to extras-devel.
+  * Replace the dependency on libdbus-1-dev and the call to pkg-config for
+    dbus-1 with libosso-dev and libosso, respectively, as that's the package
+    the control panel plugin interface actually needs.  Fixes autobuild.
+
+ -- Steven Luo <steven+maemo@steven676.net>  Fri, 18 Dec 2009 19:07:25 -0800
+
 browser-switchboard (3.0~rc1-1fremantle1) extras-devel; urgency=low
 
   * Experimental build for Fremantle.

diff --git a/debian/control b/debian/control
index 9e4773a..385177e 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-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