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

[Nick Schermer]

Updating branch refs/heads/xfce-4.6
         to 48febe5ee547abc84c887cbfed4da5633388627f (commit)
       from 043e0a98dc0b443d5c3344d05e786f581b840716 (commit)

commit 48febe5ee547abc84c887cbfed4da5633388627f
Author: Nick Schermer <nick at xfce.org>
Date:   Fri May 21 18:45:51 2010 +0200

    Updates for release.

 NEWS            |   20 +++++++++++++++-----
 configure.ac.in |    4 ++--
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/NEWS b/NEWS
index 8bc2370..125730f 100644
--- a/NEWS
+++ b/NEWS
@@ -1,12 +1,22 @@
 Xfce 4.6.2
 ----------
 
-  * Add Catalan and Galician translations of the manual.
-  * Fix inability to delete broken symlinks on the desktop (bug 5387).
-  * Never show 'Unmount' in volume context menus.
+  * Build fixes for GIT.
+  * Rebuild doc directory.
+  * Add libexo to CFLAGS and LIBS for panel plugin.
+  * Fix detection of rename/delete ability.
+  * Fix compilation when libexo isn't present.
+  * Update icon text labels when system font size changes (bug #2862).
+  * Set mnemonic widget properly for icon type/size labels (bug #5555).
   * Always show 'Eject' in volume context menus, regardless of whether
-    or not it's mounted (bug 5343).
-  * Update icon text labels when system font size changes (bug 2862).
+    or not it's mounted (bug #5343).
+  * Never show 'Unmount' in volume context menus.
+  * Use GtkBindingSet for keyboard handling on desktop.
+  * Only register menu with panel if popup succeeded (bug #5792).
+  * Fix inability to delete broken symlinks on the desktop (bug 5387).
+  * Don't misuse the g_return_(val_)?if_fail() macros as much (bug #5791).
+  * Translation updates (el, es, gl, it, pl, pt, ru, tr, ro, lv, ca,
+    ur, ur_PK, hu, ast, da, sk, nn, nl, si, am, kk, ja, ug, fr).
 
 
 Xfce 4.6.1
diff --git a/configure.ac.in b/configure.ac.in
index bea584b..2a39a03 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -6,9 +6,9 @@ dnl
 dnl version info
 m4_define([xfdesktop_version_major], [4])
 m4_define([xfdesktop_version_minor], [6])
-m4_define([xfdesktop_version_micro], [1])
+m4_define([xfdesktop_version_micro], [2])
 m4_define([xfdesktop_version_nano], [])
-m4_define([xfdesktop_version_build], [r at REVISION@])
+m4_define([xfdesktop_version_build], [@REVISION@])
 m4_define([xfdesktop_version_tag],[])
 m4_define([xfdesktop_version], [xfdesktop_version_major().xfdesktop_version_minor().xfdesktop_version_micro()ifelse(xfdesktop_version_nano(), [], [], [.xfdesktop_version_nano()])ifelse(xfdesktop_version_tag(), [git], [xfdesktop_version_tag()-xfdesktop_version_build()], [xfdesktop_version_tag()])])