Merge commit 'diablo-package-3.2-1' into test-branch

Conflicts:

	debian/changelog
	debian/rules

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 f34c808..51bd0ad 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -31,6 +31,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
@@ -39,6 +80,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.
@@ -54,6 +111,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.
@@ -75,6 +142,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.
@@ -84,6 +158,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 74b078f..b12ab0e 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

diff --git a/debian/rules b/debian/rules
index e5c9873..e58f626 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -9,15 +9,17 @@
 # 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
+       #EXTRA_CFLAGS += -mcpu=arm1136jf-s
        # Use Thumb for smaller binaries unless otherwise requested
        ifeq (,$(filter nothumb,$(DEB_BUILD_OPTIONS)))
                EXTRA_CFLAGS += -mthumb
        endif
 endif
 
+EXTRA_CPPFLAGS = -DFREMANTLE `pkg-config --cflags dbus-1`
+EXTRA_LDFLAGS = `pkg-config --libs dbus-1`
+
 configure: configure-stamp
 configure-stamp:
        touch configure-stamp
@@ -53,6 +55,7 @@ install: build
        # debian/browser-switchboard.
        make DESTDIR=debian/browser-switchboard install
        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
 
 
 binary-indep: build install