Merge branch 'dbus-1.12'

2 files changed, 13 insertions, 10 deletions

diff --git a/NEWS b/NEWS
index 4eb2466f6..de8c304ca 100644
--- a/NEWS
+++ b/NEWS
@@ -1,9 +1,10 @@
-dbus 1.12.0 (UNRELEASED)
+dbus 1.12.0 (2017-10-30)
 ========================
 
-1.12.x will be a new stable branch, recommended for use in OS
-distributions. It has not yet been released, but will be soon.
-Please test the release candidate version, 1.11.22.
+The “gingerbread skull” release.
+
+1.12.x is a new stable branch, recommended for use in OS
+distributions.
 
 Summary of major changes between 1.10.x and 1.12.0
 --------------------------------------------------
@@ -81,10 +82,12 @@ Miscellaneous behaviour changes:
 • [Unix] Exceeding an anti-DoS limit is logged to syslog if configured,
   or to stderr.
 
-D-Bus 1.11.24 (UNRELEASED)
-==========================
+Changes since 1.11.22 release candidate
+---------------------------------------
+
+Standard stable-branch changes:
 
-This is the second release-candidate for the 1.12.0 stable release.
+• Disable warnings about use of deprecated functions (Simon McVittie)
 
 Fixes:
 
diff --git a/configure.ac b/configure.ac
index f8e053d74..c50d7869b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,8 +2,8 @@ dnl -*- mode: m4 -*-
 AC_PREREQ([2.63])
 
 m4_define([dbus_major_version], [1])
-m4_define([dbus_minor_version], [11])
-m4_define([dbus_micro_version], [23])
+m4_define([dbus_minor_version], [12])
+m4_define([dbus_micro_version], [0])
 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])
@@ -42,7 +42,7 @@ LT_CURRENT=22
 
 ## increment any time the source changes; set to
 ##  0 if you increment CURRENT
-LT_REVISION=2
+LT_REVISION=3
 
 ## increment if any interfaces have been added; set to 0
 ## if any interfaces have been changed or removed. removal has