Merge branch 'diablo-package' into fremantle-package

diff --git a/Changelog b/Changelog
index ddb79d9..cf6ee72 100644 (file)
--- a/Changelog
+++ b/Changelog
@@ -1,3 +1,12 @@
+version 3.0:
+* fix the UI so that it looks for C browser-switchboard processes to send
+  SIGHUP to, not Python browser-switchboards 
+* add support for EXTRA_CFLAGS in Makefiles, to allow package builds to pass
+  additional optimization flags
+* replace calls to `pkg-config dbus-1` in config-ui/Makefile with calls to
+  `pkg-config libosso` instead; asking for dbus-1 was incorrect and covering
+  up a problem that caused maemo extras-devel autobuilds to fail
+
 version 3.0rc1:
 * reimplement the main browser-switchboard process in C, which leads to much
   faster startup times and much lower memory usage

diff --git a/README b/README
index ad7ba6d..df8a3d4 100644 (file)
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
 BROWSER SWITCHBOARD
-version 3.0rc1
+version 3.0
 
 Browser Switchboard is a program which allows you to choose which
 browser to use as the default browser. It supports MicroB, Tear,
@@ -75,7 +75,8 @@ default_browser = "tear"
 # END SAMPLE CONFIG FILE
 
 Lines beginning with # characters are comments and are ignored by the
-script.
+script.  [Each option corresponds directly to an option or option group
+in the configuration UI.]
 
 In continuous mode, Browser Switchboard keeps running in the background
 instead of closing after handling each request.  This saves a bit of
@@ -87,7 +88,8 @@ usage" corresponds to continuous_mode off, while "Faster browser startup
 time" corresponds to continuous_mode on.]
 
 The "tear", "microb", "fennec", and "midori" options for default_browser
-should be self-explanatory.
+should be self-explanatory.  [These correspond to the options in the
+"Default browser" combo box in the UI.]
 
 If the default browser is "other", Browser Switchboard will run the
 program specified in other_browser_cmd as the default browser, with a
@@ -98,7 +100,9 @@ of typing in
 
 $ some_browser 'http://www.google.com/'
 
-at a shell.
+at a shell.  [In the UI, setting "Default brower" to "Other" activates
+the "Command (%s for URI)" setting, which corresponds to the value of
+other_browser_cmd.]
 
 
 Browser Switchboard and MicroB's browserd:

diff --git a/debian/changelog b/debian/changelog
index 6b4e1f5..cbea8ea 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,24 @@
+browser-switchboard (3.0-1) extras-devel; urgency=low
+
+  * New "upstream" stable release.
+  * Upstream changes:
+    - fix the UI so that it looks for C browser-switchboard processes to send
+      SIGHUP to, not Python browser-switchboards
+    - add support for EXTRA_CFLAGS in Makefiles, to allow package builds to
+      pass additional optimization flags
+    - replace calls to `pkg-config dbus-1` in config-ui/Makefile with calls to
+      `pkg-config libosso` instead; asking for dbus-1 was incorrect and
+      covering up a problem that caused maemo extras-devel autobuilds to fail
+  * Packaging changes:
+    - Use EXTRA_CFLAGS to generate N8x0 optimized builds, and use Thumb if
+      DEB_BUILD_OPTIONS requests it.
+    - Bump Standards-Version to 3.8.0; no changes required.
+    - 323bf8... ("config-ui: Teach UI how to HUP C browser-switchboards")
+      merged upstream, remove from diff.
+    - Remove unneeded file debian/dirs.
+
+ -- 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.

diff --git a/debian/dirs b/debian/dirs
deleted file mode 100644 (file)
index 69602ab..0000000
--- a/debian/dirs
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/bin
-usr/share/dbus-1/services