Merge commit 'diablo-package-3.3-2' into fremantle-package

diff --git a/debian/browser-switchboard-cp.desktop b/debian/browser-switchboard-cp.desktop
new file mode 100644 (file)
index 0000000..3ddaad9
--- /dev/null
+++ b/debian/browser-switchboard-cp.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry] 
+Encoding=UTF-8
+Version=1.0
+Name=Browser Switchboard
+Comment=Set the default browser
+Type=HildonControlPanelPlugin
+Icon=general_web
+X-control-panel-plugin=libbrowser-switchboard-cp.so
+Categories=personalisation

diff --git a/debian/changelog b/debian/changelog
index d377d22..758e6d9 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,22 @@ browser-switchboard (3.3-2) extras-devel; urgency=low
 
  -- Steven Luo <steven+maemo@steven676.net>  Sat, 09 Oct 2010 18:38:16 -0700
 
+browser-switchboard (3.3-1fremantle2) extras-devel; urgency=low
+
+  * Beta release for Fremantle.
+  * Cherry-pick 330acaf7... ("Fremantle: Use open_new_window instead of
+    load_url when passing URL to MicroB"); fixes regression from 3.2.
+  * Cherry-pick efb6ed35... ("Fremantle: Make DBusGProxy static in
+    launch_microb_open_window()").
+
+ -- Steven Luo <steven+maemo@steven676.net>  Fri, 10 Sep 2010 17:34:20 -0700
+
+browser-switchboard (3.3-1fremantle1) extras-devel; urgency=low
+
+  * Beta release for Fremantle.
+
+ -- Steven Luo <steven+maemo@steven676.net>  Thu, 02 Sep 2010 21:51:32 -0700
+
 browser-switchboard (3.3-1) extras-devel; urgency=low
 
   * New "upstream" stable release.
@@ -13,6 +29,19 @@ browser-switchboard (3.3-1) extras-devel; urgency=low
 
  -- Steven Luo <steven+maemo@steven676.net>  Thu, 02 Sep 2010 21:44:35 -0700
 
+browser-switchboard (3.3~b2-1fremantle1) extras-devel; urgency=low
+
+  * Development release for Fremantle.
+  * Packaging changes:
+    - Update debian/rules to build the Fremantle-specific command-line config
+      tool and install the Xsession.post script.
+    - Revise the postinst.  Now that we coexist with the MicroB browser
+      process, don't try to kill it in the postinst; instead, start
+      browser-switchboard as the user to make sure we handle links from the
+      get-go, and prestart MicroB if appropriate.
+
+ -- Steven Luo <steven+maemo@steven676.net>  Sat, 28 Aug 2010 05:19:42 -0700 
+  
 browser-switchboard (3.3~b2-1) extras-devel; urgency=low
 
   * New "upstream" development release.
@@ -36,6 +65,12 @@ browser-switchboard (3.3~b2-1) extras-devel; urgency=low
 
  -- 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.
@@ -55,6 +90,15 @@ browser-switchboard (3.3~b1-1) extras-devel; urgency=low
 
  -- 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").
@@ -62,6 +106,18 @@ browser-switchboard (3.2-2) extras-devel; urgency=low
 
  -- 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.
@@ -95,6 +151,47 @@ browser-switchboard (3.2-1) extras-devel; urgency=low
 
  -- 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
@@ -103,6 +200,22 @@ browser-switchboard (3.1-2) extras-devel; urgency=low
 
  -- 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.
@@ -118,6 +231,16 @@ browser-switchboard (3.1-1) extras-devel; urgency=low
 
  -- 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.
@@ -139,6 +262,13 @@ browser-switchboard (3.0-1) extras-devel; urgency=low
 
  -- 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.
@@ -148,6 +278,15 @@ browser-switchboard (3.0~rc1-2) extras-devel; urgency=low
 
  -- 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.

diff --git a/debian/control b/debian/control
index 10a79a3..3285bc5 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,12 +2,13 @@ Source: browser-switchboard
 Section: user/network
 Priority: extra
 Maintainer: Steven Luo <steven+maemo@steven676.net>
-Build-Depends: debhelper (>= 5), libdbus-glib-1-dev, libgtk2.0-dev, libhildon1-dev, libosso-dev, hildon-control-panel-dev
+Build-Depends: debhelper (>= 5), libdbus-1-dev, libdbus-glib-1-dev, libgtk2.0-dev, libhildon1-dev, libosso-dev, hildon-control-panel-dev
 Standards-Version: 3.8.0
+XSBC-Bugtracker: https://garage.maemo.org/tracker/?group_id=1159
 
 Package: browser-switchboard
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, dbus
+Depends: ${shlibs:Depends}, ${misc:Depends}, dbus, tablet-browser-ui
 Recommends: tear | fennec | midori
 Provides: browser-proxy
 Conflicts: browser-proxy, fennec-dbus-client
@@ -16,7 +17,7 @@ Description: allows any web browser to be used as the default
  which browser to use as the default browser.  It supports
  MicroB, Tear, Mobile Firefox, Opera Mobile, and Midori out of
  the box, and can easily be extended to support other
- browsers.  A Control Panel applet to choose the default
+ browsers.  A Settings menu entry to choose the default
  browser is provided.
 XB-Maemo-Display-Name: Browser Switchboard
 Homepage: http://browser-switch.garage.maemo.org/

diff --git a/debian/microb.desktop b/debian/microb.desktop
new file mode 100644 (file)
index 0000000..0282a04
--- /dev/null
+++ b/debian/microb.desktop
@@ -0,0 +1,13 @@
+[Desktop Entry]
+Encoding=UTF-8
+Version=1.0
+Name=MicroB
+GenericName=Browser
+Comment=weba_ap_web_browser_thumb
+Exec=/usr/bin/microb
+Icon=general_web
+Terminal=false
+Type=Application
+Categories=Application;Internet;
+X-HildonDesk-ShowInToolbar=true
+X-Osso-Type=application/x-executable

diff --git a/debian/postinst b/debian/postinst
new file mode 100644 (file)
index 0000000..0175a39
--- /dev/null
+++ b/debian/postinst
@@ -0,0 +1,44 @@
+#!/bin/sh
+# postinst script for browser-switchboard
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <postinst> `configure' <most-recently-configured-version>
+#        * <old-postinst> `abort-upgrade' <new version>
+#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
+#          <new-version>
+#        * <postinst> `abort-remove'
+#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
+#          <failed-install-package> <version> `removing'
+#          <conflicting-package> <version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+case "$1" in
+    configure)
+       # Try to start browser-switchboard as the user
+       # XXX: we're assuming here that the user is named "user"
+       /bin/su - user -c "/etc/X11/Xsession.post/35browser-switchboard" || true
+    ;;
+
+    abort-upgrade|abort-remove|abort-deconfigure)
+    ;;
+
+    *)
+       echo "postinst called with unknown argument \`$1'" >&2
+       exit 1
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
+
+

diff --git a/debian/postrm b/debian/postrm
index 767a4ce..caeb308 100644 (file)
--- a/debian/postrm
+++ b/debian/postrm
@@ -46,6 +46,12 @@ case "$1" in
        # Kill off any running browser-switchboard to make sure that the
        # default browser gets launched
        kill_old_proxies
+
+       # Clear hildon-control-panel's cached screenshot of itself
+       # Workaround for https://bugs.maemo.org/show_bug.cgi?id=9512
+       if [ -f /home/user/.cache/launch/com.nokia.controlpanel.pvr ]; then
+               rm -f /home/user/.cache/launch/com.nokia.controlpanel.pvr 
+       fi
        ;;
     upgrade|disappear)
        # Kill off any running browser-switchboard to make sure that the new

diff --git a/debian/rules b/debian/rules
index 60f0ec8..580398e 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -9,14 +9,13 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-# Optimize for N8x0 CPUs if building for armel
-ifeq ($(DEB_HOST_ARCH),armel)
-       EXTRA_CFLAGS += -mcpu=arm1136jf-s
+#ifeq ($(DEB_HOST_ARCH),armel)
+       #EXTRA_CFLAGS += -mcpu=arm1136jf-s
        # Use Thumb for smaller binaries unless otherwise requested
-       ifeq (,$(filter nothumb,$(DEB_BUILD_OPTIONS)))
-               EXTRA_CFLAGS += -mthumb
-       endif
-endif
+       #ifeq (,$(filter nothumb,$(DEB_BUILD_OPTIONS)))
+       #       EXTRA_CFLAGS += -mthumb
+       #endif
+#endif
 
 configure: configure-stamp
 configure-stamp:
@@ -28,8 +27,8 @@ build: build-stamp
 build-stamp: configure-stamp 
        dh_testdir
 
-       make EXTRA_CFLAGS="$(EXTRA_CFLAGS)" diablo
-       make -C config-ui EXTRA_CFLAGS="$(EXTRA_CFLAGS)" diablo-plugin util
+       make EXTRA_CFLAGS="$(EXTRA_CFLAGS)" fremantle
+       make -C config-ui EXTRA_CFLAGS="$(EXTRA_CFLAGS)" fremantle-plugin fremantle-util
 
        touch $@
 
@@ -51,8 +50,10 @@ install: build
 
        # Add here commands to install the package into
        # debian/browser-switchboard.
-       make DESTDIR=debian/browser-switchboard install
+       make DESTDIR=debian/browser-switchboard install install-xsession-script
        make -C config-ui DESTDIR=../debian/browser-switchboard install
+       install -c -m 0644 debian/browser-switchboard-cp.desktop debian/browser-switchboard/usr/share/applications/hildon-control-panel
+       install -c -m 0644 debian/microb.desktop debian/browser-switchboard/usr/share/applications/hildon
 
 
 binary-indep: build install

diff --git a/launcher.c b/launcher.c
index f42e999..eb16cf4 100644 (file)
--- a/launcher.c
+++ b/launcher.c
@@ -288,16 +288,18 @@ pid_t launch_microb_start_browser_process(DBusConnection *conn, int fd) {
 
 int launch_microb_open_window(struct swb_context *ctx, char *uri,
                              int flags) {
-       DBusGProxy *g_proxy;
+       static DBusGProxy *g_proxy = NULL;
        GError *gerror = NULL;
 
-       g_proxy = dbus_g_proxy_new_for_name(ctx->session_bus,
-                       "com.nokia.osso_browser",
-                       "/com/nokia/osso_browser/request",
-                       "com.nokia.osso_browser");
        if (!g_proxy) {
-               log_msg("Couldn't get a com.nokia.osso_browser proxy\n");
-               return 0;
+               g_proxy = dbus_g_proxy_new_for_name(ctx->session_bus,
+                               "com.nokia.osso_browser",
+                               "/com/nokia/osso_browser/request",
+                               "com.nokia.osso_browser");
+               if (!g_proxy) {
+                       log_msg("Couldn't get a com.nokia.osso_browser proxy\n");
+                       return 0;
+               }
        }
 
        if (!strcmp(uri, "new_window")) {
@@ -321,7 +323,7 @@ int launch_microb_open_window(struct swb_context *ctx, char *uri,
                        uri = "about:blank";
                }
        }
-       if (!dbus_g_proxy_call(g_proxy, "load_url",
+       if (!dbus_g_proxy_call(g_proxy, "open_new_window",
                               &gerror,
                               G_TYPE_STRING, uri,
                               G_TYPE_INVALID,
@@ -331,7 +333,6 @@ int launch_microb_open_window(struct swb_context *ctx, char *uri,
                return 0;
        }
 
-       g_object_unref(g_proxy);
        return 1;
 }