From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Mon, 26 Oct 2015 12:11:35 +0000 (+0000)
Subject: Merge branch 'dbus-1.10'
X-Git-Tag: dbus-1.11.0~54
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=71a9153d852bde0c5622918fbc0f9cff16090403;p=thirdparty%2Fdbus.git

Merge branch 'dbus-1.10'
---

71a9153d852bde0c5622918fbc0f9cff16090403
diff --cc NEWS
index 39cf1cb44,f36fc0d1f..aabfddff4
--- a/NEWS
+++ b/NEWS
@@@ -18,15 -13,12 +18,19 @@@ Fixes
    This was not exploitable as a denial of service, because the check
    for a privileged user is done first. (fd.o #92298, Simon McVittie)
  
+ • On Linux with --enable-user-session, add the bus address to the
+   environment of systemd services for better backwards compatibility
+   (fd.o #92612, Jan Alexander Steffens)
+ 
 +• 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)
 +  in service files' Exec lines, and the corresponding regression test
 +  (fd.o #83539; Milan Crha, Simon McVittie)
 +
 +• On Windows, when including configuration files with <include> or
 +  <includedir>, apply the same relocation as for the Exec paths
 +  in .service files (fd.o #92028, Simon McVittie)
  
  • On Windows, if installed in the conventional layout with ${prefix}/etc
    and ${prefix}/share, use relative paths between bus configuration files