[maemo-commits] [maemo-commits] r10995 - projects/haf/trunk/dbus/debian

[From: subversion at stage.maemo.org]

Author: kihamala
Date: 2007-04-11 14:55:08 +0300 (Wed, 11 Apr 2007)
New Revision: 10995

Modified:
   projects/haf/trunk/dbus/debian/changelog
   projects/haf/trunk/dbus/debian/dbus.postinst
Log:
fixed problem with postinst script


Modified: projects/haf/trunk/dbus/debian/changelog
===================================================================
--- projects/haf/trunk/dbus/debian/changelog	2007-04-11 11:30:49 UTC (rev 10994)
+++ projects/haf/trunk/dbus/debian/changelog	2007-04-11 11:55:08 UTC (rev 10995)
@@ -1,3 +1,9 @@
+dbus (1.0.2-0osso5) experimental; urgency=low
+
+  * Fixed upgrading problem caused by dephelper additions to postinst.
+
+ -- Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>  Wed, 11 Apr 2007 14:55:53 +0300
+
 dbus (1.0.2-0osso4) experimental; urgency=low
 
   * Added workaround for an issue in dbus-sysdeps-util-unix.c. Fixes: MB#883

Modified: projects/haf/trunk/dbus/debian/dbus.postinst
===================================================================
--- projects/haf/trunk/dbus/debian/dbus.postinst	2007-04-11 11:30:49 UTC (rev 10994)
+++ projects/haf/trunk/dbus/debian/dbus.postinst	2007-04-11 11:55:08 UTC (rev 10995)
@@ -5,7 +5,7 @@
 # Copyright © 2006 Sjoerd Simons <sjoerd at debian.org>
 # Copyright (C) 2006 Nokia Corporation. All rights reserved.
 
-set -e
+#set -e
 
 MESSAGEUSER=messagebus
 MESSAGEHOME=/var/run/dbus
@@ -19,14 +19,13 @@
 fi
 
 # Do not restart dbus on upgrades, only on fresh installations
-if [ "$1" = "configure" ]; then
-    if [ -e /var/run/dbus/pid ] && 
-      ps --no-heading -p $(cat /var/run/dbus/pid) > /dev/null; then
-        # trigger an update notification which recommends to reboot
-        [ -x /usr/share/update-notifier/notify-reboot-required ] && \
-            /usr/share/update-notifier/notify-reboot-required || true
-        exit 0
-    fi
-fi
+#if [ "$1" = "configure" ]; then
+#    if [ -e /var/run/dbus/pid ] && 
+#      ps --no-heading -p $(cat /var/run/dbus/pid) > /dev/null; then
+#        # trigger an update notification which recommends to reboot
+#        [ -x /usr/share/update-notifier/notify-reboot-required ] && \
+#            /usr/share/update-notifier/notify-reboot-required || true
+#        exit 0
+#    fi
+#fi
 
-#DEBHELPER#