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

[Nick Schermer]

Updating branch refs/heads/master
         to 6c290dfd3877b11c40dffc9962b169aa074f6cea (commit)
       from c16d1710c0ce6a73a884d4f172d1f7f467200415 (commit)

commit 6c290dfd3877b11c40dffc9962b169aa074f6cea
Author: Nick Schermer <nick at xfce.org>
Date:   Sat Jan 21 22:35:25 2012 +0100

    Updates for release.

 NEWS            |   13 +++++++++++++
 configure.ac.in |    4 ++--
 po/POTFILES.in  |    2 +-
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/NEWS b/NEWS
index b02eff0..2f6ddb5 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,16 @@
+4.9.1
+=====
+- Use daemon() for xfsettingsd if available.
+- Hide the xfconfd-already running message completely.
+- Excluded items with NoDisplay=true in the settings dialog.
+- Remove duplicated accelerators (bug #7734).
+- Add theme dnd-installation by dropping in a treeview.
+- Drop AC_LIBTOOL in favor of LT_PREREQ and LT_INIT.
+- Wait for the window manager before setting workspace names.
+- Add option to disable numlock restoring (bug #8302).
+- Add Help button and make existing buttons work with wiki.
+- Add new MIME Type editor.
+
 4.9.0
 =====
 - Depend on Gtk+ 2.20 and Glib 2.24.
diff --git a/configure.ac.in b/configure.ac.in
index 2ec11c1..4cdbbd8 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], [9])
-m4_define([xfce4_settings_version_micro], [0])
+m4_define([xfce4_settings_version_micro], [1])
 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 *******************************************
diff --git a/po/POTFILES.in b/po/POTFILES.in
index d5bdc63..d24819d 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -23,7 +23,7 @@ dialogs/keyboard-settings/xfce-keyboard-settings.desktop.in
 dialogs/mime-settings/main.c
 dialogs/mime-settings/xfce-mime-chooser.c
 dialogs/mime-settings/xfce-mime-window.c
-dialogs/mime-settings/xfce-mime-settings.desktop.in
+dialogs/mime-settings/xfce4-mime-settings.desktop.in
 
 dialogs/mouse-settings/main.c
 dialogs/mouse-settings/mouse-dialog.glade