Merge branch 'diablo-package' into fremantle-package

diff --combined debian/changelog
index faa17f5,91d9747..3deb685
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,18 +1,28 @@@
+ browser-switchboard (3.1-1) extras-devel; urgency=low
+ 
+   * New "upstream" stable release.
+   * Upstream changes:
+     - add a new, more finger-friendly GUI for Fremantle, based on work by
+       Faheem Pervez (build UI with EXTRA_CPPFLAGS=-DFREMANTLE)
+     - make sure reconfig signal (SIGHUP) doesn't interrupt dispatch of a
+       request when continuous mode is off
+     - disable autocapitalization and predictive text features for the
+       other_browser_cmd entry in the UI
+     - add support for EXTRA_CPPFLAGS in Makefiles, to allow package builds to
+       pass feature/configuration defines; add EXTRA_LDFLAGS too, just in case
+ 
+  -- 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.
@@@ -29,13 -34,6 +44,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.
@@@ -45,15 -43,6 +60,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.