From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Fri, 2 Oct 2015 10:52:35 +0000 (+0100)
Subject: Merge branch 'dbus-1.10'
X-Git-Tag: dbus-1.12.0~559
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a52034266a60fb471e759a6c3349b11ce6494fdf;p=platform%2Fupstream%2Fdbus.git

Merge branch 'dbus-1.10'
---

a52034266a60fb471e759a6c3349b11ce6494fdf
diff --cc NEWS
index 1cf0cff,ecde509..4d9dd94
--- a/NEWS
+++ b/NEWS
@@@ -1,15 -1,13 +1,20 @@@
 -D-Bus 1.10.2 (UNRELEASED)
 +D-Bus 1.11.0 (UNRELEASED)
  ==
  
 +Dependencies:
 +
 +• On non-Windows platforms, D-Bus requires an <inttypes.h> that defines
 +  C99 constants such as PRId64 and PRIu64.
 +
  Fixes:
  
+ • Correct error handling for activation: if there are multiple attempts
+   to activate the same service and it fails immediately, the first attempt
+   would get the correct reply, but the rest would time out. We now send
+   the same error reply to each attempt. (fd.o #92200, Simon McVittie)
+ 
 +• Print 64-bit integers on non-GNU Unix platforms (fd.o #92043, Natanael Copa)
 +
  • On Windows, fix the logic for replacing the installation prefix
    in service files' Exec lines (fd.o #83539; Milan Crha, Simon McVittie)