[Xfce4-commits] <xfce4-settings:xfce-4.6> Updates for release.

[Nick Schermer]

Updating branch refs/heads/xfce-4.6
         to 52cc803e3482e59628eec85a8e06ddbde2f94cc5 (commit)
       from 3ec5f58ba2769fce91cc107db50e690e8af07059 (commit)

commit 52cc803e3482e59628eec85a8e06ddbde2f94cc5
Author: Nick Schermer <nick at xfce.org>
Date:   Sat Jan 2 14:22:11 2010 +0100

    Updates for release.

 NEWS            |   10 +++++++++-
 configure.ac.in |    4 ++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/NEWS b/NEWS
index 327e5b2..d84dcce 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,13 @@
-4.6.2
+4.6.4
 =====
+- Fix /Net/CursorBlinkTime property typo (bug #5488).
+- Improve error handling when setting the button map (part of bug #5004).
+- Fix the check for Xi so it does not fail with Xi2 (bug #4929).
+- Translation updates (ru, ja).
+- Some build changes to make it suitable for releasing from GIT.
+
+4.6.2/4.6.3
+===========
 - Avoid causing xfce4-session to time out on startup (bug #5040).
 - Fix type in xfconf property name (debian bug #527238).
 - Fix mnemonic widgets in accessibility dialog (bug #5550).
diff --git a/configure.ac.in b/configure.ac.in
index 5d030cf..4d87880 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -11,10 +11,10 @@ dnl *** Version information ***
 dnl ***************************
 m4_define([xfce4_settings_version_major], [4])
 m4_define([xfce4_settings_version_minor], [6])
-m4_define([xfce4_settings_version_micro], [3])
+m4_define([xfce4_settings_version_micro], [4])
 m4_define([xfce4_settings_version_nano], [])
 m4_define([xfce4_settings_version_build], [@REVISION@])
-m4_define([xfce4_settings_version_tag], [git]) # Leave empty for releases
+m4_define([xfce4_settings_version_tag], []) # Leave empty for releases
 m4_define([xfce4_settings_version], [xfce4_settings_version_major().xfce4_settings_version_minor().xfce4_settings_version_micro()ifelse(xfce4_settings_version_nano(), [], [], [.xfce4_settings_version_nano()])ifelse(xfce4_settings_version_tag(), [git], [xfce4_settings_version_tag()-xfce4_settings_version_build()], [xfce4_settings_version_tag()])])
 
 dnl *******************************************