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

[Nick Schermer]

Updating branch refs/heads/master
         to 3692e7675b7d4a9894eaa2d7d6dba33927a6b7eb (commit)
       from 87795c60e27a518dc5ef9de00b18f26e5f7a11b0 (commit)

commit 3692e7675b7d4a9894eaa2d7d6dba33927a6b7eb
Author: Nick Schermer <nick at xfce.org>
Date:   Sat Apr 28 22:43:23 2012 +0200

    Updates for release.

 NEWS            |   21 +++++++++++++++------
 configure.in.in |    6 +++---
 2 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/NEWS b/NEWS
index 5d08b40..1596d1c 100644
--- a/NEWS
+++ b/NEWS
@@ -1,9 +1,18 @@
+4.10.0
+======
+- Remove remaining code to shutdown gconf.
+- Skip gpg/ssh-agent if GNOME compat is enabled and gnome-keyring found.
+- Replace mkdirhier with mkdir (bug #8776).
+- Translation updates: Spanish (Castilian), Galician, Japanese,
+  Korean, Portuguese, Romanian, Turkish, Chinese (China), Chinese
+  (Taiwan).
+
 4.9.2
 =====
 - Make the buttons sensitive when using sudo (bug #8708).
 - Restore ssh and gpg agent starting (bug #7018).
-- Translation updates: Czech, German, English (United Kingdom), 
-  Spanish (Castilian), Croatian, Hungarian, Japanese, Kazakh, Korean, 
+- Translation updates: Czech, German, English (United Kingdom),
+  Spanish (Castilian), Croatian, Hungarian, Japanese, Kazakh, Korean,
   Dutch (Flemish), Polish, Russian.
 
 4.9.1
@@ -17,10 +26,10 @@
 - Improve xflock4 script (bug #3770).
 - Drop the sync code because it can segfault on ext2 (bug #7887).
 - Always escape name and comment in dialog.
-- Translation updates: Catalan (Valencian), Danish, German, Greek, 
-  Basque, Finnish, French, Galician, Croatian, Italian, Japanese, 
-  Kazakh, Korean, Lithuanian, Dutch (Flemish), Norwegian Nynorsk, 
-  Polish, Portuguese, Portuguese (Brazilian), Slovak, Turkish, 
+- Translation updates: Catalan (Valencian), Danish, German, Greek,
+  Basque, Finnish, French, Galician, Croatian, Italian, Japanese,
+  Kazakh, Korean, Lithuanian, Dutch (Flemish), Norwegian Nynorsk,
+  Polish, Portuguese, Portuguese (Brazilian), Slovak, Turkish,
   Ukrainian, Chinese (China).
 
 4.9.0
diff --git a/configure.in.in b/configure.in.in
index 5d51d5e..ccf9058 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -7,11 +7,11 @@ dnl
 
 dnl Version information
 m4_define([xfsm_version_major], [4])
-m4_define([xfsm_version_minor], [9])
-m4_define([xfsm_version_micro], [2])
+m4_define([xfsm_version_minor], [10])
+m4_define([xfsm_version_micro], [0])
 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])])