Merge commit 'diablo-package-3.2-1' into test-branch

Conflicts:

	debian/changelog
	debian/rules

diff --cc debian/changelog
index cf08b16,f34c808..51bd0ad
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,44 -1,36 +1,77 @@@
+ browser-switchboard (3.2-1) extras-devel; urgency=low
+ 
+   * New "upstream" stable release.
+   * Upstream changes:
+     - make the "Web" menu entry and /usr/bin/browser open the default browser,
+       and provide a new "MicroB" menu entry and /usr/bin/microb script for
+       launching MicroB; the previous behavior was counterintuitive and
+       difficult to discover
+     - Fremantle: fix launching and closing MicroB on Fremantle; thanks Faheem
+       Pervez and Uwe Kaminski for extensive testing
+     - Fremantle: force the Ovi Store bookmark to open in MicroB, since Ovi
+       Store doesn't load in other browsers; thanks ToJa92 of t.m.o for
+       reporting
+     - add ability to send debug output to syslog and new config setting
+       ("logging") to control where debug output goes; thanks Faheem Pervez for
+       the suggestion
+     - close stdin/stdout/stderr in child processes before the exec(), to make
+       debug output on stdout less noisy
+     - fix some abuses of the D-Bus API in launcher.c:launch_tear()
+     - make sure a running browserd is detected correctly on all devices so that
+       we don't try to launch another one; thanks Faheem Pervez for reporting
+     - ensure that only one browser-switchboard is active at any time
+     - update build system; we now have "diablo" and "fremantle" targets that
+       build binaries for the selected OS release
+     - link binaries with -Wl,--as-needed to eliminate unnecessary dependencies
+   * Packaging changes:
+     - Build with Thumb by default and provide a "nothumb" build option to turn
+       it off, instead of building with Thumb only when requested; the
+       autobuilders aren't requesting Thumb, but we want it by default.
+     - Update debian/rules for the new upstream build system.
+ 
+  -- Steven Luo <steven+maemo@steven676.net>  Mon, 22 Feb 2010 02:14:19 -0800 
+ 
 +browser-switchboard (3.1-2fremantle4) extras-devel; urgency=low
 +
 +  * Alpha release for Fremantle.
 +  * Cherry-pick 870b63f0... ("Install the inotify watch for lockfile creation
 +    before forking").
 +  * Cherry-pick a712d8d7... ("Avoid a race between MicroB startup and
 +    establishing D-Bus watch for it").
 +  * Cherry-pick 32801150... ("Ensure that only one browser-switchboard is
 +    active at any time").
 +
 + -- Steven Luo <steven+maemo@steven676.net>  Mon, 15 Feb 2010 18:57:46 -0800 
 +
 +browser-switchboard (3.1-2fremantle3) extras-devel; urgency=low
 +
 +  * Alpha release for Fremantle.
 +  * Cherry-pick e7bb0f3e... ("Take a different approach to detecting MicroB
 +    browser window close").
 +
 + -- Steven Luo <steven+maemo@steven676.net>  Sat, 13 Feb 2010 21:07:56 -0800 
 +
 +browser-switchboard (3.1-2fremantle2) extras-devel; urgency=low
 +
 +  * Alpha release for Fremantle.
 +  * Cherry-pick 5b7e4808... ("Make sure a running browserd is detected
 +    correctly on all devices").
 +  * Cherry-pick 88db9429... ("Kill MicroB browser UI processes instead
 +    of using exit_browser").
 +
 + -- Steven Luo <steven+maemo@steven676.net>  Sat, 06 Feb 2010 03:10:16 -0800 
 +
 +browser-switchboard (3.1-2fremantle1) extras-devel; urgency=low
 +
 +  * Alpha release for Fremantle.
 +  * No need to lose the tablet-browser-ui dependency on Fremantle.
 +  * Cherry-pick d8d8d1ed... ("Close stdin/stdout/stderr in child
 +    processes before exec()") and 53ba5ca0... ("Throw away stdout/stderr
 +    for browserds we launch too") to make ongoing debugging efforts
 +    easier.
 +
 + -- Steven Luo <steven+maemo@steven676.net>  Fri, 05 Feb 2010 00:13:54 -0800 
 +
  browser-switchboard (3.1-2) extras-devel; urgency=low
  
    * Drop the dependency on tablet-browser-ui for Diablo until maemo.org

diff --cc debian/rules
index 33738dd,e5c9873..e58f626
--- 1/debian/rules
--- 2/debian/rules
+++ b/debian/rules
@@@ -9,10 -9,11 +9,10 @@@
  # Uncomment this to turn on verbose mode.
  #export DH_VERBOSE=1
  
 -# Optimize for N8x0 CPUs if building for armel
  ifeq ($(DEB_HOST_ARCH),armel)
 -      EXTRA_CFLAGS += -mcpu=arm1136jf-s
 +      #EXTRA_CFLAGS += -mcpu=arm1136jf-s
-       # Use Thumb for smaller binaries if requested
-       ifneq (,$(filter thumb,$(DEB_BUILD_OPTIONS)))
+       # Use Thumb for smaller binaries unless otherwise requested
+       ifeq (,$(filter nothumb,$(DEB_BUILD_OPTIONS)))
                EXTRA_CFLAGS += -mthumb
        endif
  endif