Merge branch 'diablo-package' into fremantle-package

diff --combined debian/changelog
index 37e8d85,5455c6e..da19a48
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,19 -1,11 +1,27 @@@
+ browser-switchboard (3.1-2) extras-devel; urgency=low
+ 
+   * Drop the dependency on tablet-browser-ui for Diablo until maemo.org
+     Bugzilla #8806 gets fixed; this was preventing 3.1-1 from reaching
+     extras.
+ 
+  -- Steven Luo <steven+maemo@steven676.net>  Fri, 05 Feb 2010 00:05:27 -0800 
+ 
 +browser-switchboard (3.1-1fremantle2) extras-devel; urgency=low
 +
 +  * Alpha release for Fremantle.
 +  * Cherry-pick 6b78dde6... ("Initial support for launching MicroB on
 +    Fremantle") and associated cleanups.
 +  * Revise build system to reflect updated dependencies.
 +
 + -- Steven Luo <steven+maemo@steven676.net>  Tue, 02 Feb 2010 02:45:42 -0800
 +
 +browser-switchboard (3.1-1fremantle1) extras-devel; urgency=low
 +
 +  * Alpha release for Fremantle.
 +  * Pass EXTRA_CPPFLAGS=-DFREMANTLE to make to compile Fremantle-specific code.
 +
 + -- Steven Luo <steven+maemo@steven676.net>  Fri, 15 Jan 2010 02:52:40 -0800
 +
  browser-switchboard (3.1-1) extras-devel; urgency=low
  
    * New "upstream" stable release.
@@@ -29,16 -21,6 +37,16 @@@
  
   -- Steven Luo <steven+maemo@steven676.net>  Fri, 15 Jan 2010 01:54:56 -0800
  
 +browser-switchboard (3.0-1fremantle1) extras-devel; urgency=low
 +
 +  * Experimental build for Fremantle.
 +  * Add XSBC-Bugtracker to debian/control to indicate where bugs should be
 +    filed; needed for maemo extras QA.
 +  * No need to add CPU optimization flags, the Fremantle toolchain
 +    automatically optimizes for N900/OMAP3.
 +
 + -- Steven Luo <steven+maemo@steven676.net>  Wed, 23 Dec 2009 04:01:53 -0800
 +
  browser-switchboard (3.0-1) extras-devel; urgency=low
  
    * New "upstream" stable release.
@@@ -60,13 -42,6 +68,13 @@@
  
   -- Steven Luo <steven+maemo@steven676.net>  Wed, 23 Dec 2009 03:48:02 -0800
  
 +browser-switchboard (3.0~rc1-2fremantle1) extras-devel; urgency=low
 +
 +  * Experimental build for Fremantle.
 +  * Upload to extras-devel.
 +
 + -- Steven Luo <steven+maemo@steven676.net>  Fri, 18 Dec 2009 20:44:08 -0800
 +
  browser-switchboard (3.0~rc1-2) extras-devel; urgency=low
  
    * Actually upload to extras-devel.
@@@ -76,15 -51,6 +84,15 @@@
  
   -- 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.
 +  * Packaging changes:
 +    - Add a different .desktop file with the Fremantle location of the stock
 +      web browser icon.
 +
 + -- Steven Luo <steven+maemo@steven676.net>  Fri, 18 Dec 2009 05:24:16 -0800
 +
  browser-switchboard (3.0~rc1-1) extras-devel; urgency=low
  
    * New "upstream" prerelease.

diff --combined debian/control
index b12ab0e,74b078f..aa93d6e
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -2,13 -2,12 +2,13 @@@ Source: browser-switchboar
  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
  
  Package: browser-switchboard
  Architecture: any
- Depends: ${shlibs:Depends}, ${misc:Depends}, dbus, tablet-browser-ui
+ Depends: ${shlibs:Depends}, ${misc:Depends}, dbus
  Recommends: tear | fennec | midori
  Provides: browser-proxy
  Conflicts: browser-proxy, fennec-dbus-client