Update changelog and bump version numberutils-2.5

4 files changed, 23 insertions, 6 deletions

diff --git a/AUTHORS b/AUTHORS
index b3eee626..209ae29a 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,6 +1,10 @@
 Maxim Krasnyansky <maxk@qualcomm.com>
 	Original author.
+
+Marcel Holtmann <marcel@holtmann.org>
 	Primary maintainer.
+	Various patches, fixes and other contributions.
+	RFCOMM configuration utility.
 
 Ilguiz Latypov <ilatypov@superbt.com>
 	Patches. Suggestions.
@@ -15,10 +19,6 @@ Jean Tourrilhes <jt@hpl.hp.com>
 Thomas Moser <Thomas.Moser@tmoser.ch>
 	Silicon Wave UART initialization.
 
-Marcel Holtmann <marcel@holtmann.org>
-	Various patches, fixes and other contributions.
-	RFCOMM configuration utility.
-
 Nils Faerber <nils@kernelconcepts.de>
 	Man pages.
 
@@ -33,3 +33,6 @@ Wolfgang Heidrich <wolfgang.heidrich@esk.fhg.de>
 
 Fabrizio Gennari <fabrizio.gennari@philips.com>
 	Support for link supervision timeout (hcitool).
+
+Philip Blundell <pb@nexus.co.uk>
+	D-Bus PIN helper support.
diff --git a/ChangeLog b/ChangeLog
index dcf08308..b0ca09ee 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+ver 2.5:
+	hcitool changes:
+		Support for requesting authentication.
+		Support for setting connection encryption.
+		Fix some endian problems.
+	hciconfig changes:
+		Show revision information for Broadcom devices.
+		Replace unprintable characters in device name.
+	hcid changes:
+		Add D-Bus support for PIN request.
+		Report an error on PIN helper failure.
+		Fix some 64-bit problems.
+	Update bluepin script for GTK2.
+
 ver 2.4:
 	hcitool changes:
 		Increase number of inquiry responses.
diff --git a/configure.in b/configure.in
index 14496cda..19be6b53 100644
--- a/configure.in
+++ b/configure.in
@@ -7,7 +7,7 @@ AC_INIT()
 
 AM_MAINTAINER_MODE
 
-AM_INIT_AUTOMAKE(bluez-utils, 2.4)
+AM_INIT_AUTOMAKE(bluez-utils, 2.5)
 
 AC_SUBST(DISTRO)
 AC_SUBST(PCMCIA)
diff --git a/utils.spec b/utils.spec
index 9df55a4b..1ea074f9 100644
--- a/utils.spec
+++ b/utils.spec
@@ -1,5 +1,5 @@
 # Note that this is NOT a relocatable package
-%define ver      2.4
+%define ver      2.5
 %define RELEASE  1
 %define rel      %{?CUSTOM_RELEASE} %{!?CUSTOM_RELEASE:%RELEASE}
 %define prefix   /