diff --git a/NEWS b/NEWS index 0ac11bf3..23b23c6b 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,20 @@ +Version 2.34.1 +============== + + - Fix crash in meta_display_get_above_tab_keycode (Adam Jackson) + - Disable keybindings message should ungrab keys (Daniel Drake) + - Remove --with-gtk configure flag as metacity only builds against gtk2 (Colin + Walters) + - Build fix for FreeBSD: Include sys/wait.h as described in POSIX specs (Alexis Ballier) + - Various small build system changes (William Jon McCann, Olav Vitters) + +Translations: + Carles Ferrando (ca@valencia) + Jiro Matsuzawa (ja) + Kristjan SCHMIDT (eo) + Nguyễn Thái Ngọc Duy (vi) + Tommi Vainikainen (fi) + ============== Version 2.34.0 ============== diff --git a/configure.in b/configure.in index 1832c7de..34159832 100644 --- a/configure.in +++ b/configure.in @@ -4,7 +4,7 @@ m4_define([metacity_major_version], [2]) m4_define([metacity_minor_version], [34]) # Fibonacci sequence for micro version numbering: # 0, 1, 1, 2, 3, 5, 8, 13, 21, 34, 55, 89, 144, 233, 377, 610, 987 -m4_define([metacity_micro_version], [1]) +m4_define([metacity_micro_version], [2]) m4_define([metacity_version], [metacity_major_version.metacity_minor_version.metacity_micro_version]) @@ -14,7 +14,8 @@ AC_INIT([metacity], [metacity_version], AC_CONFIG_SRCDIR(src/core/display.c) AC_CONFIG_HEADERS(config.h) -AM_INIT_AUTOMAKE +AM_INIT_AUTOMAKE([1.11.1 no-dist-gzip dist-xz]) +m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])],) AM_MAINTAINER_MODE # Honor aclocal flags diff --git a/metacity.doap b/metacity.doap index e81ce708..3d965bb1 100644 --- a/metacity.doap +++ b/metacity.doap @@ -8,8 +8,7 @@ xmlns:gnome="http://api.gnome.org/doap-extensions#" xmlns:admin="http://webns.net/mvcb/"> - The Metacity Window Manager - Metacity + Metacity diff --git a/src/Makefile.am b/src/Makefile.am index 2f35a2d8..ea7fa483 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -143,7 +143,7 @@ schema_bindings_SOURCES = \ schema_bindings_LDADD = @METACITY_LIBS@ metacity.schemas.in: schema_bindings ${srcdir}/metacity.schemas.in.in @echo Generating keybinding schemas... ${srcdir}/metacity.schemas.in.in - ${builddir}/schema_bindings ${srcdir}/metacity.schemas.in.in ${builddir}/metacity.schemas.in + $(AM_V_GEN)${builddir}/schema_bindings ${srcdir}/metacity.schemas.in.in ${builddir}/metacity.schemas.in bin_PROGRAMS=metacity metacity-theme-viewer @@ -207,7 +207,7 @@ BUILT_SOURCES = inlinepixbufs.h CLEANFILES = inlinepixbufs.h metacity.desktop metacity-wm.desktop metacity.schemas metacity.schemas.in 50-metacity-launchers.xml 50-metacity-navigation.xml 50-metacity-screenshot.xml 50-metacity-system.xml 50-metacity-windows.xml inlinepixbufs.h: $(IMAGES) - $(GDK_PIXBUF_CSOURCE) --raw --build-list $(VARIABLES) >$(srcdir)/inlinepixbufs.h + $(AM_V_GEN)$(GDK_PIXBUF_CSOURCE) --raw --build-list $(VARIABLES) >$(srcdir)/inlinepixbufs.h pkgconfigdir = $(libdir)/pkgconfig