Updating branch refs/heads/master to 26dfdaffd7a8418d8b27a2e6bb378139b742b31e (commit) from b551e2d029afae034213754991711e9c363c50e1 (commit)
commit 26dfdaffd7a8418d8b27a2e6bb378139b742b31e Author: Nick Schermer <n...@xfce.org> Date: Mon Sep 23 19:15:29 2013 +0200 Updates for release. NEWS | 24 ++++++++++++++++++++++++ configure.ac.in | 8 ++++---- libxfce4ui/libxfce4ui.symbols | 2 ++ xfce4-about/Makefile.am | 8 +++++--- 4 files changed, 35 insertions(+), 7 deletions(-) diff --git a/NEWS b/NEWS index 9769cae..6f3e323 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,27 @@ +4.11.0 +====== +- Compile GTK+-3 version of libxfce4ui when possible. +- Depend on GTK 2.24 and Glib 2.28. +- Only define distclean files in maintainer mode (bug #8974). +- Don't remove keyboard shortcut when entered twice (bug #8749). +- Fix keyboard shortcuts with Shift modifier (bug #8744). +- Fix alt + print being detected as SysReq (bug #7897). +- Use <Primary> instead of <Control> (bug #8200). +- Fix keyboard shortcuts with keypad (bug #4178). +- Autotools updates. +- Prefer exo-open for opening the manual pages. +- Add error domain for XfceSmClient. +- Translation updates: Amharic, Arabic, Asturian, Bulgarian, Bengali, + Catalan (Valencian), Czech, Danish, German, Greek, English (United + Kingdom), Spanish (Castilian), Basque, Finnish, French, Galician, + Hebrew, Croatian, Hungarian, Indonesian, Icelandic, Italian, + Japanese, Kazakh, Korean, Kurdish, Lithuanian, Latvian, Norwegian + Bokmal, Dutch (Flemish), Norwegian Nynorsk, Panjabi (Punjabi), + Polish, Portuguese, Portuguese (Brazilian), Romanian, Russian, + Sinhala, Slovak, Serbian, Swedish, Telugu, Thai, Tagalog, Tagalog + (Philippines), Turkish, Uyghur, Ukrainian, Urdu, Urdu (Pakistan), + Vietnamese, Chinese (China), Chinese (Taiwan). + 4.10.0 ====== - Update contributor credits. diff --git a/configure.ac.in b/configure.ac.in index e47df04..314c53e 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -1,6 +1,6 @@ dnl $Id$ dnl -dnl Copyright (c) 2007-2011 The Xfce development team +dnl Copyright (c) 2007-2013 The Xfce development team dnl dnl *************************** @@ -9,11 +9,11 @@ dnl *************************** m4_define([libxfce4ui_verinfo], [0:0:0]) m4_define([libxfce4ui_version_api], [1]) m4_define([libxfce4ui_version_major], [4]) -m4_define([libxfce4ui_version_minor], [10]) +m4_define([libxfce4ui_version_minor], [11]) m4_define([libxfce4ui_version_micro], [0]) m4_define([libxfce4ui_version_nano], []) dnl leave this empty to have no nano version m4_define([libxfce4ui_version_build], [@REVISION@]) -m4_define([libxfce4ui_version_tag], [git]) +m4_define([libxfce4ui_version_tag], []) m4_define([libxfce4ui_version], [libxfce4ui_version_major().libxfce4ui_version_minor().libxfce4ui_version_micro()ifelse(libxfce4ui_version_nano(), [], [], [.libxfce4ui_version_nano()])ifelse(libxfce4ui_version_tag(), [git], [libxfce4ui_version_tag()-libxfce4ui_version_build()], [libxfce4ui_version_tag()])]) m4_define([libxfce4kbd_private_verinfo], [0:0:0]) @@ -31,7 +31,7 @@ m4_define([libxfce4ui_debug_default], [ifelse(libxfce4ui_version_tag(), [git], [ dnl *************************** dnl *** Initialize autoconf *** dnl *************************** -AC_COPYRIGHT([Copyright (c) 2007-2012 The Xfce development team]) +AC_COPYRIGHT([Copyright (c) 2007-2013 The Xfce development team]) AC_INIT([libxfce4ui], [libxfce4ui_version], [http://bugzilla.xfce.org/], [libxfce4ui]) AC_PREREQ([2.60]) AC_REVISION([libxfce4ui_version_build]) diff --git a/libxfce4ui/libxfce4ui.symbols b/libxfce4ui/libxfce4ui.symbols index d88ce12..f572f23 100644 --- a/libxfce4ui/libxfce4ui.symbols +++ b/libxfce4ui/libxfce4ui.symbols @@ -48,6 +48,7 @@ libxfce4ui_check_version /* libxfce4ui-enum-types functions */ #if IN_HEADER(__LIBXFCE4UI_ENUM_TYPES_H__) #if IN_SOURCE(__LIBXFCE4UI_ENUM_TYPES_C__) +xfce_sm_client_error_enum_get_type xfce_sm_client_restart_style_get_type xfce_sm_client_shutdown_hint_get_type #endif @@ -103,6 +104,7 @@ xfce_sm_client_get_with_argv xfce_sm_client_get_full xfce_sm_client_connect xfce_sm_client_disconnect +xfce_sm_client_error_quark xfce_sm_client_is_connected xfce_sm_client_is_resumed xfce_sm_client_set_desktop_file diff --git a/xfce4-about/Makefile.am b/xfce4-about/Makefile.am index 8dd3d88..50956f7 100644 --- a/xfce4-about/Makefile.am +++ b/xfce4-about/Makefile.am @@ -36,6 +36,9 @@ desktop_in_files = xfce4-about.desktop.in desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) @INTLTOOL_DESKTOP_RULE@ +DISTCLEANFILES = \ + $(desktop_DATA) + if MAINTAINER_MODE about-dialog-ui.h: $(srcdir)/xfce4-about-dialog.glade Makefile @@ -44,9 +47,8 @@ about-dialog-ui.h: $(srcdir)/xfce4-about-dialog.glade Makefile BUILT_SOURCES = \ $(xfce4_about_built_sources) -DISTCLEANFILES = \ - $(xfce4_about_built_sources) \ - $(desktop_DATA) +DISTCLEANFILES += \ + $(xfce4_about_built_sources) endif _______________________________________________ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits