From: Steven Luo <steven+maemo@steven676.net>
Date: Fri, 18 Dec 2009 11:38:24 +0000 (-0800)
Subject: Update packaging for the C implementation
X-Git-Tag: diablo-package-3.0rc1-1~11
X-Git-Url: http://git.maemo.org/git/?p=browser-switch;a=commitdiff_plain;h=ffdb0fccc7424addab0eed1982a4a61ce2e3155d

Update packaging for the C implementation

With the introduction of object code, this is now an Arch: any package;
revise debian/control and debian/rules accordingly.  Also add the
appropriate Build-Depends, and readd the ${shlibs:Depends} in Depends in
debian/control.  Teach debian/postrm how to kill off C
browser-switchboards.
---

diff --git a/debian/control b/debian/control
index f8d84d2..6d52fc0 100644
--- a/debian/control
+++ b/debian/control
@@ -2,12 +2,12 @@ Source: browser-switchboard
 Section: user/network
 Priority: extra
 Maintainer: Steven Luo <steven+maemo@steven676.net>
-Build-Depends: debhelper (>= 5)
+Build-Depends: debhelper (>= 5), libdbus-1-dev, libdbus-glib-1-dev, libgtk2.0-dev, libhildon1-dev, hildon-control-panel-dev
 Standards-Version: 3.7.2
 
 Package: browser-switchboard
-Architecture: all
-Depends: dbus, python2.5, python2.5-dbus, python2.5-gobject, tablet-browser-ui, ${misc:Depends}
+Architecture: any
+Depends: dbus, tablet-browser-ui, ${shlibs:Depends}, ${misc:Depends}
 Recommends: tear | fennec | midori
 Provides: browser-proxy
 Conflicts: browser-proxy, fennec-dbus-client
diff --git a/debian/postrm b/debian/postrm
index 72d9b3f..86d2b28 100644
--- a/debian/postrm
+++ b/debian/postrm
@@ -19,11 +19,14 @@ set -e
 # the debian-policy package
 
 kill_old_proxies() {
+	# Kill off old python browser-switchboards, if any
 	# This would be so much nicer with pgrep/pkill ...
 	proxy_pids=`busybox ps | fgrep "python /usr/bin/browser-switchboard" | fgrep -v grep | awk '{ print $1 }'`
 	if [ ! -z "$proxy_pids" ]; then
 		kill $proxy_pids
 	fi
+	# Kill off C browser-switchboards
+	killall browser-switchboard
 }
 
 case "$1" in
diff --git a/debian/rules b/debian/rules
index f6d060c..fc9cd65 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,6 +22,9 @@ build: build-stamp
 build-stamp: configure-stamp 
 	dh_testdir
 
+	make
+	make -C config-ui
+
 	touch $@
 
 clean:
@@ -39,12 +42,14 @@ install: build
 
 	# Add here commands to install the package into
 	# debian/browser-switchboard.
-	install -c -m 0755 browser-switchboard debian/browser-switchboard/usr/bin/browser-switchboard
-	install -c -m 0644 com.nokia.osso_browser.service debian/browser-switchboard/usr/share/dbus-1/services
-	install -c -m 0755 browser debian/browser-switchboard/usr/bin/browser
+	make install
+	make -C config-ui install
 
 
 binary-indep: build install
+# arch: any package, nothing to do here
+
+binary-arch: build install
 	dh_testdir
 	dh_testroot
 	dh_installchangelogs 
@@ -63,19 +68,16 @@ binary-indep: build install
 #	dh_installinfo
 #	dh_installman
 #	dh_link
-#	dh_strip
+	dh_strip
 	dh_compress
 	dh_fixperms
 #	dh_perl
 #	dh_makeshlibs
 	dh_installdeb
-#	dh_shlibdeps
+	dh_shlibdeps
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb
 
-binary-arch: build install
-# arch: all package, nothing to do here
-
 binary: binary-indep binary-arch
 .PHONY: build clean binary-indep binary-arch binary install configure