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

[Nick Schermer]

Updating branch refs/heads/master
         to 40e368035e0814d7401eee0d01aaa18cbe3cc597 (commit)
       from 4d9f193f5195f4c62f9abf5a49a55488f9d6c1b3 (commit)

commit 40e368035e0814d7401eee0d01aaa18cbe3cc597
Author: Nick Schermer <nick at xfce.org>
Date:   Sat Apr 28 22:31:33 2012 +0200

    Updates for release.

 NEWS            |   23 +++++++++++++++++------
 configure.ac.in |    6 +++---
 2 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/NEWS b/NEWS
index a9ccdc2..0dbcb44 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,14 @@
+4.10.0
+======
+- Use correct LGPL licenses in the libs.
+- Restore child properties when moving a plugin.
+- Migrate: Use correct pointer for action migrate (bug #8781).
+- Migrate: Don't try to migrate already migrated plugin (bug #8778).
+- Translation updates: German, English (United Kingdom), Spanish
+  (Castilian), French, Galician, Hungarian, Japanese, Korean, Dutch
+  (Flemish), Polish, Portuguese, Portuguese (Brazilian), Romanian,
+  Chinese (China).
+
 4.9.2
 =====
 - Launcher: Fix desktop file monitoring on some systems.
@@ -10,12 +21,12 @@
 - Actions: Fix mnemonics conflict (bug #8657).
 - Clock: Fix compiler warning (bug #8648).
 - Bump version-info of libxfce4panel.
-- Translation updates: Arabic, Catalan (Valencian), Czech, Danish, 
-  German, Greek, Esperanto, Spanish (Castilian), Estonian, Basque, 
-  Persian, Finnish, French, Galician, Hebrew, Croatian, Hungarian, 
-  Indonesian, Italian, Japanese, Kazakh, Korean, Lithuanian, Dutch 
-  (Flemish), Norwegian Nynorsk, Polish, Portuguese, Portuguese 
-  (Brazilian), Russian, Slovak, Telugu, Turkish, Ukrainian, Chinese 
+- Translation updates: Arabic, Catalan (Valencian), Czech, Danish,
+  German, Greek, Esperanto, Spanish (Castilian), Estonian, Basque,
+  Persian, Finnish, French, Galician, Hebrew, Croatian, Hungarian,
+  Indonesian, Italian, Japanese, Kazakh, Korean, Lithuanian, Dutch
+  (Flemish), Norwegian Nynorsk, Polish, Portuguese, Portuguese
+  (Brazilian), Russian, Slovak, Telugu, Turkish, Ukrainian, Chinese
   (China), Chinese (Taiwan).
 
 4.9.1
diff --git a/configure.ac.in b/configure.ac.in
index 6bf6b10..c4e7b79 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -12,11 +12,11 @@ m4_define([libxfce4panel_verinfo], [4:0:0]) dnl current:revision:age
 m4_define([libxfce4panel_version_api], [1.0])
 m4_define([xfce4_panel_config_version], [2])
 m4_define([xfce4_panel_version_major], [4])
-m4_define([xfce4_panel_version_minor], [9])
-m4_define([xfce4_panel_version_micro], [2])
+m4_define([xfce4_panel_version_minor], [10])
+m4_define([xfce4_panel_version_micro], [0])
 m4_define([xfce4_panel_version_nano],  []) dnl leave this empty to have no nano version
 m4_define([xfce4_panel_version_build], [@REVISION@])
-m4_define([xfce4_panel_version_tag],   [git])
+m4_define([xfce4_panel_version_tag],   [])
 m4_define([xfce4_panel_version], [xfce4_panel_version_major().xfce4_panel_version_minor().xfce4_panel_version_micro()ifelse(xfce4_panel_version_nano(), [], [], [.xfce4_panel_version_nano()])ifelse(xfce4_panel_version_tag(), [git], [xfce4_panel_version_tag()-xfce4_panel_version_build()], [xfce4_panel_version_tag()])])
 
 dnl *******************************************