Package: release.debian.org Severity: normal User: [email protected] Usertags: unblock
Please unblock package mutter The changes between -4 and -5 contain a fix for a packaging mistake (we forgot to include a file which is needed to setup certain keyboard shortcuts via gnome-control-center) and a patch that got cherry-picked from upstream which fixes a segfault. Debdiff is attached unblock mutter/3.4.1-5 -- System Information: Debian Release: wheezy/sid APT prefers unstable APT policy: (500, 'unstable'), (200, 'experimental') Architecture: amd64 (x86_64) Foreign Architectures: i386 Kernel: Linux 3.2.0-3-amd64 (SMP w/4 CPU cores) Locale: LANG=de_DE.utf8, LC_CTYPE=de_DE.utf8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash
diff -Nru mutter-3.4.1/debian/changelog mutter-3.4.1/debian/changelog --- mutter-3.4.1/debian/changelog 2012-06-01 14:19:58.000000000 +0200 +++ mutter-3.4.1/debian/changelog 2012-07-07 20:11:43.000000000 +0200 @@ -1,3 +1,17 @@ +mutter (3.4.1-5) unstable; urgency=low + + [ Rico Tzschichholz ] + * debian/patches: Add upstream patch + 00_meta_window_move_frame-fix-crash-when-frame-is-NULL.patch + + [ Michael Biebl ] + * Install missing keybindings file 50-mutter-windows.xml which is required + to configure mutter specific keyboard shortcuts in gnome-control-center. + Closes: #680004 + * Use list-missing to list files missing from the package. + + -- Michael Biebl <[email protected]> Sat, 07 Jul 2012 20:03:06 +0200 + mutter (3.4.1-4) unstable; urgency=low * Clean up /etc/sgml/mutter-common.cat and /etc/sgml/mutter-common.cat.old diff -Nru mutter-3.4.1/debian/mutter-common.install mutter-3.4.1/debian/mutter-common.install --- mutter-3.4.1/debian/mutter-common.install 2012-05-24 10:14:55.000000000 +0200 +++ mutter-3.4.1/debian/mutter-common.install 2012-07-03 00:46:20.000000000 +0200 @@ -3,3 +3,4 @@ usr/share/locale usr/share/man usr/share/mutter +usr/share/gnome-control-center diff -Nru mutter-3.4.1/debian/patches/00_meta_window_move_frame-fix-crash-when-frame-is-NULL.patch mutter-3.4.1/debian/patches/00_meta_window_move_frame-fix-crash-when-frame-is-NULL.patch --- mutter-3.4.1/debian/patches/00_meta_window_move_frame-fix-crash-when-frame-is-NULL.patch 1970-01-01 01:00:00.000000000 +0100 +++ mutter-3.4.1/debian/patches/00_meta_window_move_frame-fix-crash-when-frame-is-NULL.patch 2012-06-18 01:30:42.000000000 +0200 @@ -0,0 +1,53 @@ +From 5e453f41befcd86f96ab0f0493fa64ac0f45d87b Mon Sep 17 00:00:00 2001 +From: "Owen W. Taylor" <[email protected]> +Date: Tue, 1 May 2012 13:40:08 -0400 +Subject: [PATCH] meta_window_move_frame(): fix crash when frame is NULL + +When meta_frame_calc_borders() was made to take a NULL frame argument, +a crash was accidentally introduced into meta_window_move_frame(). + +This partially reverts 8c1b2d5. + +https://bugzilla.gnome.org/show_bug.cgi?id=675254 +--- + src/core/window.c | 22 ++++++++++++---------- + 1 file changed, 12 insertions(+), 10 deletions(-) + +diff --git a/src/core/window.c b/src/core/window.c +index 204bc0c..9e4b93c 100644 +--- a/src/core/window.c ++++ b/src/core/window.c +@@ -5108,18 +5108,20 @@ meta_window_move_frame (MetaWindow *window, + { + int x = root_x_nw; + int y = root_y_nw; +- MetaFrameBorders borders; +- +- meta_frame_calc_borders (window->frame, &borders); + +- /* root_x_nw and root_y_nw correspond to where the top of +- * the visible frame should be. Offset by the distance between +- * the origin of the window and the origin of the enclosing +- * window decorations. +- */ +- x += window->frame->child_x - borders.invisible.left; +- y += window->frame->child_y - borders.invisible.top; ++ if (window->frame) ++ { ++ MetaFrameBorders borders; ++ meta_frame_calc_borders (window->frame, &borders); + ++ /* root_x_nw and root_y_nw correspond to where the top of ++ * the visible frame should be. Offset by the distance between ++ * the origin of the window and the origin of the enclosing ++ * window decorations. ++ */ ++ x += window->frame->child_x - borders.invisible.left; ++ y += window->frame->child_y - borders.invisible.top; ++ } + meta_window_move (window, user_op, x, y); + } + +-- +1.7.10 + diff -Nru mutter-3.4.1/debian/patches/series mutter-3.4.1/debian/patches/series --- mutter-3.4.1/debian/patches/series 2012-05-24 10:14:55.000000000 +0200 +++ mutter-3.4.1/debian/patches/series 2012-06-18 01:30:42.000000000 +0200 @@ -1 +1,2 @@ +00_meta_window_move_frame-fix-crash-when-frame-is-NULL.patch 01_Wcast-align.patch diff -Nru mutter-3.4.1/debian/rules mutter-3.4.1/debian/rules --- mutter-3.4.1/debian/rules 2012-05-24 10:14:55.000000000 +0200 +++ mutter-3.4.1/debian/rules 2012-07-07 19:43:10.000000000 +0200 @@ -17,3 +17,5 @@ # This does not work with mutter; disabled, for now. # LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed + +common-binary-post-install-arch:: list-missing
