Merge branch 'diablo-package' into test-branch

[browser-switch] / debian / postrm

diff --git a/debian/postrm b/debian/postrm
index 80d92c9..caeb308 100644 (file)
--- a/debian/postrm
+++ b/debian/postrm
@@ -26,7 +26,10 @@ kill_old_proxies() {
                kill $proxy_pids
        fi
        # Kill off C browser-switchboards
-       kill `pidof browser-switchboard`
+       proxy_pids=`pidof browser-switchboard || true`
+       if [ ! -z "$proxy_pids" ]; then
+               kill $proxy_pids
+       fi
 }
 
 case "$1" in
@@ -43,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