From: Steven Luo Date: Fri, 11 Dec 2009 11:48:53 +0000 (-0800) Subject: Rename the package to browser-switchboard X-Git-Tag: diablo-package-2.2-1~5 X-Git-Url: http://git.maemo.org/git/?p=browser-switch;a=commitdiff_plain;h=6f51972ae564ca85a5fd90d05561f9b1c35ebcf3;hp=379a3219efe30973074715a5fa356d3b1ab292db Rename the package to browser-switchboard Rename the package to browser-switchboard, updating packaging files as appropriate. Provide/Conflict/Replace browser-proxy, which hopefully takes care of upgrades from the old package. Update the description to clarify what the package does for users. --- diff --git a/debian/control b/debian/control index fa51d39..ecf422d 100644 --- a/debian/control +++ b/debian/control @@ -1,24 +1,23 @@ -Source: browser-proxy +Source: browser-switchboard Section: user/network Priority: extra Maintainer: Steven Luo Build-Depends: debhelper (>= 5) Standards-Version: 3.7.2 -Package: browser-proxy +Package: browser-switchboard Architecture: all Depends: dbus, python2.5, python2.5-dbus, python2.5-gobject, tablet-browser-ui, ${misc:Depends} Recommends: tear | fennec | midori -Conflicts: fennec-dbus-client +Provides: browser-proxy +Replaces: browser-proxy +Conflicts: browser-proxy, fennec-dbus-client Description: allows any web browser to be used as the default - browser-proxy is a script which implements the osso-browser - D-Bus interface used by Maemo applications to launch a - browser. It can be used to make a browser other than MicroB - (e.g. Tear) the default browser. It can also launch MicroB - without having a large background process (browserd) running at - all times, saving memory when MicroB isn't in use. - . - browser-proxy currently supports launching Tear, MicroB, Fennec - (Mobile Firefox), and Midori, and can easily be extended to - support other browsers. + Browser Switchboard is a program which allows you to choose + which browser to use as the default browser. It supports + MicroB, Tear, Fennec/Mobile Firefox, and Midori out of the box, + and can easily be extended to support other browsers. It can + also launch MicroB without having a large background process + (browserd) running at all times, saving memory when MicroB + isn't in use. Homepage: http://browser-switch.garage.maemo.org/ diff --git a/debian/copyright b/debian/copyright index d24c7d4..0c55033 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,9 +1,9 @@ This package was debianized by Steven Luo on Wed, 2 Dec 2009 17:56:24 -0800. -It was downloaded from http://xio.com/maemo/browser-proxy.txt. +It was downloaded from https://garage.maemo.org/frs/?group_id=1159 . -Upstream Authors: Steven Luo, xiojason of talk.maemo.org +Upstream Authors: Steven Luo, Jason Simpson Copyright: diff --git a/debian/postrm b/debian/postrm index 18b7f8a..72d9b3f 100644 --- a/debian/postrm +++ b/debian/postrm @@ -1,5 +1,5 @@ #!/bin/sh -# postrm script for browser-proxy +# postrm script for browser-switchboard # # see: dh_installdeb(1) @@ -20,7 +20,7 @@ set -e kill_old_proxies() { # This would be so much nicer with pgrep/pkill ... - proxy_pids=`busybox ps | fgrep "python /usr/bin/browser-proxy" | fgrep -v grep | awk '{ print $1 }'` + 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 @@ -28,22 +28,22 @@ kill_old_proxies() { case "$1" in remove) - dpkg-divert --remove --package browser-proxy --rename \ + dpkg-divert --remove --package browser-switchboard --rename \ --divert /usr/bin/browser.tablet-browser-ui \ /usr/bin/browser - dpkg-divert --remove --package browser-proxy --rename \ + dpkg-divert --remove --package browser-switchboard --rename \ --divert /usr/share/dbus-1/services/com.nokia.osso_browser.tablet-browser-ui \ /usr/share/dbus-1/services/com.nokia.osso_browser.service # Try to make dbus-daemon pick up the change in services file kill -HUP `pidof dbus-daemon` - # Kill off any running browser-proxy to make sure that the default - # browser gets launched + # Kill off any running browser-switchboard to make sure that the + # default browser gets launched kill_old_proxies ;; upgrade|disappear) - # Kill off any running browser-proxy to make sure that the new version - # gets launched the next time a D-Bus request is made + # Kill off any running browser-switchboard to make sure that the new + # version gets launched the next time a D-Bus request is made kill_old_proxies ;; purge|failed-upgrade|abort-install|abort-upgrade) diff --git a/debian/preinst b/debian/preinst index 1d3171d..9194c2f 100644 --- a/debian/preinst +++ b/debian/preinst @@ -1,5 +1,5 @@ #!/bin/sh -# preinst script for browser-proxy +# preinst script for browser-switchboard # # see: dh_installdeb(1) @@ -16,10 +16,10 @@ set -e case "$1" in install|upgrade) - dpkg-divert --add --package browser-proxy --rename \ + dpkg-divert --add --package browser-switchboard --rename \ --divert /usr/share/dbus-1/services/com.nokia.osso_browser.tablet-browser-ui \ /usr/share/dbus-1/services/com.nokia.osso_browser.service - dpkg-divert --add --package browser-proxy --rename \ + dpkg-divert --add --package browser-switchboard --rename \ --divert /usr/bin/browser.tablet-browser-ui \ /usr/bin/browser ;; diff --git a/debian/rules b/debian/rules index 82a69bf..f6d060c 100755 --- a/debian/rules +++ b/debian/rules @@ -37,10 +37,11 @@ install: build dh_clean -k dh_installdirs - # Add here commands to install the package into debian/browser-proxy. - install -c -m 0755 browser-proxy debian/browser-proxy/usr/bin/browser-proxy - install -c -m 0644 com.nokia.osso_browser.service debian/browser-proxy/usr/share/dbus-1/services - install -c -m 0755 browser debian/browser-proxy/usr/bin/browser + # 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 binary-indep: build install