Merge branch 'diablo-package' into fremantle-package

[browser-switch] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index 51bd0ad..ca2d6ce 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,21 @@
+browser-switchboard (3.2-2) extras-devel; urgency=low
+
+  * Cherry-pick ebfd6218... ("Add preliminary support for Opera Mobile").
+
+ -- 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.