From 365c7eabfb9e800aa7d5271eab2fdb381a99de79 Mon Sep 17 00:00:00 2001 From: Olav Vitters Date: Tue, 21 Jun 2011 19:25:11 +0200 Subject: [PATCH 1/6] Create tar.xz tarballs --- configure.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.in b/configure.in index 1832c7de..a90480af 100644 --- a/configure.in +++ b/configure.in @@ -14,7 +14,7 @@ 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]) AM_MAINTAINER_MODE # Honor aclocal flags From b00210d5c69144431cf3d2fcda91afe033b7c38a Mon Sep 17 00:00:00 2001 From: Olav Vitters Date: Tue, 21 Jun 2011 19:30:40 +0200 Subject: [PATCH 2/6] Use AM_SILENT_RULES for nicer build status --- configure.in | 1 + 1 file changed, 1 insertion(+) diff --git a/configure.in b/configure.in index a90480af..ac6ccc60 100644 --- a/configure.in +++ b/configure.in @@ -15,6 +15,7 @@ AC_CONFIG_SRCDIR(src/core/display.c) AC_CONFIG_HEADERS(config.h) 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 From 89c49b6e40d3a9907ded10faa11ff8a59f5165d6 Mon Sep 17 00:00:00 2001 From: Olav Vitters Date: Tue, 21 Jun 2011 19:32:15 +0200 Subject: [PATCH 3/6] Update NEWS with 2.34.1 changes --- NEWS | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) 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 ============== From 655d9351923817edfcb5452f46048134255d58ce Mon Sep 17 00:00:00 2001 From: Olav Vitters Date: Tue, 21 Jun 2011 19:35:55 +0200 Subject: [PATCH 4/6] release: post-release bump to 2.34.2 --- configure.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.in b/configure.in index ac6ccc60..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]) From d3e3155804b3a2b9b783a69f7cdd653f3b4ec78a Mon Sep 17 00:00:00 2001 From: Olav Vitters Date: Tue, 21 Jun 2011 21:44:32 +0200 Subject: [PATCH 5/6] fix name --- metacity.doap | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) 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 From 54aa2d07f7eab08725af8ac73e02f72dec45ae91 Mon Sep 17 00:00:00 2001 From: Thomas Hindoe Paaboel Andersen Date: Wed, 22 Jun 2011 18:39:46 +0200 Subject: [PATCH 6/6] Silence some build output GNOME bug #607355 --- src/Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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