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

[Nick Schermer]

Updating branch refs/heads/master
         to 4d834ab155ef7d680f2b8711da6924beaa3a0878 (commit)
       from fd7b4a9408effcf6ed995fc5e4d5d2b7ff5d6505 (commit)

commit 4d834ab155ef7d680f2b8711da6924beaa3a0878
Author: Nick Schermer <nick at xfce.org>
Date:   Wed Nov 3 20:41:25 2010 +0100

    Updates for release.

 NEWS            |   11 +++++++++++
 configure.ac.in |    6 +++---
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/NEWS b/NEWS
index f382d0a..77b50bc 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,14 @@
+4.7.4
+=====
+- Add support for menu monitoring.
+- Allow translations of the "Xfce Panel" string.
+- Add submodule to xfce4-docs/xfce4-panel-master.
+- Fix accelerator key conflict (bug #6765).
+- Add test for docs module and depend on xdt 4.7.3.
+- Fix distributing the manual in the dist tarball.
+- Translation updates (ug, gl, zh_TW, de, sk, nl, da, kk, uk, pt,
+  de, it, ja, el, fi, sv, ca, eu, hu).
+
 4.7.3
 =====
 - Add support to run plugins in valgrind.
diff --git a/configure.ac.in b/configure.ac.in
index 7cf7a82..0394775 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -12,10 +12,10 @@ m4_define([libxfce4panel_verinfo], [3:0:0]) dnl current:revision:age
 m4_define([libxfce4panel_version_api], [1.0])
 m4_define([xfce4_panel_version_major], [4])
 m4_define([xfce4_panel_version_minor], [7])
-m4_define([xfce4_panel_version_micro], [3])
+m4_define([xfce4_panel_version_micro], [4])
 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 *******************************************
@@ -107,7 +107,7 @@ dnl ***********************************
 dnl *** Check for required packages ***
 dnl ***********************************
 XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.6.0])
-XDT_CHECK_PACKAGE([GARCON], [garcon-1], [0.1.1])
+XDT_CHECK_PACKAGE([GARCON], [garcon-1], [0.1.2])
 XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.7.1])
 XDT_CHECK_PACKAGE([XFCONF], [libxfconf-0], [4.7.2])
 XDT_CHECK_PACKAGE([EXO], [exo-1], [0.5.1])