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

[From: subversion at stage.maemo.org]

Author: kihamala
Date: 2006-12-21 11:08:25 +0200 (Thu, 21 Dec 2006)
New Revision: 8844

Modified:
   projects/haf/trunk/dbus/debian/changelog
   projects/haf/trunk/dbus/debian/dbus.postinst
Log:
fixed installation problem in Sardine


Modified: projects/haf/trunk/dbus/debian/changelog
===================================================================
--- projects/haf/trunk/dbus/debian/changelog	2006-12-21 08:53:50 UTC (rev 8843)
+++ projects/haf/trunk/dbus/debian/changelog	2006-12-21 09:08:25 UTC (rev 8844)
@@ -1,10 +1,10 @@
 dbus (1.0.1-0osso1) experimental; urgency=low
 
   * UNRELEASED
-  * Added patch from Kuisma Salonen to add dbus_bus_get_activated_service.
   * Upgraded the upstream tarball to v1.0.1.
+  * Fixed problem with installing the package in Sardine environment.
 
- -- Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>  Mon, 27 Nov 2006 14:06:26 +0200
+ -- Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>  Wed, 20 Dec 2006 15:30:25 +0200
 
 dbus (1.0.0-osso3) experimental; urgency=low
 

Modified: projects/haf/trunk/dbus/debian/dbus.postinst
===================================================================
--- projects/haf/trunk/dbus/debian/dbus.postinst	2006-12-21 08:53:50 UTC (rev 8843)
+++ projects/haf/trunk/dbus/debian/dbus.postinst	2006-12-21 09:08:25 UTC (rev 8844)
@@ -13,7 +13,10 @@
 chgrp "$MESSAGEUSER" "$MESSAGEHOME" 2>/dev/null || groupadd  "$MESSAGEUSER"
 chown "$MESSAGEUSER":"$MESSAGEUSER" "$MESSAGEHOME" 2>/dev/null || \
 useradd -d "$MESSAGEHOME" -g $MESSAGEUSER $MESSAGEUSER
-usermod -G dialout $MESSAGEUSER
+if [ ! -d /scratchbox ]; then
+  # for some reason this fails in Scratchbox
+  usermod -G dialout $MESSAGEUSER
+fi
 
 # Do not restart dbus on upgrades, only on fresh installations
 if [ "$1" = "configure" ]; then