* Target unstable. Since 0.94 only bugfixes and cleanups went in.

* Also generate the machine-id on reload if it doesn't exist and reload the
  bus on upgrades. (Closes: #357247)
* patches/40_dbus_launch_get_uuid.patch
  + Dropped, fixed upstream

git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/dbus@1141 ceb527fc-18e6-0310-9fe2-813c157c29e7

4 files changed, 27 insertions, 54 deletions

diff --git a/debian/changelog b/debian/changelog
index 933091ac..496fa4cc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
-dbus (1.0.0-1) experimental; urgency=low
+dbus (1.0.0-1) unstable; urgency=low
 
+  [ Sebastian Dröge ]
   * New upstream release, 1.0.0 aka "Blue Bird"
   * debian/patches/01_no-fatal-warnings.patch:
     + Don't abort on fatal warnings now by default. This behaviour can be
@@ -7,7 +8,14 @@ dbus (1.0.0-1) experimental; urgency=low
       This will be set to upstream default again at some point so if you have
       an application that prints a DBus warning get it fixed.
 
- -- Sebastian Dröge <slomo@ubuntu.com>  Fri, 10 Nov 2006 09:32:20 +0100
+  [ Sjoerd Simons ]
+  * Target unstable. Since 0.94 only bugfixes and cleanups went in.
+  * Also generate the machine-id on reload if it doesn't exist and reload the
+    bus on upgrades. (Closes: #357247)
+  * patches/40_dbus_launch_get_uuid.patch
+    + Dropped, fixed upstream
+
+ -- Sjoerd Simons <sjoerd@debian.org>  Tue, 14 Nov 2006 15:35:00 +0100
 
 dbus (0.95-1) experimental; urgency=low
 
diff --git a/debian/dbus.init b/debian/dbus.init
index 46460670..cbb5c67a 100644
--- a/debian/dbus.init
+++ b/debian/dbus.init
@@ -36,6 +36,13 @@ fi
 
 test "$ENABLED" != "0" || exit 0
 
+create_machineid() {
+  # Create machine-id file
+  if [ -x $UUIDGEN ]; then
+    $UUIDGEN $UUIDGEN_OPTS
+  fi
+}
+
 start_it_up()
 {
   if [ ! -d $PIDDIR ]; then
@@ -52,10 +59,7 @@ start_it_up()
       rm -f $PIDFILE
     fi
   fi
-  # Create machine-id file
-  if [ -x $UUIDGEN ]; then
-    $UUIDGEN $UUIDGEN_OPTS
-  fi
+  create_machineid
 
   log_daemon_msg "Starting $DESC" "$NAME"
   start-stop-daemon --start --quiet --pidfile $PIDFILE \
@@ -84,6 +88,7 @@ shut_it_down()
 
 reload_it()
 {
+  create_machineid
   log_action_begin_msg "Reloading $DESC config"
   dbus-send --print-reply --system --type=method_call \
             --dest=org.freedesktop.DBus \
diff --git a/debian/dbus.postinst b/debian/dbus.postinst
index 5eea2979..c4fb1ddb 100644
--- a/debian/dbus.postinst
+++ b/debian/dbus.postinst
@@ -15,12 +15,20 @@ chown "$MESSAGEUSER"."$MESSAGEUSER" "$MESSAGEHOME" 2>/dev/null || \
 	adduser --system --home "$MESSAGEHOME" --no-create-home --disabled-password --ingroup "$MESSAGEUSER" "$MESSAGEUSER"
 
 # Do not restart dbus on upgrades, only on fresh installations
+# But do reload it so the machine-id can be generated
 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
+        if [ -x "/etc/init.d/dbus" ]; then
+          if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
+                invoke-rc.d dbus reload || true
+          else
+                /etc/init.d/dbus reload || true
+          fi
+        fi
         exit 0
     fi
 fi
diff --git a/debian/patches/40_dbus_launch_get_uuid.patch b/debian/patches/40_dbus_launch_get_uuid.patch
deleted file mode 100644
index 2846baee..00000000
--- a/debian/patches/40_dbus_launch_get_uuid.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-Index: tools/dbus-launch-x11.c
-===================================================================
-RCS file: /cvs/dbus/dbus/tools/dbus-launch-x11.c,v
-retrieving revision 1.3
-retrieving revision 1.4
-diff -u -r1.3 -r1.4
---- tools/dbus-launch-x11.c	1 Oct 2006 20:05:39 -0000	1.3
-+++ tools/dbus-launch-x11.c	26 Oct 2006 17:34:49 -0000	1.4
-@@ -98,6 +98,10 @@
-   char *result;
-   char *p;
- 
-+  machine = get_machine_uuid ();
-+  if (machine == NULL)
-+    return NULL;
-+
-   display = xstrdup (getenv ("DISPLAY"));
-   if (display == NULL)
-     {
-@@ -143,8 +147,6 @@
-         *p = '_';
-     }
-   
--  machine = get_machine_uuid ();
--
-   home = get_homedir ();
-   
-   result = malloc (strlen (home) + strlen (prefix) + strlen (machine) +
-@@ -237,6 +239,10 @@
-   if (init)
-     return TRUE;
- 
-+  machine = get_machine_uuid ();
-+  if (machine == NULL)
-+    return FALSE;
-+
-   user = getpwuid (getuid ());
-   if (user == NULL)
-     {
-@@ -245,8 +251,6 @@
-     }
-   user_name = xstrdup(user->pw_name);
- 
--  machine = get_machine_uuid ();
--
-   atom_name = malloc (strlen (machine) + strlen (user_name) + 2 +
-                       MAX (strlen (selection_prefix),
-                            MAX (strlen (address_prefix),