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

[Nick Schermer]

Updating branch refs/heads/xfce-4.6
         to 4fb6d998bed5d8bde760ba7a990cf626cc9d3fbe (commit)
       from 83192b05c47d85a58de36eb14c0e71cf6c019f6a (commit)

commit 4fb6d998bed5d8bde760ba7a990cf626cc9d3fbe
Author: Nick Schermer <nick at xfce.org>
Date:   Fri May 21 18:42:31 2010 +0200

    Updates for release.

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

diff --git a/NEWS b/NEWS
index e77c396..cefa989 100644
--- a/NEWS
+++ b/NEWS
@@ -1,7 +1,13 @@
 Xfce 4.6.2
 ==========
 
-  * Fix compilation using Sun cc (bug 5477).
+  * Fix compilation with Sun cc (bug #5477).
+  * Build fixes for GIT.
+  * Fix make distcheck.
+  * Merge xml files in reversed order (bug #6079).
+  * Fix test framework.
+  * Translation updates (gl, lv, ur, ur_PK, ro, hu, ast, da, pt, cs,
+    nl, uk, eu, it, kk, zh_CN, ca, ja, pr_BR, id, fi, de, ru, de).
 
 
 Xfce 4.6.1
diff --git a/configure.ac.in b/configure.ac.in
index 32c718f..92f2d57 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -10,10 +10,10 @@ m4_define([libxfconf_verinfo], [2:0:0])
 m4_define([libxfconf_version_api], [0])
 m4_define([xfconf_version_major], [4])
 m4_define([xfconf_version_minor], [6])
-m4_define([xfconf_version_micro], [1])
+m4_define([xfconf_version_micro], [2])
 m4_define([xfconf_version_nano], [])
 m4_define([xfconf_version_build], [@REVISION@])
-m4_define([xfconf_version_tag], [git])
+m4_define([xfconf_version_tag], [])
 m4_define([xfconf_version], [xfconf_version_major().xfconf_version_minor().xfconf_version_micro()ifelse(xfconf_version_nano(), [], [], [.xfconf_version_nano()])ifelse(xfconf_version_tag(), [git], [xfconf_version_tag()-xfconf_version_build()], [xfconf_version_tag()])])
 
 dnl init autoconf