[Xfce4-commits] <xfce4-session:master> Updates for release.

[Nick Schermer]

Updating branch refs/heads/master
         to eaa3a4e1d787d591c1f59f402614abb2abe3ca8e (commit)
       from 16a5a5b03d26ece81afc852b9e01db6bbdcaa948 (commit)

commit eaa3a4e1d787d591c1f59f402614abb2abe3ca8e
Author: Nick Schermer <nick at xfce.org>
Date:   Wed Nov 3 21:11:23 2010 +0100

    Updates for release.

 NEWS            |   16 +++++++++++++++-
 configure.in.in |    4 ++--
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/NEWS b/NEWS
index f86f08c..7b4724c 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,20 @@
-4.7.0
+4.7.1
 =====
+- Add support for new gnome-keyring (bugs #5912, #5137 and #6073).
+- Fix typo in xflock4 error message.
+- Don't use consolekit when it's not enabled.
+- Remove consolekit session creation in xfce4-session.
+- Use cairo to draw the fadeout.
+- Remove obsolote gtk_tooltip_* calls and other < gtk 2.14 code.
+- Fix the check for legacy sm.
+- Fix configure build options.
+- Print build config after running configure.
+- Various code cleanups.
+- Translation updates (it, ug, gl, zh_TW, de, ru, ja, sv, fi, kk,
+  pt, da, ca, eu, hu).
 
+4.7.0
+=====
 - Query HAL to be sure suspend and hibernate are supported.  If not,
   don't even show the buttons (bug #4952).
 - Allow xfce4-tips to work when 'fortune' is not installed (bug #2871).
diff --git a/configure.in.in b/configure.in.in
index bce4e45..de0a459 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -9,10 +9,10 @@ dnl
 dnl Version information
 m4_define([xfsm_version_major], [4])
 m4_define([xfsm_version_minor], [7])
-m4_define([xfsm_version_micro], [0])
+m4_define([xfsm_version_micro], [1])
 m4_define([xfsm_version_nano], []) dnl leave this empty to have no nano version
 m4_define([xfsm_version_build], [@REVISION@])
-m4_define([xfsm_version_tag], [git])
+m4_define([xfsm_version_tag], [])
 m4_define([xfsm_version], [xfsm_version_major().xfsm_version_minor().xfsm_version_micro()ifelse(xfsm_version_nano(), [], [], [.xfsm_version_nano()])ifelse(xfsm_version_tag(), [git], [xfsm_version_tag()-xfsm_version_build()], [xfsm_version_tag()])])
 
 m4_define([xfsm_debug_default], [ifelse(xfsm_version_tag(), [git], [full], [minimum])])