From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Fri, 8 Apr 2011 14:23:17 +0000 (+0100)
Subject: Merge branch 'dbus-1.4'
X-Git-Tag: dbus-1.5.0~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c4b76acc6bce04507b04b210326d4a3841dbe2d8;p=platform%2Fupstream%2Fdbus.git

Merge branch 'dbus-1.4'

Conflicts:
	NEWS
---

c4b76acc6bce04507b04b210326d4a3841dbe2d8
diff --cc NEWS
index 0ba9762,6451a76..41465b6
--- a/NEWS
+++ b/NEWS
@@@ -1,20 -1,13 +1,22 @@@
 -D-Bus 1.4.10 (UNRELEASED)
 +D-Bus 1.5.0 (UNRELEASED)
  ==
  
 -...
 +  • Let the bus daemon implement more than one interface (fd.o #33757,
 +    Simon McVittie)
 +  • Optimize _dbus_string_replace_len to reduce waste (fd.o #21261,
 +    Roberto Guido)
 +  • Require user intervention to compile with missing 64-bit support
 +    (fd.o #35114, Simon McVittie)
 +  • Add dbus_type_is_valid as public API (fd.o #20496, Simon McVittie)
 +  • Raise UnknownObject instead of UnknownMethod for calls to methods on
 +    paths that are not part of the object tree, and UnknownInterface for calls
 +    to unknown interfaces in the bus daemon (fd.o #34527, Lennart Poettering)
  
- D-Bus 1.4.8 (UNRELEASED)
+ D-Bus 1.4.8 (2011-04-08)
  ==
  
+ The "It's like the beginning of a lobster" release.
+ 
    • Rename configure.in to configure.ac, and update it to modern conventions
      (fd.o #32245; Javier Jardón, Simon McVittie)
    • Correctly give XDG_DATA_HOME priority over XDG_DATA_DIRS (fd.o #34496,