From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Wed, 1 Jun 2011 11:19:02 +0000 (+0100)
Subject: Merge branch 'dbus-1.4'
X-Git-Tag: dbus-1.5.2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a31ac98f18eaaadf2098e911388b11aa24d46fa7;p=thirdparty%2Fdbus.git

Merge branch 'dbus-1.4'

Conflicts:
	NEWS
	configure.ac
---

a31ac98f18eaaadf2098e911388b11aa24d46fa7
diff --cc NEWS
index 746eee403,6ee76fefc..aefec3f20
--- a/NEWS
+++ b/NEWS
@@@ -1,4 -1,4 +1,4 @@@
- D-Bus 1.5.2 (UNRELEASED)
 -D-Bus 1.4.10 (2011-06-01)
++D-Bus 1.5.2 (2011-06-01)
  ==
  
  Notes for distributors:
diff --cc configure.ac
index c43fe7337,a041c55f8..860667a3c
--- a/configure.ac
+++ b/configure.ac
@@@ -2,8 -2,8 +2,8 @@@ dnl -*- mode: m4 -*
  AC_PREREQ([2.63])
  
  m4_define([dbus_major_version], [1])
 -m4_define([dbus_minor_version], [4])
 -m4_define([dbus_micro_version], [11])
 +m4_define([dbus_minor_version], [5])
- m4_define([dbus_micro_version], [1])
++m4_define([dbus_micro_version], [2])
  m4_define([dbus_version],
            [dbus_major_version.dbus_minor_version.dbus_micro_version])
  AC_INIT([dbus],[dbus_version],[https://bugs.freedesktop.org/enter_bug.cgi?product=dbus],[dbus])
@@@ -36,7 -36,7 +36,7 @@@ LT_CURRENT=
  
  ## increment any time the source changes; set to
  ##  0 if you increment CURRENT
- LT_REVISION=0
 -LT_REVISION=6
++LT_REVISION=1
  
  ## increment if any interfaces have been added; set to 0
  ## if any interfaces have been changed or removed. removal has