From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Wed, 25 May 2011 17:18:00 +0000 (+0100)
Subject: Merge branch 'dbus-1.4'
X-Git-Tag: dbus-1.5.2~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e7677fc83cbec9da1479b499f565a73897cd2240;p=thirdparty%2Fdbus.git

Merge branch 'dbus-1.4'
---

e7677fc83cbec9da1479b499f565a73897cd2240
diff --cc NEWS
index 201fcab4c,d02298034..746eee403
--- a/NEWS
+++ b/NEWS
@@@ -26,10 -22,10 +26,12 @@@ Changes
      (fd.o #14512; Simon McVittie, loosely based on a patch from Luca Barbato)
    • Ensure that maintainers upload documentation with the right permissions
      (fd.o #36130, Simon McVittie)
 +  • Don't force users of libdbus to be linked against -lpthread, -lrt
 +    (fd.o #32827, Simon McVittie)
    • Log system-bus activation information to syslog (fd.o #35705,
      Colin Walters)
+   • Log messages dropped due to quotas to syslog (fd.o #35358,
+     Simon McVittie)
    • Make the nonce-tcp transport work on Unix (fd.o #34569, Simon McVittie)
    • On Unix, if /var/lib/dbus/machine-id cannot be read, try /etc/machine-id
      (fd.o #35228, Lennart Poettering)