[Xfce4-commits] <xfce-utils:master> Updates for release.

[Nick Schermer]

Updating branch refs/heads/master
         to 4dc51777286d940c4cc7f03a0b5b021f4c972f47 (commit)
       from 926d25517984a9d48da02f4074085cc907fb6984 (commit)

commit 4dc51777286d940c4cc7f03a0b5b021f4c972f47
Author: Nick Schermer <nick at xfce.org>
Date:   Sun Sep 5 12:54:55 2010 +0200

    Updates for release.

 NEWS            |   27 ++++++++++++++++++++++++++-
 configure.in.in |   19 ++++++++++++++++---
 2 files changed, 42 insertions(+), 4 deletions(-)

diff --git a/NEWS b/NEWS
index 14b28f4..d28f39d 100644
--- a/NEWS
+++ b/NEWS
@@ -1,9 +1,34 @@
 4.7.0
 =====
-
+- Fix gpg/ssh-agent startup for users with pam_ssh installed.
+- $dbuslaunch var isn't used anymore (bug #5863).
+- Start ssh-agent before dbus so dbus has the env vars set.
+- Switch to xdt 4.7.2.
+- Port to libxfce4ui.
+- Bump copyright to 2010.
+- Add slock functionality (bug #6253).
+- Add desktop files for the applications in the Xfce menu.
+- Avoid /usr/local/share being added to XDG_DATA_DIRS more than once.
+- Build ChangeLog from GIT.
+- Hide xfconf-query warnings when properties do not exist.
+- Launch xfce4-session with ck-launch-session if installed.
+- Use right comment character in Xft.xrdb (bug #6314).
+- Also kill ssh-agent in bash like environment (bug #6476).
+- Spawn dbus-launch before the dbus users (bug #5576).
+- Don't set /usr/share twice in XDG_DATA_DIRS (bug #5151).
+- Startxfce4 doesn't handle empty client options (bug #5382).
+- Fix some bashism in xinitrc (bug #5557).
+- Make xinitrc work with Solaris (bug #5557).
+- Remove deprecated encoding key from desktop files.
+- Build documentation during make dist.
+- Fix xfhelp4 for the new documentation locations.
 - Add support for starting gpg-agent.
 - Add ability to enable/disable or change the type of screensaver and
   ssh-agent using xfconf.
+- Remove duplicate Makefile.am entry for xfterm4.
+- Translation updates (pl, gl, pt, ro, lv, ur, ur_PK, zh_CN, hu, ast, kk,
+  el, ru, sk, sq, it, da, ja, pt, ca, nl, pt_BR, cs, fi, eu, si, bg, pa,
+  uk).
 
 
 4.6.1
diff --git a/configure.in.in b/configure.in.in
index f878f4f..6ee3233 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -8,7 +8,17 @@ dnl Huijsmans <jasper at xfce.org>, Benedikt Meurer <benny at xfce.org>
 dnl and Xavier MAILLARD <zedek at fxgsproject.org>.
 dnl
 
-m4_define([xfce_utils_version], [4.7.0git])
+dnl Version information
+m4_define([xfce_utils_version_major], [4])
+m4_define([xfce_utils_version_minor], [7])
+m4_define([xfce_utils_version_micro], [0])
+m4_define([xfce_utils_version_nano],  []) dnl leave this empty to have no nano version
+m4_define([xfce_utils_version_build], [@REVISION@])
+m4_define([xfce_utils_version_tag],   [])
+m4_define([xfce_utils_version], [xfce_utils_version_major().xfce_utils_version_minor().xfce_utils_version_micro()ifelse(xfce_utils_version_nano(), [], [], [.xfce_utils_version_nano()])ifelse(xfce_utils_version_tag(), [git], [xfce_utils_version_tag()-xfce_utils_version_build()], [xfce_utils_version_tag()])])
+
+dnl Debugging support for GIT snapshots
+m4_define([xfce_utils_debug_default], [ifelse(xfce_utils_version_tag(), [git], [yes], [minimum])])
 
 AC_INIT([xfce-utils], [xfce_utils_version], [xfce at xfce.org])
 AM_INIT_AUTOMAKE([dist-bzip2])
@@ -76,7 +86,7 @@ AC_MSG_RESULT([$with_xsession_prefix])
 dnl the xfconf migration requires perl with XML::Parser
 AC_ARG_ENABLE([xfconf-migration],
               [AC_HELP_STRING([--disable-xfconf-migration],
-                              [Don't require perl/XML::Parser for Xfconf settings migration @<:@default=required@:>@])],
+                              [Do not require perl/XML::Parser for Xfconf settings migration @<:@default=required@:>@])],
               [do_xfconf_migration=$enableval], [do_xfconf_migration=yes])
 if test "x$do_xfconf_migration" = "xyes"; then
     AC_PATH_PROGS([PERL], [perl5.8 perl5.6 perl5 perl])
@@ -144,7 +154,10 @@ fi
 AM_CONDITIONAL([GENERATE_DOCUMENTATION], [test x"$enable_gen_doc" = x"yes"])
 
 dnl Check for debugging support
-XDT_FEATURE_DEBUG
+XDT_FEATURE_DEBUG([xfce_utils_debug_default])
+
+dnl Check for linker optimizations
+XDT_FEATURE_LINKER_OPTS()
 
 dnl Check for vendor specific information
 AC_MSG_CHECKING([for additional vendor info])