From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Wed, 4 Jan 2012 18:15:39 +0000 (+0000)
Subject: Merge branch 'dbus-1.4'
X-Git-Tag: dbus-1.5.10~81
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=68ecce599a176bb6ccf39ceb8382300a254d710b;p=thirdparty%2Fdbus.git

Merge branch 'dbus-1.4'
---

68ecce599a176bb6ccf39ceb8382300a254d710b
diff --cc NEWS
index b9a330770,247aa9fd6..c1aa63186
--- a/NEWS
+++ b/NEWS
@@@ -1,18 -1,32 +1,38 @@@
 -D-Bus 1.4.18 (UNRELEASED)
 +D-Bus 1.5.10 (UNRELEASED)
  ==
  
- …
+ • Improve cmake build system (Ralf Habacker):
+   · simplify XML parser dependencies (fd.o #41027)
+   · generate build timestamp (fd.o #41029)
+   · only create batch files on Windows
+   · fix option and cache syntax
+   · add help-options target
+   · share dbus-arch-deps.h.in with autotools rather than having our
+     own version (fd.o #41033)
+ 
+ • Build tests successfully with older GLib, as found in e.g. Debian 6
+   (fd.o #41219, Simon McVittie)
+ 
+ • Unix-specific:
+   · Avoid a highly unlikely fd leak (fd.o #29881, Simon McVittie)
+   · Don't close invalid fd -1 if getaddrinfo fails (fd.o #37258, eXeC001er)
+   · Don't touch ~/.dbus and ~/.dbus-keyrings when running 'make installcheck'
+     (fd.o #41218, Simon McVittie)
+ 
+ • Windows-specific:
+   · Find the dbus-daemon executable next to the shared library (fd.o #41558;
+     Jesper Dam, Ralf Habacker)
  
 -D-Bus 1.4.16 (2011-09-21)
 +D-Bus 1.5.8 (2011-09-21)
  ==
  
 -The "this answerphone fails to answer the phone" release.
 +The "cross-metering" release.
 +
 +In addition to dead code removal and refactoring, this release contains all
 +of the bugfixes from 1.4.16.
 +
 +• Clean up dead code, and make more warnings fatal in development builds
 +  (fd.o #39231, fd.o #41012; Simon McVittie)
  
  • If full test coverage is requested via --enable-tests, strictly require
    Python, pygobject and dbus-python, which are required by some tests; if not,