diff -Nru metacity-3.17.2/debian/changelog metacity-3.17.2/debian/changelog --- metacity-3.17.2/debian/changelog 2015-06-29 18:46:58.000000000 +0000 +++ metacity-3.17.2/debian/changelog 2015-07-09 12:15:07.000000000 +0000 @@ -1,3 +1,31 @@ +metacity (1:3.17.2-4ubuntu1) wily; urgency=medium + + * Merge with Debian unstable, remaining changes: + - debian/metacity-common.links: Show keybindings in Unity control + center. + - debian/metacity-common.gsettings-override: Change the default theme + to Ambiance. + + -- Dmitry Shachnev Thu, 09 Jul 2015 15:03:35 +0300 + +metacity (1:3.17.2-4) unstable; urgency=medium + + * Add a patch to fix potential crash when destroying windows + (from Alberts Muktupāvels). + + -- Dmitry Shachnev Wed, 08 Jul 2015 14:49:11 +0300 + +metacity (1:3.17.2-3) unstable; urgency=medium + + * Update README.Debian. + * Remove manpages from debian/ directory, we are shipping upstream + manpages anyway. + * Backport upstream patch (check_display.diff) to check for valid + display in meta_prefs_get_compositing_manager function. + * Upload to unstable. + + -- Dmitry Shachnev Mon, 15 Jun 2015 13:33:07 +0300 + metacity (1:3.17.2-2ubuntu2) wily; urgency=medium * debian/metacity-common.gsettings-override: Change the default theme diff -Nru metacity-3.17.2/debian/control metacity-3.17.2/debian/control --- metacity-3.17.2/debian/control 2015-06-29 18:47:21.000000000 +0000 +++ metacity-3.17.2/debian/control 2015-07-09 12:15:07.000000000 +0000 @@ -7,7 +7,7 @@ Priority: optional Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Debian GNOME Maintainers -Uploaders: Debian GNOME Maintainers , Dmitry Shachnev +Uploaders: Andreas Henriksson , Dmitry Shachnev Build-Depends: cdbs (>= 0.4.41), debhelper (>= 8), dh-autoreconf, @@ -36,8 +36,8 @@ zenity Standards-Version: 3.9.6 Homepage: https://git.gnome.org/browse/metacity -Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/experimental/metacity -Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/experimental/metacity +Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/metacity +Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/metacity Package: metacity Architecture: any diff -Nru metacity-3.17.2/debian/control.in metacity-3.17.2/debian/control.in --- metacity-3.17.2/debian/control.in 2015-06-13 10:50:57.000000000 +0000 +++ metacity-3.17.2/debian/control.in 2015-07-09 12:15:07.000000000 +0000 @@ -32,8 +32,8 @@ zenity Standards-Version: 3.9.6 Homepage: https://git.gnome.org/browse/metacity -Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/experimental/metacity -Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/experimental/metacity +Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/metacity +Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/metacity Package: metacity Architecture: any diff -Nru metacity-3.17.2/debian/metacity.1 metacity-3.17.2/debian/metacity.1 --- metacity-3.17.2/debian/metacity.1 2015-06-13 10:50:57.000000000 +0000 +++ metacity-3.17.2/debian/metacity.1 1970-01-01 00:00:00.000000000 +0000 @@ -1,53 +0,0 @@ -.\" Hey, EMACS: -*- nroff -*- -.\" First parameter, NAME, should be all caps -.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection -.\" other parameters are allowed: see man(7), man(1) -.TH METACITY 1 "19 August 2002" -.\" Please adjust this date whenever revising the manpage. -.\" -.\" Some roff macros, for reference: -.\" .nh disable hyphenation -.\" .hy enable hyphenation -.\" .ad l left justify -.\" .ad b justify to both left and right margins -.\" .nf disable filling -.\" .fi enable filling -.\" .br insert line break -.\" .sp insert n+1 empty lines -.\" for manpage-specific macros, see man(7) -.SH NAME -METACITY \- minimal GTK2 Window Manager -.SH SYNOPSIS -.B metacity -[\-\-sm\-disable] [\-\-sm\-save\-file=\fIFILENAME\fP] [\-\-display=\fIDISPLAY\fP] [\-\-replace] -.SH DESCRIPTION -This manual page documents briefly the -.B metacity\fP. -This manual page was written for the Debian distribution -because the original program does not have a manual page. -.PP -.\" TeX users may be more comfortable with the \fB\fP and -.\" \fI\fP escape sequences to invode bold face and italics, -.\" respectively. -\fBmetacity\fP is a minimal X window manager that tries to be as crack free as possible. It supports sloppy focussing and multiple desktops. -.SH OPTIONS -.TP -.B \-\-sm\-disable -Disable the session management. -.TP -.B \-\-sm\-save\-file=FILENAME -Save a session to \fIFILENAME\fP. -.TP -.B \-\-display=DISPLAY -Connect to X display \fIDISPLAY\fP. -.TP -.B \-\-replace -a window manager which is running is replaced by \fBmetacity\fP. -.TP -.B \-h, \-\-help -Show summary of options. -.SH SEE ALSO -.BR metacity-message (1) -.SH AUTHOR -This manual page was written by Akira TAGOH , -for the Debian GNU/Linux system (but may be used by others). The original manual page was written by Thom May . diff -Nru metacity-3.17.2/debian/metacity-common.manpages metacity-3.17.2/debian/metacity-common.manpages --- metacity-3.17.2/debian/metacity-common.manpages 2015-06-13 10:50:57.000000000 +0000 +++ metacity-3.17.2/debian/metacity-common.manpages 1970-01-01 00:00:00.000000000 +0000 @@ -1,4 +0,0 @@ -debian/metacity.1 -debian/metacity-message.1 -debian/metacity-theme-viewer.1 -debian/metacity-window-demo.1 diff -Nru metacity-3.17.2/debian/metacity-message.1 metacity-3.17.2/debian/metacity-message.1 --- metacity-3.17.2/debian/metacity-message.1 2015-06-13 10:50:57.000000000 +0000 +++ metacity-3.17.2/debian/metacity-message.1 1970-01-01 00:00:00.000000000 +0000 @@ -1,50 +0,0 @@ -.\" Hey, EMACS: -*- nroff -*- -.\" First parameter, NAME, should be all caps -.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection -.\" other parameters are allowed: see man(7), man(1) -.TH METACITY\-MESSAGE 1 "28 August 2002" -.\" Please adjust this date whenever revising the manpage. -.\" -.\" Some roff macros, for reference: -.\" .nh disable hyphenation -.\" .hy enable hyphenation -.\" .ad l left justify -.\" .ad b justify to both left and right margins -.\" .nf disable filling -.\" .fi enable filling -.\" .br insert line break -.\" .sp insert n+1 empty lines -.\" for manpage-specific macros, see man(7) -.SH NAME -METACITY\-MESSAGE \- a command to send a message to Metacity -.SH SYNOPSIS -.B METACITY\-MESSAGE -[restart|reload\-theme|enable\-keybindings|disable\-keybindings] -.SH DESCRIPTION -This manual page documents briefly the -.B metacity\-message\fP. -This manual page was written for the Debian distribution -because the original program does not have a manual page. -.PP -.\" TeX users may be more comfortable with the \fB\fP and -.\" \fI\fP escape sequences to invode bold face and italics, -.\" respectively. -\fBmetacity\-message\fP send a specified message to \fBmetacity\fP(1). -.SH OPTIONS -.TP -.B restart -Restart \fBmetacity\fP(1) which is running. -.TP -.B reload-theme -Reload a theme which is specified on gconf database. -.TP -.B enable-keybindings -Enable all of keybindings which is specified on gconf database. -.TP -.B disable-keybindings -Disable all of keybindings which is specified on gconf database. -.SH SEE ALSO -.BR metacity (1) -.SH AUTHOR -This manual page was written by Akira TAGOH , -for the Debian GNU/Linux system (but may be used by others). diff -Nru metacity-3.17.2/debian/metacity-theme-viewer.1 metacity-3.17.2/debian/metacity-theme-viewer.1 --- metacity-3.17.2/debian/metacity-theme-viewer.1 2015-06-13 10:50:57.000000000 +0000 +++ metacity-3.17.2/debian/metacity-theme-viewer.1 1970-01-01 00:00:00.000000000 +0000 @@ -1,43 +0,0 @@ -.\" In .TH, FOO should be all caps, SECTION should be 1-8, maybe w/ subsection -.\" other parms are allowed: see man(7), man(1) -.\" -.\" Based on template provided by Tom Christiansen . -.\" -.TH METACITY-THEME-VIEWER 1 "1 June 2004" -.SH NAME -metacity-theme-viewer \- view metacity themes -.SH SYNOPSIS -.B metacity-theme-viewer -[ -.I THEMENAME -] -.SH DESCRIPTION -.\" Putting a newline after each sentence can generate better output. -.B metacity-theme-viewer -allows you to preview any installed Metacity theme. -.PP -When designing a new Metacity theme, you can use -.B metacity-theme-viewer -to measure the performance of a window frame option, and to preview -the option. -.SH OPTIONS -.TP -.I THEMENAME -Name of the theme to be shown (\fIAtlanta\fR by default). -It is case-sensitive. -.SH FILES -.br -.nf -.TP -.I /usr/share/themes -system themes directory -.TP -.I /usr/share/themes/*/metacity-1/metacity-theme-1.xml -theme specification file -.SH AUTHOR -This manual page was written by Jose M. Moya , for -the Debian GNU/Linux system (but may be used by others). -.SH "SEE ALSO" -.\" Always quote multiple words for .SH -.BR metacity (1), -.BR metacity-window-demo (1). diff -Nru metacity-3.17.2/debian/metacity-window-demo.1 metacity-3.17.2/debian/metacity-window-demo.1 --- metacity-3.17.2/debian/metacity-window-demo.1 2015-06-13 10:50:57.000000000 +0000 +++ metacity-3.17.2/debian/metacity-window-demo.1 1970-01-01 00:00:00.000000000 +0000 @@ -1,25 +0,0 @@ -.\" In .TH, FOO should be all caps, SECTION should be 1-8, maybe w/ subsection -.\" other parms are allowed: see man(7), man(1) -.\" -.\" Based on template provided by Tom Christiansen . -.\" -.TH METACITY-WINDOW-DEMO 1 "1 June 2004" -.SH NAME -metacity-window-demo \- demo of window features -.SH SYNOPSIS -.B metacity-window-demo -.SH DESCRIPTION -.\" Putting a newline after each sentence can generate better output. -This program demonstrates various kinds of windows that window -managers and window manager themes should handle. -.PP -Be sure to tear off the menu and toolbar, those are also a special -kind of window. -.SH AUTHOR -This manual page was written by Jose M. Moya , for -the Debian GNU/Linux system (but may be used by others). -.SH "SEE ALSO" -.\" Always quote multiple words for .SH -.BR x-window-manager (1), -.BR metacity (1), -.BR metacity-theme-viewer (1). diff -Nru metacity-3.17.2/debian/patches/fix_crash_on_destroying.diff metacity-3.17.2/debian/patches/fix_crash_on_destroying.diff --- metacity-3.17.2/debian/patches/fix_crash_on_destroying.diff 1970-01-01 00:00:00.000000000 +0000 +++ metacity-3.17.2/debian/patches/fix_crash_on_destroying.diff 2015-07-09 12:15:07.000000000 +0000 @@ -0,0 +1,88 @@ +Description: compositor: fix possible crash closing/destroying window +Author: Alberts Muktupāvels +Origin: https://bugzilla.gnome.org/show_bug.cgi?id=751833#c13 +Last-Update: 2015-07-08 + +--- a/src/compositor/compositor-private.h ++++ b/src/compositor/compositor-private.h +@@ -48,6 +48,9 @@ + MetaScreen *screen, + MetaWindow *window); + ++ void (*free_window) (MetaCompositor *compositor, ++ MetaWindow *window); ++ + void (*maximize_window) (MetaCompositor *compositor, + MetaWindow *window); + void (*unmaximize_window) (MetaCompositor *compositor, +--- a/src/compositor/compositor-xrender.c ++++ b/src/compositor/compositor-xrender.c +@@ -2799,23 +2799,38 @@ + #ifdef HAVE_COMPOSITE_EXTENSIONS + #endif + } ++#endif /* 0 */ + + static void + xrender_free_window (MetaCompositor *compositor, + MetaWindow *window) + { + #ifdef HAVE_COMPOSITE_EXTENSIONS +- /* FIXME: When an undecorated window is hidden this is called, +- but the window does not get readded if it is subsequentally shown again +- See http://bugzilla.gnome.org/show_bug.cgi?id=504876 +- +- I don't *think* theres any need for this call anyway, leaving it out +- does not seem to cause any side effects so far, but I should check with +- someone who understands more. */ +- /* destroy_win (compositor->display, window->xwindow, FALSE); */ ++ MetaCompositorXRender *xrc; ++ MetaFrame *frame; ++ Window xwindow; ++ ++ xrc = (MetaCompositorXRender *) compositor; ++ frame = meta_window_get_frame (window); ++ xwindow = None; ++ ++ if (frame) ++ { ++ xwindow = meta_frame_get_xwindow (frame); ++ } ++ else ++ { ++ /* FIXME: When an undecorated window is hidden this is called, but the ++ * window does not get readded if it is subsequentally shown again. See: ++ * http://bugzilla.gnome.org/show_bug.cgi?id=504876 ++ */ ++ /* xwindow = meta_window_get_xwindow (window); */ ++ } ++ ++ if (xwindow != None) ++ destroy_win (xrc->display, xwindow, FALSE); + #endif + } +-#endif /* 0 */ + + static void + xrender_process_event (MetaCompositor *compositor, +@@ -3095,6 +3110,7 @@ + xrender_process_event, + xrender_get_window_pixmap, + xrender_set_active_window, ++ xrender_free_window, + xrender_maximize_window, + xrender_unmaximize_window, + }; +--- a/src/compositor/compositor.c ++++ b/src/compositor/compositor.c +@@ -154,6 +154,10 @@ + void meta_compositor_free_window (MetaCompositor *compositor, + MetaWindow *window) + { ++#ifdef HAVE_COMPOSITE_EXTENSIONS ++ if (compositor && compositor->free_window) ++ compositor->free_window (compositor, window); ++#endif + } + + void diff -Nru metacity-3.17.2/debian/patches/series metacity-3.17.2/debian/patches/series --- metacity-3.17.2/debian/patches/series 2015-06-13 10:50:57.000000000 +0000 +++ metacity-3.17.2/debian/patches/series 2015-07-09 12:15:07.000000000 +0000 @@ -1 +1,2 @@ check_display.diff +fix_crash_on_destroying.diff diff -Nru metacity-3.17.2/debian/README.Debian metacity-3.17.2/debian/README.Debian --- metacity-3.17.2/debian/README.Debian 2015-06-13 10:50:57.000000000 +0000 +++ metacity-3.17.2/debian/README.Debian 2015-07-09 12:15:07.000000000 +0000 @@ -7,14 +7,10 @@ the window switcher dialog. Contrary to Compiz, the Metacity compositor uses the XRender extension -to draw to the screen. This means that no 3D acceleration is -needed. This should in theory make it suitable to run on a larger selection of +to draw to the screen. This means that no 3D acceleration is needed. +This should in theory make it suitable to run on a larger selection of hardware, but only if your video driver implements sufficient Render performance. -The compositor can be enabled on the fly by setting the gconf key -/apps/metacity/general/compositing_manager to true by using -gconf-editor or gconftool-2. - -Before enabling the compositor, you need to make sure your X server -configuration has the composite extension loaded and enabled. +The compositor is enabled by default, and can be disabled by running +“gsettings set org.gnome.metacity compositing-manager false” command.