Merge branch 'master' of ssh://drop.maemo.org/git/vicar

[vicar] / qtc_packaging / debian_harmattan / prerm

diff --git a/qtc_packaging/debian_harmattan/prerm b/qtc_packaging/debian_harmattan/prerm
index e650ab5..d4b71f2 100755 (executable)
--- a/qtc_packaging/debian_harmattan/prerm
+++ b/qtc_packaging/debian_harmattan/prerm
@@ -20,6 +20,7 @@ set -e
 case "$1" in
     remove|deconfigure)
 
+<<<<<<< HEAD
         echo "Deleting Vicar Telepathy account ..."
         [[ -x /opt/vicar/bin/vicar-utils ]] && /opt/vicar/bin/vicar-utils REMOVE
 
@@ -28,6 +29,17 @@ case "$1" in
 
         #echo "Deleting Vicar Profiles database ..."
         #[[ -d /home/user/.vicar ]] && rm -rf /home/user/.vicar/
+=======
+       eval $(dbus-launch --sh-syntax)
+       export DBUS_SESSION_BUS_ADDRESS
+       export DBUS_SESSION_BUS_PID
+
+        echo "Deleting Vicar Telepathy account ..."
+        #[[ -x /opt/vicar/bin/vicar-utils ]] && su - user -c "exec /opt/vicar/bin/vicar-utils REMOVE"
+
+        echo "Deleting Vicar Profiles database ..."
+        #[[ -x /opt/vicar/bin/vicar-utils ]] && su - user -c "exec /opt/vicar/bin/vicar-utils DROPDB"
+>>>>>>> 74800375ecf7f41e290cf7cc7fa9ee8b230be68e
 
        # Kill any running instances of the daemon (only used on Linux based systems)
        killall -q vicar-daemon || true