Merge branch 'diablo-package' into fremantle-package

[browser-switch] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index 3deb685..da19a48 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +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.
 browser-switchboard (3.1-1) extras-devel; urgency=low
 
   * New "upstream" stable release.