Merge branch 'diablo-package' 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 5dc2d45..6b4e1f5 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+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.
@@ -7,6 +14,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 7cb3445..01881bd 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -4,6 +4,7 @@ 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
 Standards-Version: 3.8.0
+XSBC-Bugtracker: https://garage.maemo.org/tracker/?group_id=1159
 
 Package: browser-switchboard
 Architecture: any

diff --git a/debian/rules b/debian/rules
index 014ed5e..201148e 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -53,6 +53,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