Merge branch 'diablo-package' into fremantle-package

diff --combined debian/changelog
index af12785,b698e38..ddc5d00
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,26 +1,32 @@@
+ browser-switchboard (3.3~b2-1) extras-devel; urgency=low
+ 
+   * New "upstream" development release.
+   * Upstream changes:
+     - only offer installed browsers in the config GUI
+     - make continuous mode operation the default; disable non-continuous-mode
+       on Fremantle (needed for correct operation on D-Bus system bus)
+     - Fremantle: major overhaul of MicroB launching to improve robustness;
+       should result in speed and behavior indistinguishable from when Browser
+       Switchboard isn't installed when MicroB is configured as default browser
+     - listen on D-Bus system bus as well as session bus, to accommodate some
+       broken applications that send their requests on the system bus
+     - Fremantle: start browser-switchboard on X session startup, and also
+       prestart MicroB if it's the default browser or the user asks for it
+     - Fremantle: prestart MicroB when the user changes to MicroB as the default
+       browser
+   * Packaging changes:
+     - Update package description to mention that we ship a control panel
+       applet, to help users who don't read documentation.  Thanks to Emanuele
+       Cassioli for pointing out the need.
+ 
+  -- Steven Luo <steven+maemo@steven676.net>  Sat, 28 Aug 2010 04:55:39 -0700 
+ 
 +browser-switchboard (3.3~b1-1fremantle1) extras-devel; urgency=low
 +
 +  * Development release for Fremantle.
 +
 + -- Steven Luo <steven+maemo@steven676.net>  Sun, 30 May 2010 03:23:17 -0700 
 +
  browser-switchboard (3.3~b1-1) extras-devel; urgency=low
  
    * New "upstream" development release.
@@@ -23,15 -40,6 +46,15 @@@
  
   -- Steven Luo <steven+maemo@steven676.net>  Sun, 30 May 2010 02:52:31 -0700 
  
 +browser-switchboard (3.2-2fremantle1) extras-devel; urgency=low
 +
 +  * Beta release for Fremantle.
 +  * Packaging changes:
 +    - Clear hildon-control-panel's cached screenshot on package remove.
 +    - Don't build with -mthumb, to avoid a SIGILL on PR1.2.
 +
 + -- Steven Luo <steven+maemo@steven676.net>  Fri, 28 May 2010 01:40:27 -0700 
 +
  browser-switchboard (3.2-2) extras-devel; urgency=low
  
    * Cherry-pick ebfd6218... ("Add preliminary support for Opera Mobile").
@@@ -39,18 -47,6 +62,18 @@@
  
   -- Steven Luo <steven+maemo@steven676.net>  Fri, 28 May 2010 01:35:22 -0700 
  
 +browser-switchboard (3.2-1fremantle1) extras-devel; urgency=low
 +
 +  * Beta release for Fremantle.
 +  * Packaging changes:
 +    - Ship a different microb.desktop file with the Fremantle location of the
 +      stock web browser icon.
 +    - Add a postinst that attempts to kill open MicroB browser processes, to
 +      avoid having to restart for browser-switchboard to start handling
 +      com.nokia.osso_browser.
 +
 + -- Steven Luo <steven+maemo@steven676.net>  Mon, 22 Feb 2010 03:02:50 -0800 
 +
  browser-switchboard (3.2-1) extras-devel; urgency=low
  
    * New "upstream" stable release.
@@@ -84,47 -80,6 +107,47 @@@
  
   -- 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
@@@ -133,22 -88,6 +156,22 @@@
  
   -- 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.
@@@ -164,16 -103,6 +187,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.
@@@ -195,13 -124,6 +218,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.
@@@ -211,15 -133,6 +234,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.