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

[From: subversion at stage.maemo.org]

Author: makarhun
Date: 2009-04-23 14:02:57 +0300 (Thu, 23 Apr 2009)
New Revision: 18151

Added:
   projects/haf/trunk/dbus/debian/dbus-Xsession-restart
Modified:
   projects/haf/trunk/dbus/debian/dbus-Xsession
   projects/haf/trunk/dbus/debian/rules
Log:
restart try-1

Modified: projects/haf/trunk/dbus/debian/dbus-Xsession
===================================================================
--- projects/haf/trunk/dbus/debian/dbus-Xsession	2009-04-23 10:41:41 UTC (rev 18150)
+++ projects/haf/trunk/dbus/debian/dbus-Xsession	2009-04-23 11:02:57 UTC (rev 18151)
@@ -1,12 +1,14 @@
 #!/bin/sh
 
 USER=`whoami`
-if [ "x$USER" = "xroot" ]; then
-  export SESSION_BUS_ADDRESS_FILE=/tmp/session_bus_address.user
-  export SESSION_BUS_PID_FILE=/tmp/dbus_session_bus.pid.user
+
+if [ "x$USER" = "xroot" ]; 
+then
+  export SESSION_BUS_ADDRESS_FILE=/var/run/session_bus_address.user
+  export SESSION_BUS_PID_FILE=/var/run/dbus_session_bus.pid.user
 else
-  export SESSION_BUS_ADDRESS_FILE=/tmp/session_bus_address.$USER
-  export SESSION_BUS_PID_FILE=/tmp/dbus_session_bus.pid.$USER
+  export SESSION_BUS_ADDRESS_FILE=/var/run/session_bus_address.$USER
+  export SESSION_BUS_PID_FILE=/var/run/dbus_session_bus.pid.$USER
 fi
 
 if test -e "/tmp/ACT_DEAD" ;

Added: projects/haf/trunk/dbus/debian/dbus-Xsession-restart
===================================================================
--- projects/haf/trunk/dbus/debian/dbus-Xsession-restart	2009-04-23 10:41:41 UTC (rev 18150)
+++ projects/haf/trunk/dbus/debian/dbus-Xsession-restart	2009-04-23 11:02:57 UTC (rev 18151)
@@ -0,0 +1,26 @@
+#!/bin/sh
+
+USER=`whoami`
+
+if [ "x$USER" = "xroot" ]; 
+then
+  export SESSION_BUS_ADDRESS_FILE=/var/run/session_bus_address.user
+  export SESSION_BUS_PID_FILE=/var/run/dbus_session_bus.pid.user
+else
+  export SESSION_BUS_ADDRESS_FILE=/var/run/session_bus_address.$USER
+  export SESSION_BUS_PID_FILE=/var/run/dbus_session_bus.pid.$USER
+fi
+
+if test -e $SESSION_BUS_PID_FILE ;
+then
+  . $SESSION_BUS_PID_FILE
+else
+  echo "$0: session bus pid file ($SESSION_BUS_PID_FILE) does not exist?" 
+  exit 0
+fi
+
+kill -15 $DBUS_SESSION_BUS_PID > /dev/null >2&1
+sleep 1
+kill -9  $DBUS_SESSION_BUS_PID > /dev/null >2&1
+
+. /etc/X11/Xsession.d/01dbus

Modified: projects/haf/trunk/dbus/debian/rules
===================================================================
--- projects/haf/trunk/dbus/debian/rules	2009-04-23 10:41:41 UTC (rev 18150)
+++ projects/haf/trunk/dbus/debian/rules	2009-04-23 11:02:57 UTC (rev 18151)
@@ -50,6 +50,7 @@
 	mkdir -p debian/dbus-x11/etc/X11/Xsession.actdead
 	cp debian/dbus-Xsession debian/dbus-x11/etc/X11/Xsession.d/01dbus
 	cp debian/dbus-Xsession debian/dbus-x11/etc/X11/Xsession.actdead/01dbus
+	cp debian/dbus-Xsession-restart debian/dbus-x11/etc/X11/Xsession.d/41dbus
 
 # XXX (maemo): this is needed because we patch doc/Makefile.am
 makebuilddir/dbus-1-doc::