From: Jeremy Bicha Date: Sat, 21 Oct 2017 23:47:22 +0000 (+0100) Subject: mutter (3.26.1-6) unstable; urgency=high X-Git-Tag: archive/raspbian/3.28.1-1+rpi1~2^2^2^2^2~19 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=31b075a26d1aca275fef68aa5ba59384b49f1488;p=mutter.git mutter (3.26.1-6) unstable; urgency=high * debian/control.in: Bump libegl1-mesa-dev to (>= 17) (Closes: #878702) * Cherry-pick more fixes from gnome-3-26 branch to fix crashes and fix unredirecting full-screen windows: - 0012-x11-window-Don-t-manage-InputOnly-windows.patch - 0013-compositor-Ignore-offscreen-windows.patch (LP: #1725821) - 0015-monitor-normal-Prefer-modes-with-same-flags.patch - 0016-monitor-unit-tests-Check-non-first-preferred-modes.patch (LP: #1725153) - 0017-compositor-Avoid-a-crash-if-top-window-finalized.patch - 0018-Revert-ClutterActor-Optimize-away-idempotent-scale.patch - 0019-Revert-tests-Fix-actor-anchors-test.patch (Closes: #788140) * Set urgency to high to not further delay the gjs/mutter transition [dgit import unpatched mutter 3.26.1-6] --- 31b075a26d1aca275fef68aa5ba59384b49f1488 diff --cc debian/README.Debian index 0000000,0000000..169b50e new file mode 100644 --- /dev/null +++ b/debian/README.Debian @@@ -1,0 -1,0 +1,17 @@@ ++Mutter Compositor ++=================== ++ ++Mutter includes a compositor based on Clutter. Mutter by default adds ++very simple effects using the compositor, such as a drop-shadow. The ++compositor may be used by plugins to add more effects. GNOME Shell is ++an example of one such plugin. ++ ++The compositor can be enabled on the fly by setting the gconf key ++/apps/mutter/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, as well as DRI loaded and ++enabled. ++ ++ -- Gustavo Noronha Silva , Sun, 26 Jul 2009 13:14:57 +0200 diff --cc debian/changelog index 0000000,0000000..5cb37e9 new file mode 100644 --- /dev/null +++ b/debian/changelog @@@ -1,0 -1,0 +1,2325 @@@ ++mutter (3.26.1-6) unstable; urgency=high ++ ++ * debian/control.in: Bump libegl1-mesa-dev to (>= 17) (Closes: #878702) ++ * Cherry-pick more fixes from gnome-3-26 branch to fix crashes ++ and fix unredirecting full-screen windows: ++ - 0012-x11-window-Don-t-manage-InputOnly-windows.patch ++ - 0013-compositor-Ignore-offscreen-windows.patch ++ (LP: #1725821) ++ - 0015-monitor-normal-Prefer-modes-with-same-flags.patch ++ - 0016-monitor-unit-tests-Check-non-first-preferred-modes.patch ++ (LP: #1725153) ++ - 0017-compositor-Avoid-a-crash-if-top-window-finalized.patch ++ - 0018-Revert-ClutterActor-Optimize-away-idempotent-scale.patch ++ - 0019-Revert-tests-Fix-actor-anchors-test.patch ++ (Closes: #788140) ++ * Set urgency to high to not further delay the gjs/mutter transition ++ ++ -- Jeremy Bicha Sat, 21 Oct 2017 19:47:22 -0400 ++ ++mutter (3.26.1-5) unstable; urgency=medium ++ ++ * Add 0012-Use-a-single-supported-scales.patch: ++ - Allow HiDPI scaling even when non-HiDPI displays are connected ++ (LP: #1724024) ++ ++ -- Jeremy Bicha Mon, 16 Oct 2017 20:17:15 -0400 ++ ++mutter (3.26.1-4) unstable; urgency=medium ++ ++ * Release to unstable ++ ++ -- Jeremy Bicha Fri, 13 Oct 2017 16:24:12 -0400 ++ ++mutter (3.26.1-3) experimental; urgency=medium ++ ++ * Cherry-pick more fixes from gnome-3-26 branch (LP: #1722811): ++ - 0001-wayland-dma-buf-Don-t-send-modifiers-to-old-clients.patch ++ - 0007-settings-Get-UI-scaling-factor-from-primary-logical-.patch ++ - 0008-backends-add-monitors-updated-internal-signal-to-onl.patch ++ - 0009-monitor-manager-use-g_return_val_if_fail-if-trying-t.patch ++ - 0010-backend-move-the-cursor-render-update-on-screen-chan.patch ++ - 0011-workspace-ensure-that-workarea-data-is-valid-when-fe.patch ++ ++ -- Jeremy Bicha Fri, 13 Oct 2017 09:44:26 -0400 ++ ++mutter (3.26.1-2) experimental; urgency=medium ++ ++ * Add git_fix_xorg_maximize_crash.patch: ++ - Cherry-pick fix for crash when closing windows on Budgie or ++ GNOME Shell (LP: #1722510) ++ ++ -- Jeremy Bicha Tue, 10 Oct 2017 10:22:41 -0400 ++ ++mutter (3.26.1-1) experimental; urgency=medium ++ ++ * New upstream release ++ * Bump Standards-Version to 4.1.1 ++ ++ -- Jeremy Bicha Wed, 04 Oct 2017 17:42:30 -0400 ++ ++mutter (3.26.0+20170925~ea214fb-1) experimental; urgency=medium ++ ++ * New upstream git snapshot (LP: #1717272) ++ ++ -- Jeremy Bicha Mon, 25 Sep 2017 18:26:10 -0400 ++ ++mutter (3.26.0-2) experimental; urgency=medium ++ ++ * debian/patches/src-core-screen.c-Set-_NET_NUMBER_OF_DESKTOPS-in-met.patch: ++ Cherry-pick from upstream. Fix positioning of desktop icons at startup. ++ (LP: #1696621) ++ ++ -- Iain Lane Fri, 22 Sep 2017 19:13:26 +0100 ++ ++mutter (3.26.0-1) experimental; urgency=medium ++ ++ * Team upload ++ * debian/watch: Only watch stable branch again ++ * New upstream release, functionally identical to the previous ++ snapshot ++ ++ -- Simon McVittie Wed, 13 Sep 2017 09:22:55 +0100 ++ ++mutter (3.25.92+20170911~5b5737f-1) experimental; urgency=medium ++ ++ * Team upload ++ * New upstream git snapshot (really fixes LP: #1714330, we hope) ++ * debian/watch: Scan for all versions, not just the stable-branch ++ * debian/control.in: Add versioned Breaks for gnome-control-center, ++ and bump Suggests to match, to account for functionality that moved ++ between packages (Closes: #874514) ++ ++ -- Simon McVittie Tue, 12 Sep 2017 10:39:01 +0100 ++ ++mutter (3.25.91+20170902~ce515c5-1) experimental; urgency=medium ++ ++ * New upstream git snapshot (LP: #1714330) ++ * Drop git_fix-wayland-color-inversion.patch: Applied ++ * debian/control.in: ++ - Bump minimum libgudev-dev to >= 232 ++ - Drop Build-Depends on libgl1-mesa-dri ++ * debian/rules: ++ - Ignore test failures on Debian. See bug 874077. ++ ++ -- Jeremy Bicha Sat, 02 Sep 2017 15:46:15 -0400 ++ ++mutter (3.25.91-2) experimental; urgency=medium ++ ++ * Build-Depend on libgl1-mesa-dri for build tests since ++ Debian's mesa packages currently only recommends it ++ ++ -- Jeremy Bicha Thu, 31 Aug 2017 12:47:34 -0400 ++ ++mutter (3.25.91-1) experimental; urgency=medium ++ ++ * New upstream release ++ * Add skip-failing-tests-325.patch: ++ - Skip one more test that started failing with 3.25 ++ * Add git_fix-wayland-color-inversion.patch: ++ - Cherry-pick patch to fix wrong colors in clutter apps on Wayland ++ (LP: #1712986) ++ * Bump Standards-Version to 4.1.0 ++ ++ -- Jeremy Bicha Thu, 31 Aug 2017 07:11:39 -0400 ++ ++mutter (3.25.90-1) experimental; urgency=medium ++ ++ [ Jeremy Bicha ] ++ * New upstream release (LP: #1662805) ++ * libmutter0 has been renamed upstream to libmutter-0-0 ++ * Rename gir1.2-mutter-3.0 to gir1.2-mutter-0 ++ * Rename libmutter-dev to libmutter-0-dev ++ * debian/control.in: ++ - Drop obsolete Conflicts/Replaces now that the library ++ uses different file names ++ - Loosen dependency on -common package ++ - Don't recommend gnome-session | x-session-manager (LP: #1703685) ++ - Build-depend on xauth and xfvb for build tests ++ - Add Conflicts: libmutter-0-dev to libmutter-1-dev since ++ both ship the same development header file names ++ * debian/rules: ++ - Build with --enable-egl-device (LP: #1666664) ++ This enables experimental support for using NVIDIA proprietary ++ drivers with GNOME on Wayland ++ - Run build tests but don't make them fatal yet ++ * Add skip-failing-tests.patch: ++ - Don't run a few tests that have been reported as failing ++ ++ [ Simon McVittie ] ++ * Add patch metadata ++ * Correctly label debian/patches/git_revert_call_threaded_swap.patch ++ as a revert, not as the change that is being reverted ++ ++ [ Andreas Henriksson ] ++ * New upstream beta release, 3.25.90. ++ * Bump versions of build-dependencies according to configure.ac changes. ++ * Rename packages according to libmutter bumping soname, 0->1. ++ ++ [ Jeremy Bicha ] ++ * Drop git_revert_call_threaded_swap.patch, no longer needed ++ ++ -- Andreas Henriksson Tue, 15 Aug 2017 15:45:47 +0200 ++ ++mutter (3.22.4-2) unstable; urgency=medium ++ ++ [ Jeremy Bicha ] ++ * Add missing depends on gnome-settings-daemon (LP: #1561706) ++ ++ [ Laurent Bigonville ] ++ * debian/patches/bgo782472_fix_copypaste_x11_wayland.patch: Fix copy/paste ++ between some X11 applications (firefox/chromium) and wayland (Closes: ++ #865788) ++ * debian/control.in: Bump Standards-Version to 4.0.0 (no further changes) ++ ++ -- Laurent Bigonville Fri, 30 Jun 2017 19:08:41 +0200 ++ ++mutter (3.22.4-1) unstable; urgency=medium ++ ++ * New upstream release. ++ * Drop patches which have been merged upstream. ++ ++ -- Michael Biebl Tue, 11 Apr 2017 15:56:47 +0200 ++ ++mutter (3.22.3-2) unstable; urgency=medium ++ ++ * debian/patches/clutter-clone-Unset-source-when-source-actor-is-dest.patch ++ - Add patch from 3.22 branch to fix a gnome-shell crash when using the ++ alternatetab extension. (Closes: #857290) ++ ++ -- Michael Biebl Fri, 10 Mar 2017 18:06:30 +0100 ++ ++mutter (3.22.3-1) unstable; urgency=medium ++ ++ * New upstream release. ++ * Drop patches which have been merged upstream. ++ ++ -- Michael Biebl Fri, 17 Feb 2017 18:17:07 +0100 ++ ++mutter (3.22.2-3) unstable; urgency=medium ++ ++ [ Jeremy Bicha ] ++ * Add git_flush_all_swap_notifies_on_idle.patch: ++ - Add patch from 3.22 branch that fixes freezes with multiple monitors ++ on Wayland ++ ++ [ Andreas Henriksson ] ++ * Add debian/patches/bgo768531_workaround-startup-notifications.patch ++ - temporary workaround used in both Fedora and Arch for getting ++ working application startup notifications under Wayland. ++ - See bgo#768531 for when a real solution is ready to replace this. ++ ++ -- Andreas Henriksson Sun, 08 Jan 2017 03:12:13 +0100 ++ ++mutter (3.22.2-2) unstable; urgency=critical ++ ++ [ Raphaël Hertzog ] ++ * Team upload. ++ * Urgency critical as gnome-shell is entirely broken in testing ++ for many users. ++ ++ [ Jeremy Bicha ] ++ * Add git_dont_set_unavailable_scroll_methods.patch: ++ - Add patch from 3.22 branch that prevented logging into GNOME on X ++ for some users (LP: #1643370, Closes: #846898) ++ ++ -- Raphaël Hertzog Tue, 06 Dec 2016 17:35:40 +0100 ++ ++mutter (3.22.2-1) unstable; urgency=medium ++ ++ * New upstream release. ++ * Drop patches, all merged upstream. ++ ++ -- Michael Biebl Thu, 10 Nov 2016 19:17:32 +0100 ++ ++mutter (3.22.1-2) unstable; urgency=medium ++ ++ * d/p/wayland-xdg-popup-Always-use-monitor-of-toplevel.patch ++ d/p/wayland-xdg-shell-Scale-configure-relative-popup-coo.patch ++ d/p/wayland-xdg-popup-Force-monitor-of-the-top-level.patch ++ d/p/wayland-xdg-shell-update-popup-window-monitor-early.patch ++ d/p/wayland-xdg-shell-Scale-positioner-coordinates.patch: ++ - Added. Fix positioning of popups on hidpi screens in ++ wayland (bgo#771841) ++ ++ -- Sjoerd Simons Fri, 14 Oct 2016 22:01:14 +0200 ++ ++mutter (3.22.1-1) unstable; urgency=medium ++ ++ * New upstream release. ++ * Drop debian/patches/01_Wcast-align.patch. It's not necessary anymore as we ++ don't enable -Werror. ++ * Add Build-Depends on libxcb-res0-dev as per configure.ac. ++ ++ -- Michael Biebl Tue, 11 Oct 2016 13:55:44 +0200 ++ ++mutter (3.22.0-1) unstable; urgency=medium ++ ++ [ Jeremy Bicha ] ++ * debian/control.in: ++ - Explicitly build-depend on libegl1-mesa-dev (Closes: #836153) ++ ++ [ Michael Biebl ] ++ * New upstream release. ++ - Correctly handle tablet settings lookups with no backing libwacom info. ++ (Closes: #838050) ++ * Use non-multiarch path (/usr/lib/mutter) for libexecdir. ++ ++ -- Michael Biebl Tue, 20 Sep 2016 01:43:37 +0200 ++ ++mutter (3.21.92-1) unstable; urgency=medium ++ ++ [ Jeremy Bicha ] ++ * debian/rules: ++ - Explicitly disable kms and wayland to fix build on kfreebsd ++ * Add fix-undef-build-failure.patch: ++ - Git patch needed for build without wayland ++ ++ [ Michael Biebl ] ++ * New upstream development release. ++ * Refresh debian/patches/01_Wcast-align.patch. ++ * Bump debhelper compat level to 10. ++ ++ -- Michael Biebl Tue, 13 Sep 2016 17:43:54 +0200 ++ ++mutter (3.21.91-2) unstable; urgency=medium ++ ++ * Bump Build-Depends on libgnome-desktop-3-dev to (>= 3.21.2). ++ This ensures we have a matching version of libgnome-desktop which supports ++ mode flags via the D-Bus API. ++ ++ -- Michael Biebl Fri, 02 Sep 2016 12:03:57 +0200 ++ ++mutter (3.21.91-1) unstable; urgency=low ++ ++ * New upstream beta release. ++ * Update build-dependencies according to configure.ac changes: ++ - bump wayland-protocols to >= 1.7 ++ * Drop debian/patches/Fix-build-of-clutter-tests.patch, merged upstream. ++ ++ -- Andreas Henriksson Tue, 30 Aug 2016 19:30:43 +0200 ++ ++mutter (3.21.90-1) experimental; urgency=medium ++ ++ * New upstream beta release. ++ * Update (build-)dependencies according to configure.ac changes: ++ - drop intltool (>= 0.41), now gettext is used instead. ++ - add libwacom-dev (>= 0.13) [linux-any] ++ - bump wayland-protocols to >= 1.5 ++ - bump gsettings-desktop-schemas to >= 3.21.4 ++ - bump libinput-dev to >= 1.4 ++ * Drop debian/patches/clutter-Fix-typo-in-assert.patch ++ - now included in upstream release. ++ ++ -- Andreas Henriksson Sat, 20 Aug 2016 17:46:46 +0200 ++ ++mutter (3.21.4-1) experimental; urgency=medium ++ ++ [ Sjoerd Simons ] ++ * New upstream release ++ * debian/patches/fix-gint64-format.patch ++ debian/patches/wayland-add-extended-state-for-tiled.patch: ++ - Dropped fixed upstream ++ * debian/patches/Fix-build-of-clutter-tests.patch ++ - Added, fix build of test (bgo#769636) ++ * debian/patches/clutter-Fix-typo-in-assert.patch ++ - Added, fix build. From upstream git ++ * debian/control.in: Bump libmutter0 to libmutter0i ++ * debian/control.in: Update build-dependencies ++ * debian/*.install: Install private helper libraries. ++ ++ [ Andreas Henriksson ] ++ * libmutter-dev: depend on packages required by mutter-clutter-1.0.pc ++ - libcairo2-dev, libglib2.0-dev, libatk1.0-dev, libpango1.0-dev, ++ libjson-glib-dev, libegl1-mesa-dev, libwayland-dev, libdrm-dev, ++ libgbm-dev, libinput-dev, libudev-dev, libx11-dev, libxext-dev, ++ libxdamage-dev, libxcomposite-dev, libxi-dev ++ * libmutter-dev: depend on additional packages required by mutter-cogl-1.0.pc ++ - libgdk-pixbuf2.0-dev, libxfixes-dev, libxrandr-dev ++ ++ -- Andreas Henriksson Fri, 12 Aug 2016 15:53:15 +0200 ++ ++mutter (3.20.3-2) unstable; urgency=medium ++ ++ [ Simon McVittie ] ++ * d/p/fix-gint64-format.patch: Add patch from Luca Bruno fixing a format ++ string on ILP32 architectures ++ * d/rules: add a missing backslash so we build with the intended ++ configure options, and in particular not -Werror (Closes: #829140) ++ ++ [ Jeremy Bicha ] ++ * Replace old mutter libraries too instead of only conflicting with them ++ ++ -- Michael Biebl Fri, 01 Jul 2016 10:18:59 +0200 ++ ++mutter (3.20.3-1) unstable; urgency=medium ++ ++ * New upstream release. ++ * Drop all patches which are now applied upstream. ++ * Convert to multiarch. ++ * Convert from cdbs to dh. ++ ++ -- Michael Biebl Thu, 30 Jun 2016 20:11:34 +0200 ++ ++mutter (3.20.2-2) unstable; urgency=medium ++ ++ * Team upload ++ ++ [ Jeremy Bicha ] ++ * Use https for copyright headers ++ * Use https in d/watch and use new "special strings" to help standardize ++ format ++ ++ [ Simon McVittie ] ++ * Add all patches from upstream gnome-3-20 branch up to 2016-06-23 ++ - fix possible crashes in Wayland and in X11 ++ - ensure that Wayland output reconfiguration finishes correctly ++ - implement "force quit" in Wayland using kill(), like in X11 ++ - improve UTF-8 correctness ++ - update translations ++ - ensure that all window frames are drawn similarly ++ - avoid redrawing the entire window every frame ++ - make windows that are unmaximized via drag follow the cursor ++ * Backport patch from upstream to introduce XDG_SURFACE_STATE_GNOME_TILED ++ and mark tiled windows with it, allowing GDK versions with a ++ corresponding patch to report GDK_WINDOW_STATE_TILED correctly under ++ Wayland ++ ++ -- Simon McVittie Sat, 25 Jun 2016 00:19:53 +0100 ++ ++mutter (3.20.2-1) unstable; urgency=medium ++ ++ * New upstream release. ++ * Bump Standards-Version to 3.9.8. ++ ++ -- Michael Biebl Wed, 11 May 2016 13:48:17 +0200 ++ ++mutter (3.20.1-1) unstable; urgency=medium ++ ++ * New upstream release. ++ * Refresh patches. ++ * Bump mutter's dependency on gsettings-desktop-schemas to (>= 3.19.3). ++ * Upload to unstable. ++ ++ -- Michael Biebl Sun, 17 Apr 2016 00:06:56 +0200 ++ ++mutter (3.20.0-1) experimental; urgency=medium ++ ++ * New upstream release. ++ ++ -- Andreas Henriksson Fri, 25 Mar 2016 10:12:11 +0100 ++ ++mutter (3.19.92-2) experimental; urgency=medium ++ ++ * Rename libmutter0g -> libmutter0h ++ - update dependencies and conflicts as well. ++ ++ -- Andreas Henriksson Fri, 18 Mar 2016 19:15:59 +0100 ++ ++mutter (3.19.92-1) experimental; urgency=medium ++ ++ * New upstream release. ++ * Update build-dependencies according to configure.ac changes: ++ - Bump libgtk-3-dev (>= 3.19.8) ++ - Bump gsettings-desktop-schemas-dev (>= 3.19.3) ++ - Bump libclutter-1.0-dev (>= 1.25.6) ++ - Add wayland-protocols (>= 1.1) [linux-any] ++ * 02_Handle-meta_screen_get_monitor_for_point-returning-N.patch: ++ - dropped, merged upstream. ++ ++ -- Andreas Henriksson Thu, 17 Mar 2016 11:02:08 +0100 ++ ++mutter (3.18.3-2) unstable; urgency=medium ++ ++ * Drop mutter-dbg now that we have automatic dbgsym packages. ++ * Ensure proper upgrade from mutter-dbg to new dbgsym packages by using ++ dh_strip --dbgsym-migration. Bump Build-Depends on debhelper accordingly. ++ * Fix dh_makeshlibs args for libmutter0g. ++ * Bump Standards-Version to 3.9.7. ++ * Drop obsolete migration code from pre-wheezy. ++ * Fix disappearing mouse cursor under GNOME Shell with a multi-monitor ++ setup. Patch cherry-picked from upstream Git. ++ ++ -- Michael Biebl Tue, 15 Mar 2016 07:53:24 +0100 ++ ++mutter (3.18.3-1) unstable; urgency=medium ++ ++ * New upstream release. ++ - fix crash when removing monitor/undocking (Closes: #813687) ++ ++ -- Andreas Henriksson Thu, 03 Mar 2016 18:48:49 +0100 ++ ++mutter (3.18.2-1) unstable; urgency=medium ++ ++ * New upstream release. ++ ++ -- Michael Biebl Fri, 13 Nov 2015 00:09:29 +0100 ++ ++mutter (3.18.1-1) unstable; urgency=medium ++ ++ * New upstream release. ++ * Refresh debian/patches/01_Wcast-align.patch. ++ * Wrap dependencies. ++ * Bump the dependency on gsettings-desktop-schemas to (>= 3.15.92). ++ * Drop the explicit versions from libmutter-dev dependencies. The ++ libmutter.pc file doesn't enforce any specific versions and they were ++ out-of-date anyway. ++ ++ -- Michael Biebl Wed, 21 Oct 2015 16:13:17 +0200 ++ ++mutter (3.18.0-1) unstable; urgency=medium ++ ++ [ Andreas Henriksson ] ++ * Fix typo in previous changelog entry. ++ * New upstream release. ++ * Drop debian/patches/git_launcher-fix-vt-switch.patch, ++ debian/patches/git_launcher-format-string.patch: ++ - now part of upstream release. ++ ++ -- Laurent Bigonville Sun, 11 Oct 2015 15:21:29 +0200 ++ ++mutter (3.17.92-1) experimental; urgency=medium ++ ++ [ Dmitry Shachnev ] ++ * Remove now useless dependency on gnome-themes-standard. ++ * Instead, bump libgtk-3-dev build-dependency to 3.14 to make sure mutter will ++ depend on a version of libgtk-3-common that contains the Adwaita theme. ++ ++ [ Andreas Henriksson ] ++ * New upstream release candidate ++ * Add two patches cherry-picked from upstream git: ++ - debian/patches/git_launcher-format-string.patch ++ "launcher: Don't pass variable as format string" ++ - debian/patches/git_launcher-fix-vt-switch.patch ++ "Revert "launcher: simplify getting session dbus proxy"" ++ ++ -- Andreas Henriksson Thu, 17 Sep 2015 13:42:48 +0200 ++ ++mutter (3.17.90-1) experimental; urgency=medium ++ ++ * New upstream beta release. ++ * Update build-dependecies according to configure.ac changes: ++ - bump libclutter-1.0-dev to >= 1.23.4 ++ * debian/libmutter-dev.install: ++ - stop shipping usr/share/gtk-doc, removed upstream. See commit 7dc0b0e6. ++ * Rename libmutter0f to libmutter0g ++ - including conflicting against libmutter0f ++ ++ -- Andreas Henriksson Sat, 29 Aug 2015 11:03:17 +0200 ++ ++mutter (3.16.3-1) unstable; urgency=medium ++ ++ * New upstream release. ++ * Refresh patches. ++ ++ -- Michael Biebl Thu, 02 Jul 2015 18:57:22 +0200 ++ ++mutter (3.16.2-3) unstable; urgency=medium ++ ++ * Cherry-pick upstream commit which fixes the issue that window resize ++ handles were not shown. ++ * Drop obsolete Breaks/Replaces from pre-wheezy. ++ ++ -- Michael Biebl Tue, 30 Jun 2015 19:42:14 +0200 ++ ++mutter (3.16.2-2) unstable; urgency=medium ++ ++ * Upload to unstable. ++ ++ -- Emilio Pozuelo Monfort Sun, 14 Jun 2015 13:44:02 +0200 ++ ++mutter (3.16.2-1) experimental; urgency=medium ++ ++ [ Sjoerd Simons ] ++ * New upstream release 3.16.1. ++ * debian/rules: Explicitely build wayland and the native backend on linux ++ * debian/control.in: Bump b-d ++ * debian/rules: Stop shipping doc/theme-format.txt, Metacity format support ++ has been dropped ++ * bump library name to libmutter0f ++ ++ [ Emilio Pozuelo Monfort ] ++ * New upstream release 3.16.2. ++ * Upload to experimental. ++ ++ -- Emilio Pozuelo Monfort Wed, 27 May 2015 19:55:29 +0200 ++ ++mutter (3.14.4-2) unstable; urgency=medium ++ ++ * Switch Build-Depends from the transitional libsystemd-login-dev to ++ libsystemd-dev. (Closes: #779761) ++ ++ -- Michael Biebl Tue, 28 Apr 2015 20:10:38 +0200 ++ ++mutter (3.14.4-1) unstable; urgency=medium ++ ++ * New upstream translation and bugfix release. ++ + Includes new function required for the workaround to #768896 which ++ is very annoying for users of the proprietary nvidia driver. ++ * 10_window-actor_unredirect.patch, 11_black_background.patch: ++ dropped, merged upstream. ++ * Bump shlibs due to new function. ++ ++ -- Josselin Mouette Thu, 26 Mar 2015 21:06:28 +0100 ++ ++mutter (3.14.2-1) unstable; urgency=medium ++ ++ * New upstream bugfix release. ++ * 10_window-actor_unredirect.patch: patch from upstream git. Fix crash ++ when closing a window. ++ * 11_black_background.patch: patch from upstream git. Don’t set a ++ black background when switching from the display manager. ++ ++ -- Josselin Mouette Sun, 30 Nov 2014 15:05:14 +0100 ++ ++mutter (3.14.1-2) unstable; urgency=medium ++ ++ * gir1.2-mutter-3.0: tighten dependency on libmutter0e by making ++ it versioned to = ${binary:Version} (Closes: #766359) ++ ++ -- Andreas Henriksson Tue, 28 Oct 2014 19:57:02 +0100 ++ ++mutter (3.14.1-1) unstable; urgency=medium ++ ++ * New upstream release. ++ * Refresh patches. ++ * Drop obsolete Conflicts/Replaces: gir1.2-mutter-2.91. ++ * Update Build-Depends as per configure.ac. ++ * Bump Standards-Version to 3.9.6. No further changes. ++ ++ -- Michael Biebl Thu, 16 Oct 2014 00:40:24 +0200 ++ ++mutter (3.14.0-1) unstable; urgency=medium ++ ++ [ Dmitry Shachnev ] ++ * Make gir1.2-mutter-3.0 break gnome-shell versions older than 3.13.92. ++ Upstream commit a4a688ed83983fb5 removed MetaBackgroundEffects class, ++ which old gnome-shell (up to 3.13.91) was using via JavaScript code. ++ ++ [ Andreas Henriksson ] ++ * Make the libinput-dev build-dependency linux-only. ++ Thanks to Julien Cristau for pointing it out. ++ * New upstream release. ++ ++ -- Andreas Henriksson Mon, 22 Sep 2014 21:02:55 +0200 ++ ++mutter (3.13.92-1) unstable; urgency=medium ++ ++ * New upstream release candidate. ++ ++ -- Andreas Henriksson Fri, 19 Sep 2014 20:43:41 +0200 ++ ++mutter (3.13.91-1) experimental; urgency=medium ++ ++ [ Andreas Henriksson ] ++ * New upstream development release. ++ * Update build-dependencies according to configure.ac changes: ++ - bump intltool to (>= 0.41) ++ - bump libclutter-1.0-dev to (>= 1.19.5) ++ - add libinput-dev ++ - bump libsystemd-login-dev to (>= 212) ++ - add libxcb-randr0-dev, libxkbcommon-x11-dev, libxkbfile-dev and ++ xkb-data ++ * Drop patches backported from upstream: ++ - 0001-constraints-Complete-fix-for-size-hints-constrainmen.patch ++ - 0001-constraints-Size-increments-need-to-be-applied-to-th.patch ++ - 0001-keybindings-Make-sure-not-to-call-meta_change_keygra.patch ++ * Bump gobject-introspection build-dependency to (>= 1.41.3) ++ - this one supports new "nullable" annotation. ++ * libmutter-dev: bump dependency on libclutter-1.0-dev to (>= 1.19.5) ++ * libmutter-dev: stop installing usr/lib/lib*.a, no need for static ++ and they aren't built anymore. ++ * Stop excluding mutter-launch from fixperms ++ - not needed anymore, mutter-launch is now gone (see logind). ++ * Bump libwayland-dev to >= 1.5.90 as required for wayland support. ++ ++ [ Rico Tzschichholz ] ++ * Update library name to libmutter0e since the API/ABI is not compatible ++ with 3.12.x releases ++ ++ [ Sjoerd Simons ] ++ * New upstream release 3.13.91. ++ * Update libxkbcommon-x11-dev versioned depend ++ ++ [ Andreas Henriksson ] ++ * mutter.install: ship usr/lib/mutter/mutter-restart-helper ++ ++ -- Andreas Henriksson Fri, 05 Sep 2014 14:15:05 -0700 ++ ++mutter (3.13.1-1) experimental; urgency=medium ++ ++ [ Laurent Bigonville ] ++ * debian/rules: Pass --as-needed to dh_autoreconf ++ ++ [ Andreas Henriksson ] ++ * New upstream development release. ++ * Drop debian/patches/prevent-double-lock-deadlock.patch ++ - obsoleted by upstream commit 5c99eae8a9ca04f5e ++ "display: clean up event handling" ++ * Update build-dependencies according to configure.ac changes: ++ - add libsystemd-login-dev (>= 207), libpam0g-dev ++ - drop libxrender-dev ++ * debian/mutter.install: drop usr/share/gnome ++ - see upstream commit 542a0886cf14cec3995ada2 ++ "Remove files no one cares about anymore" ++ * Add patches stolen from fedora originally backported from upstream git: ++ - 0001-constraints-Complete-fix-for-size-hints-constrainmen.patch ++ - 0001-constraints-Size-increments-need-to-be-applied-to-th.patch ++ - 0001-keybindings-Make-sure-not-to-call-meta_change_keygra.patch ++ * Bump gsettings-desktop-schemas (build-)dependencies to 3.13.1 ++ - need switch-to-workspace-last schema key ++ * Exclude mutter-launch from having permissions "fixed" ++ - mutter-launch needs to be suid ++ ++ -- Andreas Henriksson Sat, 02 Aug 2014 17:55:13 +0200 ++ ++mutter (3.12.2-2) unstable; urgency=medium ++ ++ * Upload to unstable. ++ ++ -- Andreas Henriksson Mon, 14 Jul 2014 23:20:08 +0200 ++ ++mutter (3.12.2-1) experimental; urgency=medium ++ ++ [ Sjoerd Simons ] ++ * debian/rules: Don't constrain the libmutter0 dependencies via shlibs ++ as we change the library names on ABI breaks now ++ ++ [ Andreas Henriksson ] ++ * New upstream release. ++ ++ -- Andreas Henriksson Fri, 16 May 2014 17:36:21 +0200 ++ ++mutter (3.12.1+therealdeal-1) experimental; urgency=medium ++ ++ * Tweak version to be bigger then the one in unstable ++ ++ -- Sjoerd Simons Sat, 26 Apr 2014 19:38:07 +0200 ++ ++mutter (3.12.1-1) unstable; urgency=medium ++ ++ * New upstream release ++ ++ -- Sjoerd Simons Sat, 26 Apr 2014 17:47:46 +0200 ++ ++mutter (3.12.0-2) experimental; urgency=low ++ ++ [ Rico Tzschichholz ] ++ * Update library name to libmutter0d since the API/ABI is not compatible ++ with 3.10.x releases ++ ++ [ Emilio Pozuelo Monfort ] ++ * Let libmutter0d conflict with libmutter0c. ++ ++ -- Emilio Pozuelo Monfort Thu, 03 Apr 2014 10:30:00 +0200 ++ ++mutter (3.12.0-1) experimental; urgency=low ++ ++ [ Sjoerd Simons ] ++ * debian/patches/prevent-double-lock-deadlock.patch: ++ + Added. Don't call X functions that lock the display in code paths that ++ have already locked the display if X threads have been initialized ++ (bgo#704101) ++ ++ [ Andreas Henriksson ] ++ * New upstream release. ++ * Update build-dependencies according to configure.ac changes: ++ - bump upower 0.99.0 ++ - bump cogl 1.17.1 ++ * Bump Standards-Version to 3.9.5 ++ ++ -- Andreas Henriksson Sat, 29 Mar 2014 22:09:55 +0100 ++ ++mutter (3.10.1-2) experimental; urgency=low ++ ++ * Force build against G3.10 version of gnome-desktop ++ ++ -- Sjoerd Simons Sun, 03 Nov 2013 11:19:44 +0100 ++ ++mutter (3.10.1-1) experimental; urgency=low ++ ++ * New upstream release ++ * Sync with Ubuntu (3.10.0-0ubuntu1~saucy1) ++ + Update library name to libmutter0c ++ + Bump build-depends ++ ++ -- Sjoerd Simons Fri, 01 Nov 2013 22:34:51 +0100 ++ ++mutter (3.8.4-2) unstable; urgency=low ++ ++ * Upload to unstable. ++ ++ -- Emilio Pozuelo Monfort Sun, 13 Oct 2013 17:26:39 +0200 ++ ++mutter (3.8.4-1) experimental; urgency=low ++ ++ [ Jeremy Bicha ] ++ * debian/control.in: ++ - Use standard Breaks/Replaces instead of Conflicts against older mutter ++ libraries ++ ++ [ Emilio Pozuelo Monfort ] ++ * debian/control.in: ++ + Standards-Version is 3.9.4, no changes needed. ++ * New upstream release. ++ ++ [ Michael Biebl ] ++ * debian/watch: Track stable releases. ++ * Bump debhelper compatibility level to 9. ++ ++ -- Michael Biebl Fri, 11 Oct 2013 19:37:56 +0200 ++ ++mutter (3.8.3-1) experimental; urgency=low ++ ++ * New upstream release. ++ * debian/control.in: ++ + Bump clutter requirement. ++ ++ -- Emilio Pozuelo Monfort Sat, 08 Jun 2013 18:09:14 +0200 ++ ++mutter (3.8.2-1) experimental; urgency=low ++ ++ * New upstream release. ++ ++ -- Emilio Pozuelo Monfort Fri, 24 May 2013 17:26:06 +0200 ++ ++mutter (3.8.1-1) experimental; urgency=low ++ ++ * New upstream release ++ * debian/patches/02-dont-select-for-XI2-events.patch: ++ + Dropped, fixed X server is available in sid now ++ ++ -- Sjoerd Simons Fri, 19 Apr 2013 18:57:59 +0200 ++ ++mutter (3.8.0-1) experimental; urgency=low ++ ++ * New upstream release. ++ ++ -- Emilio Pozuelo Monfort Wed, 27 Mar 2013 00:15:13 +0100 ++ ++mutter (3.7.92-1) experimental; urgency=low ++ ++ [ Sjoerd Simons ] ++ * New upstream release (3.7.90) ++ * Sync from Ubuntu ++ + d/p/04_ignore_shadow_and_padding.patch: ++ * Dropped, Ubuntu specific ++ * debian/control.in: Bump b-d on glib ++ * debian/control.in: Rename libmutter0a to libmutter0b for more ABI fun ++ * d/p/10_Always-send-_NET_WM_FRAME_DRAWN-for-newly-created-wi.patch: ++ + Added. Fix a race causing _NET_WM_FRAME_DRAWN to not be sent in context ++ menus. (From upstream git, BGO#694771) ++ ++ [ Emilio Pozuelo Monfort ] ++ * New upstream release. ++ + debian/control.in: ++ - Add gtk-doc-tools to build-depends. ++ + debian/libmutter-dev.install: ++ - Ship the API reference. ++ + d/p/10_Always-send-_NET_WM_FRAME_DRAWN-for-newly-created-wi.patch: ++ - Removed, included upstream. ++ + debian/patches/02-dont-select-for-XI2-events.patch: ++ - New patch, revert an upstream change to receive XI2 events ++ until #696272 is fixed. Thanks to Sjoerd Simons and ++ Frédéric Péters for the info and the patch. ++ + debian/copyright: ++ - Updated. ++ ++ -- Emilio Pozuelo Monfort Wed, 20 Mar 2013 18:12:12 +0100 ++ ++mutter (3.7.5-0ubuntu1~raring1) raring; urgency=medium ++ ++ [ Jeremy Bicha ] ++ * New upstream release. ++ * debian/control.in: ++ - Bump minimum clutter & gsettings-desktop-schemas ++ ++ [ Rico Tzschichholz ] ++ * debian/control.in: ++ - Build-depend on libxi-dev ++ * debian/patches/01_Wcast-align.patch: Refreshed ++ * debian/patches/05_ignore_num_workspaces.patch: ++ - Dropped, applied in new version ++ ++ -- Jeremy Bicha Tue, 05 Feb 2013 20:58:05 -0500 ++ ++mutter (3.6.2-0ubuntu1) raring; urgency=low ++ ++ * New upstream release (LP: #1078155) ++ ++ -- Jeremy Bicha Mon, 12 Nov 2012 22:09:47 -0500 ++ ++mutter (3.6.1-1ubuntu2) raring; urgency=low ++ ++ * Added 05_ignore_num_workspaces.patch (LP: #1067933) ++ ++ -- Brandon Snider Wed, 17 Oct 2012 20:23:11 -0400 ++ ++mutter (3.6.1-1ubuntu1) raring; urgency=low ++ ++ * Sync with Debian. Remaining change: ++ - 04_ignore_shadow_and_padding.patch: Silently ignore ++ padding and shadow tags ++ ++ -- Jeremy Bicha Thu, 08 Nov 2012 08:37:27 -0500 ++ ++mutter (3.6.1-1) experimental; urgency=low ++ ++ * New upstream release ++ ++ -- Sjoerd Simons Wed, 17 Oct 2012 19:58:10 +0200 ++ ++mutter (3.6.0-1) experimental; urgency=low ++ ++ * New upstream release ++ * Sync with Ubuntu: ++ - Drop unnecessary gnome-doc-utils install ++ * d/p/00_meta_window_move_frame-fix-crash-when-frame-is-NULL.patch: ++ Dropped: fixed upstream ++ * debian/control.in: Rename libmutter0 to libmutter0a as the libmutter ABI ++ broke ++ ++ -- Sjoerd Simons Sun, 14 Oct 2012 19:24:21 +0200 ++ ++mutter (3.4.1-7) unstable; urgency=low ++ ++ * d/p/0001-meta-texture-rectangle-Use-Cogl-s-API-to-create-a-re.patch: ++ + Patch from upstream git, don't use GL types as cogl doesn't expose ++ GL headers in newer releases. This will ease the cogl transition. ++ ++ -- Emilio Pozuelo Monfort Sun, 26 May 2013 17:54:55 +0200 ++ ++mutter (3.4.1-6) unstable; urgency=low ++ ++ * Team upload ++ * Add debian/patches/02_switch_to_gtk-doc_syntax.patch: ++ - from upstream, fixes FTBFS with new gobject-introspection. ++ ++ -- Andreas Henriksson Mon, 13 May 2013 11:03:34 +0200 ++ ++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 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 ++ on upgrades. Closes: #675309 ++ ++ -- Michael Biebl Fri, 01 Jun 2012 12:49:07 +0200 ++ ++mutter (3.4.1-3) unstable; urgency=low ++ ++ [ Michael Biebl ] ++ * Upload to unstable. ++ ++ [ Rico Tzschichholz ] ++ * libmutter-dev: add dependency on gsettings-desktop-schemas-dev and ++ libx11-dev as pc-file requests ++ ++ [ Michael Biebl ] ++ * Bump Suggests: gnome-control-center to (>= 1:3.4.0) as we want a recent ++ enough version which can handle keybindings based on GSettings. ++ * Use strict dependency between mutter/libmutter0 and mutter-common to ++ ensure we have the correct version of mutter-common providing the ++ org.gnome.mutter gsettings schema. ++ * Add Depends on gnome-themes-standard to mutter. Adwaita is the preferred ++ window manager theme and without a theme installed mutter refuses to ++ start. Closes: #658823 ++ ++ -- Michael Biebl Wed, 30 May 2012 12:25:26 +0200 ++ ++mutter (3.4.1-2) experimental; urgency=low ++ ++ * Drop debian/mutter-common.catalog and debian/mutter-common.sgmlcatalogs. ++ This is another leftover from the metacity package, mutter doesn't ship ++ any DTD. ++ * Replace another occurence of libgnome2-common with ++ gsettings-desktop-schemas. ++ ++ -- Michael Biebl Mon, 14 May 2012 19:11:48 +0200 ++ ++mutter (3.4.1-1) experimental; urgency=low ++ ++ [ Michael Biebl ] ++ * New upstream release. ++ ++ [ Rico Tzschichholz ] ++ * debian/control.in: ++ - Bump minimum GTK, cogl, clutter & gsettings-desktop-schemas ++ - Add mutter-dbg package ++ * debian/mutter-common.install: ++ - Install gsettings schemas ++ * debian/rules: Enable compile warnings ++ ++ [ Jeremy Bicha ] ++ * debian/control.in: ++ - Drop gconf dependency ++ ++ [ Michael Biebl ] ++ * Bump Standards-Version to 3.9.3. ++ * Update Vcs-* URLs. ++ * Drop Suggests: gnome-themes. This is a remnant of the old metacity ++ package this work is based on. ++ * Refresh debian/patches/01_Wcast-align.patch. ++ ++ -- Michael Biebl Fri, 04 May 2012 21:48:47 +0200 ++ ++mutter (3.2.2-3) unstable; urgency=low ++ ++ * Upload to unstable. ++ ++ -- Michael Biebl Wed, 02 May 2012 00:10:17 +0200 ++ ++mutter (3.2.2-2) experimental; urgency=low ++ ++ * d/p/02_Fix-cogl-crash-from-updating-non-existent-texture.patch: ++ + Added. In 1.8 cogl would prevent attempts to update textures with ++ an invalid handle from crashing buggy programs. Cogl 1.10 no longer does ++ so. This patch prevents mutter from updating invalid textures ++ * d/p/03_fix_compilation_with_new_cogl.patch ++ + Added. Adapt to changes made in the experimental patch of the cogl API ++ ++ -- Sjoerd Simons Sun, 01 Apr 2012 16:32:27 +0200 ++ ++mutter (3.2.2-1) unstable; urgency=low ++ ++ [ Michael Biebl ] ++ * Change section of gir1.2-mutter-3.0 to introspection. ++ ++ [ Josselin Mouette ] ++ * Update repository URL. ++ ++ [ Michael Biebl ] ++ * New upstream release. ++ * debian/watch: Track stable releases. ++ ++ -- Michael Biebl Tue, 24 Jan 2012 07:49:20 +0100 ++ ++mutter (3.2.1-2) unstable; urgency=low ++ ++ [ Laurent Bigonville ] ++ * debian/watch: ++ - Fix URL regex to correctly detect latest tarballs ++ - Switch to .xz tarballs ++ ++ [ Michael Biebl ] ++ * Upload to unstable. ++ * Refresh debian/patches/01_Wcast-align.patch. ++ * debian/control.in: ++ - Add explicit Build-Depends on libcairo2-dev. ++ - Bump Build-Depends on libglib2.0-dev. ++ ++ -- Michael Biebl Sat, 19 Nov 2011 01:21:32 +0100 ++ ++mutter (3.2.1-1) experimental; urgency=low ++ ++ [ Jean Schurger ] ++ * New upstream version ++ * debian/control.in ++ - Updated clutter dependency ++ * debian/libmutter0.symbols ++ - Updated ++ ++ [ Josselin Mouette ] ++ * Tighten shlibs to the major GNOME version, libcamel-style. ++ * libmutter0.symbols: dropped, upstream ABI stability guarantees are ++ not sufficient. ++ ++ [ Sjoerd Simons ] ++ * New upstream release (3.2.1) ++ ++ -- Sjoerd Simons Fri, 28 Oct 2011 20:19:30 +0200 ++ ++mutter (3.0.2.1-4) unstable; urgency=high ++ ++ * Team upload. Urgency high as that problem already affects testing ++ users. ++ * debian/patches: ++ - Add 00git-dont-lose-application-redraws.patch to fix rendering ++ issues with parts of the screen not showing the latest content. ++ ++ -- Raphaël Hertzog Mon, 17 Oct 2011 08:37:50 +0200 ++ ++mutter (3.0.2.1-3) unstable; urgency=low ++ ++ [ Rico Tzschichholz ] ++ * debian/patches: ++ - Add 00git-meta-window-group-Use-clutter_stage_get_redraw_clip_.patch, ++ 00git-Use-a-utility-function-to-create-GL_ARB_texture_rect.patch ++ to remove direct GL usages to let it build with EGL/GLES2 on arm ++ * debian/control: ++ - Bump build-dep on clutter-1.0-dev (>= 1.7.5) ++ * debian/libmutter0.symbols: ++ - updated (leave with debian revision since it is added by a patch) ++ ++ -- Michael Biebl Fri, 14 Oct 2011 19:01:24 +0200 ++ ++mutter (3.0.2.1-2) unstable; urgency=low ++ ++ [ Laurent Bigonville ] ++ * Drop debian/mutter.lintian-overrides: Missing manpages are now installed ++ ++ [ Michael Biebl ] ++ * debian/control.in: ++ - Drop Build-Depends on gir1.2-gtk-3.0, gir1.2-clutter-1.0 and ++ gir1.2-json-glib-1.0 and let their corresponding -dev package pull it in ++ automatically. Bump the Build-Depends on the -dev packages accordingly. ++ * Bump debhelper compatibility level to 8. ++ - Update Build-Depends on debhelper. ++ - Strip debian/tmp/ from .install files. ++ * Let cdbs call dh_girepository. ++ - Bump Build-Depends on cdbs to (>= 0.4.90). ++ - Remove custom dh_girepository rules from debian/rules. ++ - Set DEB_DH_GIREPOSITORY_ARGS_ALL to /usr/lib/mutter. ++ ++ -- Michael Biebl Thu, 07 Jul 2011 22:45:20 +0200 ++ ++mutter (3.0.2.1-1) unstable; urgency=low ++ ++ [ Rico Tzschichholz ] ++ * New upstream release ++ * debian/watch: ++ - Look for bzip2 tarballs ++ ++ [ Josselin Mouette ] ++ * Depend on libgnome2-common for the GConf schemas. This will be ++ necessary until mutter is ported to GSettings. ++ ++ -- Laurent Bigonville Sat, 11 Jun 2011 14:39:59 +0200 ++ ++mutter (3.0.1-1) experimental; urgency=low ++ ++ * New upstream release (3.0.0). ++ * debian/control.in: ++ - Bump Standards-Version to 3.9.2 (no further changes) ++ - Drop versionized dpkg-dev build-dependency ++ ++ -- Laurent Bigonville Fri, 06 May 2011 23:47:25 +0200 ++ ++mutter (3.0.0-2) experimental; urgency=low ++ ++ * Rename gir1.2-mutter-2.91 package to gir1.2-mutter-3.0 ++ ++ -- Laurent Bigonville Mon, 11 Apr 2011 11:19:27 +0200 ++ ++mutter (3.0.0-1) experimental; urgency=low ++ ++ * Team upload. ++ ++ [ Frederic Peters ] ++ * New upstream release (2.91.93). ++ * debian/libmutter0.symbols: new symbol. ++ ++ [ Josselin Mouette ] ++ * Make the -dev package depend on the gir package. ++ ++ [ Raphaël Hertzog ] ++ * New upstream release (3.0.0). ++ ++ -- Raphaël Hertzog Sun, 10 Apr 2011 19:38:04 +0000 ++ ++mutter (2.91.92-1) experimental; urgency=low ++ ++ * New upstream release ++ ++ [ Rico Tzschichholz ] ++ * debian/patches: ++ + drop 02_arm_include_clutter_x11.patch, is upstream ++ + drop 10_mutter-ldflags.patch, is upstream ++ * debian/control.in,debian/rules: ++ + add libmutter0 which replaces libmutter-wm0 and libmutter-private0 ++ ++ [ Frederic Peters ] ++ * debian/control.in: mention gnome-shell in libmutter0 package description. ++ ++ -- Frederic Peters Thu, 24 Mar 2011 19:56:48 +0100 ++ ++mutter (2.91.91-1) experimental; urgency=low ++ ++ * New upstream release. ++ ++ [Laurent Bigonville] ++ * debian/control.in: Add Vcs-Svn and Vcs-Browser fields ++ ++ [Frederic Peters] ++ * debian/control.in, libmutter-wm0.install, libmutter-wm0.symbols: ++ Add a libmutter-wm0 library ++ * debian/patches/10_mutter-ldflags.patch: Fix linking of mutter binary ++ * debian/patches/20_libmutter_export_symbols.patch: Limit list of symbols ++ exported by libmutter-{wm,private} (but don't add it to series as it makes ++ gnome-shell segfault) ++ * debian/mutter.install, debian/mutter-common.install: move mutter-wm.desktop ++ from mutter-common to mutter. ++ * debian/control.in: add replaces/breaks in mutter, against previous ++ versions of mutter-common, for the move of mutter-wm.desktop. ++ ++ -- Frederic Peters Mon, 14 Mar 2011 19:09:58 +0100 ++ ++mutter (2.91.90-1) experimental; urgency=low ++ ++ * New upstream release. ++ ++ -- Frederic Peters Wed, 23 Feb 2011 09:29:08 +0100 ++ ++mutter (2.91.6-1) experimental; urgency=low ++ ++ [ Laurent Bigonville ] ++ * New upstream release. ++ * debian/control.in: ++ - Remove duplicate Section ++ - Drop gir1.2-mutter-2.91 Conflicts/Replaces against libmutter-private0 ++ package ++ * debian/watch: Drop call to uupdate ++ * debian/mutter.lintian-overrides: Add overrides for manpages shipped ++ in mutter-common ++ ++ [ Emilio Pozuelo Monfort ] ++ * debian/control.in: ++ + Update for the new gtk+ 3 package names. ++ ++ -- Emilio Pozuelo Monfort Sat, 19 Feb 2011 15:20:42 +0000 ++ ++mutter (2.29.0-4) unstable; urgency=low ++ ++ * Remove gir1.0-mutter-2.29 to ease the gir1.2 transition, since ++ nothing uses it. ++ ++ -- Emilio Pozuelo Monfort Wed, 16 Feb 2011 20:34:44 +0000 ++ ++mutter (2.91.5-1) experimental; urgency=low ++ ++ [ Emilio Pozuelo Monfort ] ++ * New upstream release. ++ + debian/control.in: ++ - Update build dependencies. ++ - Remove unneeded libgtk2.0-dev build dependency. ++ + debian/patches/02_gdk_removed_macro.patch, ++ debian/patches/03_handle_new_gtk_states.patch, ++ debian/patches/04_fix_gradient_example.patch: ++ - Removed, included upstream. ++ * debian/libmutter-private0.symbols: ++ + Add a symbols file. ++ * debian/rules: ++ + Make the shlibs always depend on the latest upstream version. ++ We have symbols file anyway, and manually bumping the shver is ++ error prone. ++ ++ [ Laurent Bigonville ] ++ * debian/control: Bump Standards-Version to 3.9.1 ++ ++ -- Emilio Pozuelo Monfort Wed, 12 Jan 2011 23:06:20 +0000 ++ ++mutter (2.91.3-3) experimental; urgency=low ++ ++ * debian/patches/02_gdk_removed_macro.patch, ++ * debian/patches/03_handle_new_gtk_states.patch, ++ * debian/patches/04_fix_gradient_example.patch: ++ - Patches from upstream git, fix the build with latest GTK+ 3. ++ * debian/control.in: ++ - Bump the libgtk3.0-dev build dependency accordingly. ++ ++ -- Emilio Pozuelo Monfort Sat, 18 Dec 2010 23:39:24 +0000 ++ ++mutter (2.91.3-2) experimental; urgency=low ++ ++ * Update to the new gir policy: ++ - Rename gir1.0-mutter-2.91 to gir1.2-mutter-2.91. ++ - Bump the gobject-introspection build dependency. ++ - Build depend on gir1.2 packages. ++ * debian/control.in: ++ - Fix typo, s/shlib/shlibs/. ++ * debian/rules: ++ - Remove hack to get translations in /usr/share, no longer needed. ++ - Pass the path to the typelibs to dh_girepository to get correct ++ dependencies. ++ * debian/rules, ++ debian/control.in: ++ - Use dh-autoreconf. ++ * debian/patches/90_autotools.patch, ++ debian/patches/99_ltmain_as-needed.patch: ++ - Removed, no longer needed with dh-autoreconf. ++ * debian/rules, ++ debian/copyright: ++ - Fix some metacity leftovers. ++ * debian/mutter.1, ++ debian/mutter-message.1, ++ debian/mutter-theme-viewer.1, ++ debian/mutter-window-demo.1, ++ debian/mutter-common.manpages: ++ - Removed, shipped upstream. ++ ++ -- Emilio Pozuelo Monfort Tue, 14 Dec 2010 00:52:38 +0100 ++ ++mutter (2.91.3-1) experimental; urgency=low ++ ++ [ Gustavo Noronha Silva ] ++ * New development release ++ * debian/control: ++ - update build-dependencies on GObject-Introspection packages ++ - build-depend on GTK+3 ++ ++ [ Emilio Pozuelo Monfort ] ++ * New upstream release. ++ - Rename gir1.0-mutter-2.31 to gir1.0-mutter-2.91. ++ * debian/control.in: ++ - Build depend on libjson-glib-dev and gir1.0-json-glib-1.0. ++ * debian/rules, ++ debian/control.in, ++ debian/source/format: ++ - Switch to source format 3.0 (quilt). ++ * debian/rules: ++ - Bump the shlib version. ++ ++ -- Emilio Pozuelo Monfort Mon, 06 Dec 2010 00:59:42 +0100 ++ ++mutter (2.31.5-1) experimental; urgency=low ++ ++ * New upstream release ++ - refreshed patches ++ - added a hack to rules to work-around the build trying to install ++ locale files to /usr/lib/locale ++ - bumped shlib minimum version to 2.31.5 (see #586124) ++ ++ -- Gustavo Noronha Silva Tue, 13 Jul 2010 11:36:29 -0300 ++ ++mutter (2.31.2-3) experimental; urgency=low ++ ++ * debian/gir1.0-mutter-2.{29->31}.install: ++ - actually install the typelib file ++ ++ -- Gustavo Noronha Silva Mon, 31 May 2010 11:37:33 -0300 ++ ++mutter (2.31.2-2) experimental; urgency=low ++ ++ * debian/control: ++ - fix GIR package name to account for GIR API name change ++ ++ -- Gustavo Noronha Silva Wed, 26 May 2010 15:15:34 -0300 ++ ++mutter (2.31.2-1) experimental; urgency=low ++ ++ * New development release ++ ++ -- Gustavo Noronha Silva Wed, 26 May 2010 10:51:58 -0300 ++ ++mutter (2.29.1-1) experimental; urgency=low ++ ++ * New development release. ++ * debian/control: ++ - build-dep on clutter >= 1.2 ++ ++ -- Gustavo Noronha Silva Thu, 08 Apr 2010 20:48:38 -0300 ++ ++mutter (2.29.0-2) unstable; urgency=low ++ ++ * debian/control: ++ - fix gir package name, because the typelib has changed its name ++ ++ -- Gustavo Noronha Silva Mon, 15 Mar 2010 17:27:59 -0300 ++ ++mutter (2.29.0-1) unstable; urgency=low ++ ++ * New upstream development release. ++ * debian/rules: ++ - update makeshlibs argument to require >= 2.29.0 ++ ++ -- Gustavo Noronha Silva Tue, 02 Mar 2010 19:19:44 -0300 ++ ++mutter (2.28.1~git20100129-1) unstable; urgency=low ++ ++ * Upstream snapshot ++ ++ -- Gustavo Noronha Silva Fri, 29 Jan 2010 12:04:09 -0200 ++ ++mutter (2.28.1~git20091208-1) unstable; urgency=low ++ ++ * New upstream snapshot ++ ++ -- Gustavo Noronha Silva Sat, 24 Oct 2009 13:16:53 -0200 ++ ++mutter (2.28.1~git20091024-1) unstable; urgency=low ++ ++ * Upstream snapshot ++ * debian/control.in: ++ - fixed typo in description ++ - bump Standards-Version to 3.8.3 ++ ++ -- Gustavo Noronha Silva Sat, 24 Oct 2009 12:59:03 -0200 ++ ++mutter (2.28.0-2) unstable; urgency=low ++ ++ * debian/control.in: ++ - adapt for the new GObject introspection policy ++ ++ -- Gustavo Noronha Silva Mon, 19 Oct 2009 15:59:57 -0200 ++ ++mutter (2.28.0-1) unstable; urgency=low ++ ++ * New upstream release ++ ++ -- Gustavo Noronha Silva Fri, 09 Oct 2009 13:23:25 -0300 ++ ++mutter (2.27.5-1) unstable; urgency=low ++ ++ * New upstream release ++ ++ -- Gustavo Noronha Silva Wed, 30 Sep 2009 21:19:05 +0100 ++ ++mutter (2.27.3-2) unstable; urgency=low ++ ++ [ Simon Raven ] ++ * debian/control.in: ++ - adding missing build-dep to fix FTBFS (Closes: #544342) ++ ++ [ Gustavo Noronha Silva ] ++ * debian/control.in: ++ - also add gobject-introspection, gobject-introspection-glib-2.0, ++ gobject-introspection-freedesktop, which were also missing, to ++ build-depends ++ ++ -- Gustavo Noronha Silva Sun, 30 Aug 2009 19:02:46 -0300 ++ ++mutter (2.27.3-1) unstable; urgency=low ++ ++ [ Josselin Mouette ] ++ * Update list of copyright holders. ++ ++ [ Gustavo Noronha Silva ] ++ * New upstream release ++ ++ -- Gustavo Noronha Silva Sat, 29 Aug 2009 21:53:05 -0300 ++ ++mutter (2.27.2-1) unstable; urgency=low ++ ++ * First mutter release for Debian ++ - no ITP since this is in practice a branch of metacity ++ * debian/control.in: ++ - adapted descriptions ++ - added build-deps on gobject-introspection, and clutter >= 1.0 ++ - renamed packages ++ * debian/patches/10_ignore_callbacks.patch: ++ - removed; applied upstream ++ * debian/mutter-common.install: ++ - this package no longer provides themes and gnome-control-center ++ keybindings capplet; this will come in a separate module in the ++ future, it seems, and we may want to make sure it is installed ++ ++ -- Gustavo Noronha Silva Sun, 26 Jul 2009 13:33:08 +0200 ++ ++metacity (1:2.26.0-3) unstable; urgency=high ++ ++ * 10_ignore_callbacks.patch: stolen upstream. Fix a bug leading to ++ some callbacks being ignored. Closes: #533917. ++ ++ -- Josselin Mouette Wed, 24 Jun 2009 12:04:26 +0200 ++ ++metacity (1:2.26.0-2) unstable; urgency=low ++ ++ * Use patchsys-quilt; build-depend on quilt. ++ * 01_Wcast-align.patch: don’t use -Wcast-align, it gives incorrect ++ warnings (errors thanks to -Werror) when some pointers are converted ++ back and forth to XPointers. Closes: #532655. ++ * 90_autotools.patch: relibtoolize the whole package. ++ ++ -- Josselin Mouette Wed, 10 Jun 2009 21:52:35 +0200 ++ ++metacity (1:2.26.0-1) unstable; urgency=low ++ ++ [ Josselin Mouette ] ++ * Fix typo in changelog entry. ++ ++ [ Loic Minier ] ++ * Let metacity suggest gnome-themes as it attempts to use the Clearlooks ++ Metacity theme by default and logs a warning when it can't be used. ++ * Let metacity suggest xdg-user-dirs as it fails creating the ++ .config/metacity sub-directory and logs a warning if .config isn't created ++ by xdg-user-dirs. ++ ++ [ Josselin Mouette ] ++ * Set the team as primary maintainer. Closes: #523545. ++ * Fixup in the descriptions. ++ * New upstream release. ++ * Update build-dependencies. ++ * Bump shlibs for libmetacity-private0. ++ ++ -- Josselin Mouette Tue, 09 Jun 2009 20:36:03 +0200 ++ ++metacity (1:2.24.0-2) unstable; urgency=low ++ ++ * Rename libmetacity0 to libmetacity-private0 because of an ++ unexpected ABI change. Closes: #510096. ++ * Remove trailing -1's in build-depends. ++ * debian/copyright: write complete list of copyright holders. ++ * Upload to unstable. ++ ++ -- Josselin Mouette Mon, 16 Feb 2009 18:03:57 +0100 ++ ++metacity (1:2.24.0-1) experimental; urgency=low ++ ++ * New upstream release. ++ + Implements one-way maximisation. Closes: #450837. ++ + Fixes issues when disabling the compositor. Closes: #476492. ++ * Bump shlibs version to 1:2.24.0. ++ * Standards version is 3.8.0. ++ * 01_doublefree_maximize.patch: dropped, merged upstream. ++ * Install the .desktop in the metacity package. ++ ++ -- Josselin Mouette Sat, 22 Nov 2008 15:57:58 +0100 ++ ++metacity (1:2.22.0-2) unstable; urgency=low ++ ++ [ Sven Arvidsson ] ++ * Add README.Debian, describing how to enable the compositor. ++ (Closes: #471442) ++ ++ [ Josselin Mouette ] ++ * 01_doublefree_maximize.patch: stolen upstream (r3817). Fixes ++ vertical maximisation bug caused by an invalid free. ++ Closes: #452139. ++ * control.in: make metacity the first package so that it gets the ++ README.Debian. ++ ++ -- Josselin Mouette Thu, 18 Sep 2008 16:53:19 +0200 ++ ++metacity (1:2.22.0-1) unstable; urgency=low ++ ++ [ Bradley Smith ] ++ * New upstream development release. ++ ++ [ Sam Morris ] ++ * Build-depend on libxcomposite-dev for composite manager. ++ ++ [ Sebastian Dröge ] ++ * New upstream stable release: ++ + debian/rules: ++ - Drop check-dist include. ++ - Update shlibs to >= 2.22.0 because of new API. ++ ++ -- Sebastian Dröge Fri, 14 Mar 2008 13:54:19 +0100 ++ ++metacity (1:2.21.5-1) experimental; urgency=low ++ ++ [ Riccardo Setti ] ++ * New metacity package. ++ * build with compositor extension. ++ ++ [ Bradley Smith ] ++ * Update Standards Version to 3.7.3. (No changes) ++ * Add check-dist. ++ ++ -- Riccardo Setti Thu, 20 Dec 2007 02:29:13 +0100 ++ ++metacity (1:2.20.1-2) UNRELEASED; urgency=low ++ ++ * Let metacity-common replace metacity instead of conflicting to ease ++ upgrades. ++ ++ -- Loic Minier Wed, 28 Nov 2007 19:00:45 +0100 ++ ++metacity (1:2.20.1-1) unstable; urgency=low ++ ++ [ Josselin Mouette ] ++ * Recommend gnome-session | x-session-manager. Closes: #225640. ++ * Remove metacity.menu. Closes: #397645. ++ ++ [ Sebastian Dröge ] ++ * New upstream bugfix release. ++ ++ -- Sebastian Dröge Mon, 19 Nov 2007 13:57:21 +0100 ++ ++metacity (1:2.20.0-1) unstable; urgency=low ++ ++ * New upstream release: ++ + debian/patches/01_session_tolerate_missing_file.patch, ++ debian/patches/02_fix_crash_on_session_saving.patch: ++ - Dropped, merged upstream. ++ + debian/rules: ++ - Bump shlibs to >= 2.19.5. ++ + debian/metacity-common.install: ++ - Ship keybinding stuff. ++ * debian/control.in: ++ + Drop duplicated libxinerama-dev build dependency. ++ ++ -- Sebastian Dröge Sat, 22 Sep 2007 10:46:36 +0200 ++ ++metacity (1:2.18.5-1) unstable; urgency=low ++ ++ * New upstream stable release; no API change. ++ ++ -- Loic Minier Tue, 19 Jun 2007 12:07:17 +0200 ++ ++metacity (1:2.18.3-2) unstable; urgency=low ++ ++ * 99_ltmain_as-needed.patch: make --as-needed work for the library ++ too. ++ ++ -- Josselin Mouette Wed, 06 Jun 2007 23:40:52 +0200 ++ ++metacity (1:2.18.3-1) unstable; urgency=low ++ ++ * Drop metacity-common postinst as it was scheduled to be dropped post-etch. ++ * Rewrite metacity postinst and prerm to use safer individual if tests ++ instead of trying to list all possible args in a case; reported by ++ Lior Kaplan; closes: #421206. ++ * New upstream stable release; no API change. ++ ++ -- Loic Minier Mon, 28 May 2007 17:48:18 +0200 ++ ++metacity (1:2.18.2-3) unstable; urgency=low ++ ++ * New patch 02_fix_crash_on_session_saving.patch, taken from Ubuntu. ++ Fix a crash that would occur when the current session is saved and would ++ corrupt ~/.gnome2/session. Gnome bug #433253 ++ ++ -- Sebastian Dröge Thu, 26 Apr 2007 15:44:10 +0200 ++ ++metacity (1:2.18.2-2) unstable; urgency=low ++ ++ * Add -z defs to LDFLAGS; cleanups. ++ * Upload to unstable; drop check-dist include. ++ * Add a ${misc:Depends}. ++ * Drop useless --enable-xsync=yes from configure flags. ++ * Wrap build-deps and deps. ++ * Bump dep on libgtk2.0-dev to >= 2.10.0-1. ++ ++ -- Loic Minier Sat, 14 Apr 2007 15:12:50 +0200 ++ ++metacity (1:2.18.2-1) experimental; urgency=low ++ ++ * New upstream stable release. ++ ++ -- Loic Minier Mon, 09 Apr 2007 08:47:47 +0200 ++ ++metacity (1:2.18.1-1) experimental; urgency=low ++ ++ * New upstream stable release; no API change; bug fixes and translations. ++ * Drop obsolete README.Debian; misc cleanups. ++ ++ -- Loic Minier Sun, 08 Apr 2007 09:23:44 +0200 ++ ++metacity (1:2.18.0-1) experimental; urgency=low ++ ++ [ Marco Cabizza ] ++ * New upstream release: not enabling compositor, too unstable, and libcm ++ seems dead upstream. ++ ++ [ Riccardo Setti ] ++ * Updated debhelper compatibility to 5 ++ ++ [ Loic Minier ] ++ * Set LDFLAGS directly instead of via DEB_CONFIGURE_SCRIPT_ENV; build-dep on ++ cdbs >= 0.4.41. ++ * Fix metacity-common.install to list the correct dirs. ++ ++ -- Loic Minier Mon, 26 Mar 2007 22:27:08 +0200 ++ ++metacity (1:2.16.5-1) experimental; urgency=low ++ ++ [ Loic Minier ] ++ * Add a get-orig-source target to retrieve the upstream tarball. ++ * Include the new check-dist Makefile to prevent accidental uploads to ++ unstable; bump build-dep on gnome-pkg-tools to >= 0.10. ++ ++ [ Josselin Mouette ] ++ * 01_session_tolerate_missing_file.patch: register differently to the ++ session, in order to handle gracefully the case where a session file ++ is missing on the disk (closes: #315169, #391287). ++ * New upstream release. ++ ++ -- Josselin Mouette Sun, 4 Mar 2007 10:29:40 +0100 ++ ++metacity (1:2.16.3-1) experimental; urgency=low ++ ++ [ Marco Cabizza ] ++ * New upstream release. ++ ++ [ Loic Minier ] ++ * Merge 1:2.14.5-2. ++ ++ [ Josselin Mouette ] ++ * Use ${gnome:Version} and ${gnome:NextVersion} to loosen the ++ dependencies. ++ * Build-depend on gnome-pkg-tools 0.6. ++ * Call gnome-version.mk. ++ * Replace the x-dev build-dependency by x11proto-core-dev. ++ ++ -- Josselin Mouette Tue, 21 Nov 2006 20:50:05 +0100 ++ ++metacity (1:2.16.2-1) experimental; urgency=low ++ ++ * New upstream release, with backwards incompatible changes in internal API. ++ ++ -- Loic Minier Mon, 25 Sep 2006 17:47:56 +0200 ++ ++metacity (1:2.16.1-1) experimental; urgency=low ++ ++ [ Loïc Minier ] ++ * Remove superfluous dh_installcatalogs call and bump cdbs build-dep to ++ >= 0.4.37, thanks Peter Eisentraut. (Closes: #361156) ++ [debian/control, debian/control.in, debian/rules] ++ * Don't mention non-existing Info documentation in the metacity and ++ metacity-message man pages, thanks Piotr Engelking. (Closes: #365450) ++ [debian/metacity.1, debian/metacity-message.1] ++ * Fix watch file. ++ ++ [ Marco Cabizza ] ++ * New upstream release, target experimental: ++ - Bumping up libgtk2.0-dev build-dep to 2.10 ++ * Setting myself as the maintainer. ++ ++ -- Marco Cabizza Wed, 13 Sep 2006 18:46:45 +0200 ++ ++metacity (1:2.14.5-2) unstable; urgency=low ++ ++ * Remove superfluous dh_installcatalogs call and bump cdbs build-dep to ++ >= 0.4.37, thanks Peter Eisentraut. (Closes: #361156) ++ [debian/control, debian/control.in, debian/rules] ++ * Don't mention non-existing Info documentation in the metacity and ++ metacity-message man pages, thanks Piotr Engelking. (Closes: #365450) ++ [debian/metacity.1, debian/metacity-message.1] ++ * Fix watch file. ++ * Fix typo in debian/metacity-message.1; thanks Per Bojsen; closes: #397864. ++ ++ -- Loic Minier Fri, 10 Nov 2006 09:38:49 +0100 ++ ++metacity (1:2.14.5-1) unstable; urgency=low ++ ++ * New upstream release. ++ ++ -- Loic Minier Tue, 30 May 2006 15:47:36 +0200 ++ ++metacity (1:2.14.3-1) unstable; urgency=low ++ ++ [ Gustavo Noronha Silva ] ++ * New upstream release. ++ + Doesn't steal focus (closes: #361273). ++ ++ [ Josselin Mouette ] ++ * Make the package binNMU-safe. ++ + Build-depend on dpkg-dev 1.13.19. ++ + Use ${source:Version} and ${binary:Version}. ++ * Standards version is 3.7.2. ++ * Bump shlibs version to 2.14. ++ ++ [ Loic Minier ] ++ * Stop shipping /usr/lib/*.la files in libmetacity-dev. ++ [debian/libmetacity-dev.install] ++ ++ -- Josselin Mouette Sun, 14 May 2006 23:30:56 +0200 ++ ++metacity (1:2.14.1-2) unstable; urgency=low ++ ++ * Simple rebuild to get rid of references to Xcursor.la / Xrender.la. ++ ++ -- Loic Minier Tue, 2 May 2006 16:45:22 +0200 ++ ++metacity (1:2.14.1-1) unstable; urgency=low ++ ++ * New upstram version. ++ * Adds edge resistance. Closes: #191649. ++ * patches/000_raise-on-click.patch: Fixed upstream; dropped. ++ ++ -- Dafydd Harries Thu, 30 Mar 2006 19:50:23 +0100 ++ ++metacity (1:2.12.3-3) unstable; urgency=low ++ ++ * Also explicitely remove catalogs installed by past metacity packages. ++ [debian/metacity-common.preinst] ++ * Move these clenaups to postinst. ++ [debian/metacity-common.preinst, debian/metacity-common.postinst] ++ ++ -- Loic Minier Sun, 12 Feb 2006 16:53:48 +0100 ++ ++metacity (1:2.12.3-2) unstable; urgency=low ++ ++ * Clean up metacity's postinst. ++ [debian/metacity.postinst] ++ * Clean up /etc/sgml/metacity.cat and .old left over by metacity. ++ [debian/metacity-common.preinst] ++ ++ -- Loic Minier Sun, 12 Feb 2006 16:35:07 +0100 ++ ++metacity (1:2.12.3-1) unstable; urgency=low ++ ++ * New upstream release. ++ * Update patch to support a new raise on click mode and choice of this mode ++ to apply without fuzz. Also note this patch has been rejected upstream. ++ [debian/patches/000_raise-on-click.patch] ++ * New metacity-common package holds arch-independent files and registers ++ schemas. (Closes: #218365, #234665, #240211) ++ [debian/metacity.dirs, debian/metacity-common.links, ++ debian/metacity.install, debian/control, debian/control.in, ++ debian/metacity-common.postinst, debian/metacity.catalog, ++ debian/metacity-common.manpages, debian/metacity.postrm, ++ debian/metacity-common.dirs, debian/metacity-common.install, ++ debian/metacity-common.catalog, debian/changelog, ++ debian/metacity-common.postrm, debian/rules, debian/metacity.links, ++ debian/metacity.postinst, debian/metacity.manpages] ++ * Actually ship license information. ++ [debian/copyright] ++ * Version the metacity and libmetacity dependency on metacity-common with ++ Source-Version. ++ [debian/control, debian/control.in] ++ * Install SGML catalogs with dh_installcatalogs, move them below ++ /usr/share/sgml/metacity-common, in the metacity-common package. ++ [debian/control, debian/control, debian/metacity-common.catalog, ++ debian/metacity-common.postinst, debian/metacity-common.postrm, ++ debian/metacity-common.sgmlcatalogs, debian/rules] ++ * Drop the /usr/share/metacity/dtd symlink. ++ [debian/metacity-common.links] ++ * Drop /usr/share/sgml/dtd creation. ++ [debian/metacity-common.dirs] ++ * Drop useless /usr/share/metacity from metacity-common. ++ [debian/metacity-common.install] ++ * Drop obsolete cleanup "rm -rf". ++ [debian/rules] ++ * Give .dtd installation to dh_install. ++ [debian/metacity-common.install, debian/rules] ++ ++ -- Loic Minier Sat, 11 Feb 2006 21:10:40 +0100 ++ ++metacity (1:2.12.2-3) unstable; urgency=high ++ ++ * Add xorg build-deps (libice-dev, libsm-dev, libx11-dev, libxext-dev, ++ libxinerama-dev, libxrandr-dev, x-dev) thanks to "xlibs-split". ++ (Closes: #347000) ++ [debian/control, debian/control.in] ++ * Relibtoolizing would get Debian's AC_PATH_XTRA, but I add a libxt-dev ++ build-dep and pass --as-needed because the patch was like uh 1.1 MB. ++ [debian/control, debian/control.in, debian/rules] ++ ++ -- Loic Minier Mon, 9 Jan 2006 22:47:36 +0100 ++ ++metacity (1:2.12.2-2) unstable; urgency=low ++ ++ * Upload to unstable. ++ ++ -- Josselin Mouette Sun, 8 Jan 2006 01:49:55 +0100 ++ ++metacity (1:2.12.2-1) experimental; urgency=low ++ ++ * New upstream release. ++ ++ -- Jordi Mallach Sun, 25 Dec 2005 23:20:10 +0100 ++ ++metacity (1:2.12.1-1) experimental; urgency=low ++ ++ * New upstream release. ++ * watch: update for 2.12. ++ * 000_raise-on-click.patch: update to make patch apply cleanly. ++ * rules: bump shlibs for new symbols. ++ ++ -- Josselin Mouette Sun, 9 Oct 2005 16:50:22 +0200 ++ ++metacity (1:2.10.3-2) unstable; urgency=low ++ ++ * debian/control.in: ++ - don't Build-Depends on xlibs-pic, Build-Depend on libxinerama-dev ++ (Closes: #320589). ++ * debian/patches/000_metacity-debian-xinerama-pic.patch: ++ - not useful with xorg. ++ ++ -- Sebastien Bacher Tue, 2 Aug 2005 17:40:43 +0200 ++ ++metacity (1:2.10.3-1) unstable; urgency=low ++ ++ * New upstream version. ++ * Bump Standards-Version to 3.6.2. ++ * Add CDBS' utils to rules. ++ ++ -- Loic Minier Fri, 29 Jul 2005 10:56:05 +0200 ++ ++metacity (1:2.10.2-1) unstable; urgency=low ++ ++ * New upstream version. ++ ++ -- Sebastien Bacher Tue, 28 Jun 2005 23:09:14 +0200 ++ ++metacity (1:2.10.1-2) unstable; urgency=low ++ ++ * Upload to unstable. ++ ++ -- Jordi Mallach Sun, 12 Jun 2005 19:03:18 +0200 ++ ++metacity (1:2.10.1-1) experimental; urgency=low ++ ++ * New upstream version. ++ ++ -- Sebastien Bacher Wed, 13 Apr 2005 17:35:20 +0200 ++ ++metacity (1:2.10.0-1) experimental; urgency=low ++ ++ * New upstream version. ++ * debian/patches/000_raise-on-click.patch: ++ - updated. ++ * debian/watch: ++ - updated. ++ ++ -- Sebastien Bacher Fri, 8 Apr 2005 21:33:44 +0200 ++ ++metacity (1:2.8.8-1) unstable; urgency=low ++ ++ * GNOME team upload. ++ * New upstream release. ++ ++ -- Jordi Mallach Wed, 29 Dec 2004 17:18:05 +0100 ++ ++metacity (1:2.8.6-1) unstable; urgency=low ++ ++ * New upstream release. ++ * Upload to unstable. ++ ++ -- Sebastien Bacher Thu, 18 Nov 2004 13:23:27 +0100 ++ ++metacity (1:2.8.5-2) experimental; urgency=low ++ ++ * debian/metacity.postinst: ++ - removed the static gconf registration. ++ * debian/metacity-theme-viewer.1: ++ - manpage written by Jose M. Moya" (Closes: #252108). ++ * debian/metacity-window-demo.1: ++ - manpage written by Jose M. Moya" (Closes: #252110). ++ * debian/metacity.manpages: ++ - updated. ++ ++ -- Sebastien Bacher Fri, 17 Sep 2004 22:11:51 +0200 ++ ++metacity (1:2.8.5-1) experimental; urgency=low ++ ++ * GNOME team upload. ++ * New upstream release. ++ * Sebastien Bacher: ++ - Switched to CDBS. ++ - debian/rules: converted to CDBS ++ - debian/*.files: replaced with .install files. ++ * J.H.M. Dassen (Ray): ++ - [debian/control.in] Bumped libstartup-notification0-dev as ++ configure requires 0.7. ++ * Jordi Mallach: ++ - debian/control.in: add cdbs to build-deps. ++ ++ -- Jordi Mallach Tue, 14 Sep 2004 20:30:36 +0200 ++ ++metacity (1:2.8.1-4) unstable; urgency=low ++ ++ * debian/rules: ++ - added a dh_gconf call. ++ * debian/metacity.postinst: ++ - removed the static schemas registration, dh_gconf handles that right. ++ ++ -- Sebastien Bacher Fri, 6 Aug 2004 18:17:03 +0200 ++ ++metacity (1:2.8.1-3) unstable; urgency=low ++ ++ * GNOME Team Upload. ++ * Upload in unstable. ++ ++ -- Sebastien Bacher Wed, 26 May 2004 14:28:32 +0200 ++ ++metacity (1:2.8.1-2) experimental; urgency=low ++ ++ * debian/patches/000_raise-on-click.patch: ++ + patch from bugzilla to choose to raise or not the window which has ++ the focus in mouse and sloppy modes. (Closes: #228768). ++ The gconf key to use is /apps/metacity/general/raise_on_click. ++ * Gnome Team Upload. ++ ++ -- Sebastien Bacher Wed, 26 May 2004 14:19:51 +0200 ++ ++metacity (1:2.8.1-1) experimental; urgency=low ++ ++ * New upstream release. ++ * debian/patches/000_metacity-debian-xinerama-pic.patch: ++ + updated ++ * GNOME Team Upload. ++ ++ -- Sebastien Bacher Wed, 5 May 2004 21:17:15 +0200 ++ ++metacity (1:2.8.0-3) experimental; urgency=low ++ ++ * GNOME team upload. ++ * debian/rules: get the epoch included in the shlib version for ++ libmetacity0. ++ ++ -- Jordi Mallach Tue, 6 Apr 2004 14:04:36 +0200 ++ ++metacity (1:2.8.0-2) experimental; urgency=low ++ ++ * Added Build-Depends on gnome-pkg-tools and libxml-parser-perl ++ (Closes: #240639). ++ ++ -- Sebastien Bacher Sat, 3 Apr 2004 23:46:56 +0200 ++ ++metacity (1:2.8.0-1) experimental; urgency=low ++ ++ * New upstream release: ++ + converts "show desktop mode" to "all windows are minimized" when ++ you open a new window (Closes: #217467). ++ + fixes bug with panel not listed before clicking on them ++ (Closes: #224054). ++ + fixes multi-tab handling (Closes: #227708). ++ + includes always on top menu entry (Closes: #204212). ++ + includes wireframes support (Closes: #184849). ++ + should fix bug with applications changing workspace ++ (Closes: #224156, #230782). ++ + switches window truncates title (Closes: #186324). ++ * debian/control.in, debian/rules: ++ + adapted for the Gnome Team. ++ * debian/patches/000_metacity-debian-xinerama-pic.patch: ++ + updated. ++ * debian/patches/001_metacity-focus.patch: ++ + removed since the changes are included in the new version. ++ * debian/watch: ++ + updated to 2.8 branch. ++ ++ -- Sebastien Bacher Sun, 28 Mar 2004 12:26:22 +0200 ++ ++metacity (1:2.6.3-2) unstable; urgency=low ++ ++ * debian/patches/001_metacity-focus.patch : ++ + new patch to fix focus problem with panels in mouse and sloppy modes ++ (Closes: #224858). ++ * Gnome Team Upload. ++ ++ -- Sebastien Bacher Sun, 18 Jan 2004 19:31:49 +0100 ++ ++metacity (1:2.6.3-1) unstable; urgency=low ++ ++ * New upstream release. ++ * Gnome Team Upload. ++ ++ -- Sebastien Bacher Sat, 20 Dec 2003 23:17:21 +0100 ++ ++metacity (1:2.6.2-2) unstable; urgency=low ++ ++ * debian/patches/000_metacity-debian-xinerama-pic.patch: ++ - updated to fix a link problem (Closes: #216693). ++ ++ -- Sebastien Bacher Tue, 21 Oct 2003 13:56:24 +0200 ++ ++metacity (1:2.6.2-1) unstable; urgency=low ++ ++ * New upstream release. ++ * debian/patches/: ++ - 000_metacity-2.4.34-usage.patch: removed. ++ - 000_metacity-debian-xinerama-pic.patch: updated. ++ - 001_metacity-2.4.55-non-weak-symbols.patch: removed. ++ * Update Build-Depends. ++ * Gnome Team Upload. ++ ++ -- Sebastien Bacher Sat, 18 Oct 2003 19:33:23 +0200 ++ ++metacity (1:2.4.55-3) unstable; urgency=low ++ ++ * debian/metacity.1: ++ - fixed the incorrect option. (closes: Bug#209159) ++ * debian/metacity.prerm: ++ - fixed removing alternatives issue. (closes: Bug#211502) ++ ++ -- Akira TAGOH Wed, 8 Oct 2003 18:44:56 +0900 ++ ++metacity (1:2.4.55-2) unstable; urgency=low ++ ++ * debian/patches/000_metacity-debian-xinerama-pic.patch: ++ - update to fix the unnecessary library dependencies in .la. ++ (closes: Bug#195774) ++ ++ -- Akira TAGOH Thu, 12 Jun 2003 01:25:45 +0900 ++ ++metacity (1:2.4.55-1) unstable; urgency=low ++ ++ * New upstream release. ++ * debian/patches/: ++ - 000_metacity-2.4.34-save-workspace.patch: removed. ++ - 001_metacity-2.4.55-non-weak-symbols.patch: updated. ++ ++ -- Akira TAGOH Mon, 2 Jun 2003 02:50:50 +0900 ++ ++metacity (1:2.4.34-3) unstable; urgency=low ++ ++ * debian/control: ++ - suggests gnome-control-center instead of metacity-properties. ++ (closes: Bug#192752) ++ - bumped Standards-Version to 3.5.10.0. ++ * debian/patches/001_metacity-2.4.34-non-weak-symbols.patch: ++ - applied a backported patch to fix undefined non-weak symbols. ++ (closes: Bug#187347) ++ * debian/metacity.postinst: ++ - set a priority to 60 for x-window-manager according to the latest ++ policy. ++ ++ -- Akira TAGOH Mon, 19 May 2003 06:30:37 +0900 ++ ++metacity (1:2.4.34-2) unstable; urgency=low ++ ++ * Revert to 2.4.34 to use stable release. ++ - should works now. (closes: Bug#187749, Bug#187387, Bug#187982) ++ * debian/README.Debian: ++ - described NVidia drivers issue. (closes: Bug#181056) ++ * debian/patches/: ++ - 000_metacity-2.4.34-usage.patch: applied it again. ++ - 000_metacity-2.4.34-save-workspace.patch: applied a backported patch ++ from CVS to really fix Bug#186033 in 2.4.34. ++ - 000_metacity-2.5.0-noframe-window.patch: removed. ++ ++ -- Akira TAGOH Mon, 14 Apr 2003 00:29:52 +0900 ++ ++metacity (2.5.0-2) unstable; urgency=low ++ ++ * debian/patches/: ++ - 000_metacity-debian-xinerama-pic.patch: ++ use libXinerama_pic.a instead of libXinerama.a. ++ - 000_metacity-2.5.0-noframe-window.patch: ++ applied a backported patch from CVS to work no frame window. ++ (closes: Bug#187316) ++ * debian/control: ++ - requires xlibs-pic >= 4.2.1-6. ++ ++ -- Akira TAGOH Fri, 4 Apr 2003 04:26:49 +0900 ++ ++metacity (2.5.0-1) unstable; urgency=low ++ ++ * New upsream release. ++ - Workspace names are saved now. (closes: Bug#186033) ++ * debian/control: ++ - bumped Standards-Version to 3.5.9. ++ - changed a section for libmetacity-dev to libdevel. ++ * debian/compat: ++ - use it instead of DH_COMPAT. ++ * debian/patches/ ++ - 000_metacity-2.4.34-usage.patch: removed. ++ ++ -- Akira TAGOH Wed, 2 Apr 2003 00:16:38 +0900 ++ ++metacity (2.4.34-1) unstable; urgency=low ++ ++ * New upstream release. ++ - contains a fix of 64-bit bug. so should be fixed. (closes: Bug#179698) ++ - should be fixed. (closes: Bug#177814) ++ * debian/patches/000_metacity-2.4.34-usage.patch: ++ applied to fix a typo in usage. (closes: Bug#179699) ++ ++ -- Akira TAGOH Fri, 7 Feb 2003 04:38:32 +0900 ++ ++metacity (2.4.21-2) unstable; urgency=low ++ ++ * debian/control: ++ - suggests metacity-properties instead of gnome-control-center. ++ * debian/metacity.docs: ++ - moved from libmetacity0. (closes: Bug#178966) ++ * debian/metacity.postinst: ++ - run gconftool-2 with HOME=/root ++ ++ -- Akira TAGOH Sun, 2 Feb 2003 16:50:02 +0900 ++ ++metacity (2.4.21-1) unstable; urgency=low ++ ++ * New upstream release. ++ * debian/patches/: ++ - 000_metacity-2.4.13-args.patch: removed, because it was merged to the ++ upstream. ++ - 000_metacity-2.4.8-properties.patch: removed. ++ * debian/control: add Suggests: gnome-control-center. ++ * debian/rules: drop --enable-config-dialog. metacity-properties is ++ obsolete. use gnome-window-properties in gnome-control-center instead of. ++ ++ -- Akira TAGOH Wed, 29 Jan 2003 00:39:57 +0900 ++ ++metacity (2.4.13-2) unstable; urgency=low ++ ++ * debian/docs: add NEWS file (closes: Bug#176317) ++ ++ -- Akira TAGOH Tue, 14 Jan 2003 23:15:48 +0900 ++ ++metacity (2.4.13-1) unstable; urgency=low ++ ++ * New upstream release. ++ * debian/control: ++ - updated Build-Depends. ++ - add libgtk2.0-dev to Depends for libmetacity-dev ++ * debian/rules: enable startup-notification. ++ * debian/patches/: ++ - 000_metacity-2.4.8-dont-pass-NULL.patch: ++ removed. ++ - 000_metacity-2.4.13-args.patch: ++ applied to fix the working of configure options. ++ ++ -- Akira TAGOH Sat, 11 Jan 2003 07:06:24 +0900 ++ ++metacity (2.4.8-4) unstable; urgency=low ++ ++ * upstream bug was closed. so it should be fixed. (closes: Bug#152075) ++ * debian/rules: don't use dh_installwm until it will supports the ++ registration of manpage as slave. ++ * debian/metacity.postinst: runs update-alternatives. (closes: Bug#175756) ++ * debian/metacity.prerm: runs update-alternatives. ++ ++ -- Akira TAGOH Thu, 9 Jan 2003 03:40:15 +0900 ++ ++metacity (2.4.8-3) unstable; urgency=low ++ ++ * debian/metacity.postinst: ++ fix the wrong registration. (closes: Bug#173789, Bug#174358) ++ ++ -- Akira TAGOH Fri, 27 Dec 2002 05:01:25 +0900 ++ ++metacity (2.4.8-2) unstable; urgency=low ++ ++ * debian/patches/000_metacity-2.4.8-dont-pass-NULL.patch: ++ applied to fix the segfault at startup. (closes: Bug#173594, Bug#173604) ++ ++ -- Akira TAGOH Fri, 20 Dec 2002 01:08:43 +0900 ++ ++metacity (2.4.8-1) unstable; urgency=low ++ ++ * New upstream release. ++ * debian/patches/000_metacity-2.4.3-stack.patch: ++ removed, because this release contains it. ++ * debian/control: ++ - fix description-synopsis-ends-with-full-stop. ++ - add libmetacity0 and libmetacity-dev ++ * debian/rules: ++ - install metacity-theme.dtd as a sgml catalog. (closes: Bug#170041) ++ - build with --enable-config-dialog until we upload GNOME 2.2. ++ * debian/metacity.postinst: ++ - use gconftool-2 --get-default-source to get GCONF_CONFIG_SOURCE ++ - runs update-catalog. ++ * debian/patches/000_metacity-2.4.8-properties.patch: ++ applied to fix the missing file. ++ ++ -- Akira TAGOH Thu, 12 Dec 2002 09:21:35 +0900 ++ ++metacity (2.4.3-2) unstable; urgency=low ++ ++ * debian/patches/000_metacity-2.4.3-stack.patch: backported to fix the ++ random crashes. (closes: Bug#168653) ++ ++ -- Akira TAGOH Wed, 13 Nov 2002 00:32:14 +0900 ++ ++metacity (2.4.3-1) unstable; urgency=low ++ ++ * New upstream release. (closes: Bug#166919) ++ * debian/rules: support noopt option for DEB_BUILD_OPTIONS. ++ * debian/control: improve a description. Thanks stephen farrell. ++ ++ -- Akira TAGOH Thu, 7 Nov 2002 23:16:47 +0900 ++ ++metacity (2.4.1-1) unstable; urgency=low ++ ++ * New upstream release. (closes: Bug#160535) ++ - Should be fixed. (closes: Bug#157995) ++ * Set a priority to 40 for x-window-manager according to Bug#155680. ++ (closes: Bug#155494) ++ * debian/metacity.1: updated. ++ * debian/metacity-message.1: added. ++ * debian/control: ++ - bumped Standards-Version to 3.5.7. ++ - updated Build-Depends. ++ ++ -- Akira TAGOH Sat, 14 Sep 2002 20:01:35 +0900 ++ ++metacity (2.4.0-1) unstable; urgency=low ++ ++ * New upstream release. ++ - switching the workspaces should works now. (closes: Bug#151500) ++ * debian/control: update Build-Depends for libgtk2.0-dev. ++ ++ -- Akira TAGOH Fri, 9 Aug 2002 02:35:15 +0900 ++ ++metacity (2.3.987-1) unstable; urgency=low ++ ++ * New upstream release. ++ * debian/control: add libglade2-dev to Build-Depends (closes: Bug#149489) ++ ++ -- Akira TAGOH Tue, 11 Jun 2002 14:38:06 +0900 ++ ++metacity (2.3.610-1) unstable; urgency=low ++ ++ * New upstream release. ++ - Should be fixed in this release. (closes: Bug#146127) ++ ++ -- Akira TAGOH Wed, 5 Jun 2002 19:15:41 +0900 ++ ++metacity (2.3.377-2) unstable; urgency=low ++ ++ * debian/docs: includes theme-format.txt (closes: Bug#147644) ++ ++ -- Akira TAGOH Tue, 21 May 2002 19:24:00 +0900 ++ ++metacity (2.3.377-1) unstable; urgency=low ++ ++ * New upstream release. ++ ++ -- Akira TAGOH Tue, 21 May 2002 11:02:28 +0900 ++ ++metacity (2.3.233-2) unstable; urgency=low ++ ++ * debian/control: fix the misleading description. (closes: Bug#145942) ++ ++ -- Akira TAGOH Tue, 7 May 2002 14:29:36 +0900 ++ ++metacity (2.3.233-1) unstable; urgency=low ++ ++ * New upstream release. ++ ++ -- Akira TAGOH Sun, 5 May 2002 03:21:05 +0900 ++ ++metacity (2.3.144-2) unstable; urgency=low ++ ++ * debian/control: Add Provides: x-window-manager. ++ ++ -- Akira TAGOH Fri, 3 May 2002 07:31:17 +0900 ++ ++metacity (2.3.144-1) unstable; urgency=low ++ ++ * New upstream release. ++ - keybindings are configurable now. (closes: Bug#144657) ++ ++ -- Akira TAGOH Tue, 30 Apr 2002 03:32:36 +0900 ++ ++metacity (2.3.89-1) unstable; urgency=low ++ ++ * New upstream release. ++ * debian/scripts/vars.build: fix bashism. ++ * debian/rules: add GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=yes to install ++ rule. ++ * debian/metacity.manpages: remove metacity-restart.1 entry. this command ++ no longer exists. ++ ++ -- Akira TAGOH Tue, 16 Apr 2002 21:35:19 +0900 ++ ++metacity (2.3.55-1) unstable; urgency=low ++ ++ * I have taken over from Thom. ++ * New upstream release. ++ * Build against the latest libraries (closes: Bug#139215) ++ * debian/rules: ++ - support DEB_HOST_GNU_TYPE and DEB_BUILD_GNU_TYPE. ++ - support debug and nostrip options for DEB_BUILD_OPTIONS. ++ - copying the latest config.sub and config.guess. ++ ++ -- Akira TAGOH Tue, 26 Mar 2002 02:18:26 +0900 ++ ++metacity (2.3.34-2) unstable; urgency=low ++ ++ * Added build-depend on docbook-to-man (Closes: #134433) ++ ++ -- Thom May Sun, 17 Feb 2002 20:14:28 +0000 ++ ++metacity (2.3.34-1) unstable; urgency=low ++ ++ * Initial Release. (Closes: #107181) ++ ++ -- Thom May Sun, 10 Feb 2002 12:03:22 +0000 ++ diff --cc debian/compat index 0000000,0000000..f599e28 new file mode 100644 --- /dev/null +++ b/debian/compat @@@ -1,0 -1,0 +1,1 @@@ ++10 diff --cc debian/control index 0000000,0000000..096fe8c new file mode 100644 --- /dev/null +++ b/debian/control @@@ -1,0 -1,0 +1,183 @@@ ++# This file is autogenerated. DO NOT EDIT! ++# ++# Modifications should be made to debian/control.in instead. ++# This file is regenerated automatically in the clean target. ++Source: mutter ++Section: x11 ++Priority: optional ++Maintainer: Debian GNOME Maintainers ++Uploaders: Iain Lane , Jeremy Bicha ++Build-Depends: debhelper (>= 10), ++ gnome-pkg-tools (>= 0.10), ++ gtk-doc-tools (>= 1.15), ++ libgtk-3-dev (>= 3.19.8), ++ libglib2.0-dev (>= 2.53.2), ++ libcanberra-gtk3-dev, ++ gobject-introspection (>= 1.41.3), ++ gsettings-desktop-schemas-dev (>= 3.21.4), ++ libgirepository1.0-dev (>= 0.9.12), ++ libjson-glib-dev (>= 0.13.2-1~), ++ libgbm-dev (>= 10.3), ++ libpango1.0-dev (>= 1.2.0), ++ libcairo2-dev (>= 1.10.0), ++ libgl1-mesa-dev (>= 7.1~rc3-1~), ++ libdrm-dev [!hurd-any], ++ libegl1-mesa-dev (>= 17), ++ libgnome-desktop-3-dev (>= 3.21.2), ++ libgudev-1.0-dev (>= 232) [linux-any], ++ libinput-dev [linux-any], ++ libstartup-notification0-dev (>= 0.7), ++ libsystemd-dev (>= 212) [linux-any], ++ libupower-glib-dev (>= 0.99.0), ++ libwacom-dev (>= 0.13) [linux-any], ++ libxcb-randr0-dev, ++ libxcb-res0-dev, ++ libxcomposite-dev (>= 1:0.2), ++ libxi-dev (>= 2:1.6.0), ++ libxkbfile-dev, ++ libxkbcommon-x11-dev, ++ libxkbcommon-dev (>= 0.4.3), ++ libx11-xcb-dev, ++ libxfixes-dev, ++ libxdamage-dev, ++ libxcursor-dev, ++ libxt-dev, ++ libx11-dev, ++ libxinerama-dev, ++ libxext-dev, ++ libxrandr-dev, ++ libxrender-dev, ++ libsm-dev, ++ libice-dev, ++ libpam0g-dev, ++ libwayland-dev (>= 1.13.0) [linux-any], ++ wayland-protocols (>= 1.9) [linux-any], ++ xkb-data, ++ xvfb , ++ xauth , ++ zenity ++Standards-Version: 4.1.1 ++Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/mutter ++Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/mutter ++ ++Package: mutter ++Architecture: any ++Depends: ${shlibs:Depends}, ++ ${misc:Depends}, ++ mutter-common (>= ${source:Version}), ++ gnome-settings-daemon, ++ gsettings-desktop-schemas (>= 3.21.4), ++ zenity ++Provides: x-window-manager ++Suggests: gnome-control-center (>= 1:3.25.2), ++ xdg-user-dirs ++Description: lightweight GTK+ window manager ++ Mutter is a small window manager, using GTK+ and Clutter to do ++ everything. ++ . ++ Mutter is the clutter-based evolution of Metacity, which, as the ++ author says, is a "Boring window manager for the adult in you. Many ++ window managers are like Marshmallow Froot Loops; Metacity is like ++ Cheerios." ++ . ++ This package contains the core binaries. ++ ++Package: libmutter-1-0 ++Section: libs ++Architecture: any ++Multi-Arch: same ++Pre-Depends: ${misc:Pre-Depends} ++Depends: ${shlibs:Depends}, ++ ${misc:Depends}, ++ gsettings-desktop-schemas (>= 3.15.92), ++ mutter-common (>= ${source:Version}) ++Breaks: gnome-control-center (<< 1:3.25.2) ++Description: window manager library from the Mutter window manager ++ Mutter is a small window manager, using GTK+ and Clutter to do ++ everything. ++ . ++ Mutter is the clutter-based evolution of Metacity, which, as the ++ author says, is a "Boring window manager for the adult in you. Many ++ window managers are like Marshmallow Froot Loops; Metacity is like ++ Cheerios." ++ . ++ This package contains the window manager shared library, used by mutter ++ itself, and gnome-shell. ++ ++Package: mutter-common ++Section: misc ++Architecture: all ++Multi-Arch: foreign ++Depends: ${misc:Depends} ++Description: shared files for the Mutter window manager ++ Mutter is a small window manager, using GTK+ and Clutter to do ++ everything. ++ . ++ Mutter is the clutter-based evolution of Metacity, which, as the ++ author says, is a "Boring window manager for the adult in you. Many ++ window managers are like Marshmallow Froot Loops; Metacity is like ++ Cheerios." ++ . ++ This package contains the shared files. ++ ++Package: libmutter-1-dev ++Section: libdevel ++Architecture: any ++Multi-Arch: same ++Depends: ${misc:Depends}, ++ libmutter-1-0 (= ${binary:Version}), ++ gir1.2-mutter-1 (= ${binary:Version}), ++ gsettings-desktop-schemas-dev, ++ libgtk-3-dev, ++ libcairo2-dev, ++ libglib2.0-dev, ++ libatk1.0-dev, ++ libpango1.0-dev, ++ libjson-glib-dev, ++ libegl1-mesa-dev, ++ libwayland-dev, ++ libdrm-dev, ++ libgbm-dev, ++ libinput-dev (>= 1.4), ++ libudev-dev, ++ libx11-dev, ++ libxext-dev, ++ libxdamage-dev, ++ libxcomposite-dev, ++ libxi-dev, ++ libgdk-pixbuf2.0-dev, ++ libxfixes-dev, ++ libxrandr-dev, ++ libx11-dev ++Conflicts: libmutter-0-dev ++Description: Development files for the Mutter window manager ++ Mutter is a small window manager, using GTK+ and Clutter to do ++ everything. ++ . ++ Mutter is the clutter-based evolution of Metacity, which, as the ++ author says, is a "Boring window manager for the adult in you. Many ++ window managers are like Marshmallow Froot Loops; Metacity is like ++ Cheerios." ++ . ++ This package contains the development files. ++ ++Package: gir1.2-mutter-1 ++Section: introspection ++Architecture: any ++Multi-Arch: same ++Depends: ${gir:Depends}, ++ ${shlibs:Depends}, ++ ${misc:Depends}, ++ libmutter-1-0 (= ${binary:Version}) ++Breaks: gnome-shell (<< 3.13.92~) ++Description: GObject introspection data for Mutter ++ Mutter is a small window manager, using GTK+ and Clutter to do ++ everything. ++ . ++ Mutter is the clutter-based evolution of Metacity, which, as the ++ author says, is a "Boring window manager for the adult in you. Many ++ window managers are like Marshmallow Froot Loops; Metacity is like ++ Cheerios." ++ . ++ This package contains the GObject introspection data which may be ++ used to generate dynamic bindings. diff --cc debian/control.in index 0000000,0000000..8664288 new file mode 100644 --- /dev/null +++ b/debian/control.in @@@ -1,0 -1,0 +1,179 @@@ ++Source: mutter ++Section: x11 ++Priority: optional ++Maintainer: Debian GNOME Maintainers ++Uploaders: @GNOME_TEAM@ ++Build-Depends: debhelper (>= 10), ++ gnome-pkg-tools (>= 0.10), ++ gtk-doc-tools (>= 1.15), ++ libgtk-3-dev (>= 3.19.8), ++ libglib2.0-dev (>= 2.53.2), ++ libcanberra-gtk3-dev, ++ gobject-introspection (>= 1.41.3), ++ gsettings-desktop-schemas-dev (>= 3.21.4), ++ libgirepository1.0-dev (>= 0.9.12), ++ libjson-glib-dev (>= 0.13.2-1~), ++ libgbm-dev (>= 10.3), ++ libpango1.0-dev (>= 1.2.0), ++ libcairo2-dev (>= 1.10.0), ++ libgl1-mesa-dev (>= 7.1~rc3-1~), ++ libdrm-dev [!hurd-any], ++ libegl1-mesa-dev (>= 17), ++ libgnome-desktop-3-dev (>= 3.21.2), ++ libgudev-1.0-dev (>= 232) [linux-any], ++ libinput-dev [linux-any], ++ libstartup-notification0-dev (>= 0.7), ++ libsystemd-dev (>= 212) [linux-any], ++ libupower-glib-dev (>= 0.99.0), ++ libwacom-dev (>= 0.13) [linux-any], ++ libxcb-randr0-dev, ++ libxcb-res0-dev, ++ libxcomposite-dev (>= 1:0.2), ++ libxi-dev (>= 2:1.6.0), ++ libxkbfile-dev, ++ libxkbcommon-x11-dev, ++ libxkbcommon-dev (>= 0.4.3), ++ libx11-xcb-dev, ++ libxfixes-dev, ++ libxdamage-dev, ++ libxcursor-dev, ++ libxt-dev, ++ libx11-dev, ++ libxinerama-dev, ++ libxext-dev, ++ libxrandr-dev, ++ libxrender-dev, ++ libsm-dev, ++ libice-dev, ++ libpam0g-dev, ++ libwayland-dev (>= 1.13.0) [linux-any], ++ wayland-protocols (>= 1.9) [linux-any], ++ xkb-data, ++ xvfb , ++ xauth , ++ zenity ++Standards-Version: 4.1.1 ++Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/mutter ++Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/mutter ++ ++Package: mutter ++Architecture: any ++Depends: ${shlibs:Depends}, ++ ${misc:Depends}, ++ mutter-common (>= ${source:Version}), ++ gnome-settings-daemon, ++ gsettings-desktop-schemas (>= 3.21.4), ++ zenity ++Provides: x-window-manager ++Suggests: gnome-control-center (>= 1:3.25.2), ++ xdg-user-dirs ++Description: lightweight GTK+ window manager ++ Mutter is a small window manager, using GTK+ and Clutter to do ++ everything. ++ . ++ Mutter is the clutter-based evolution of Metacity, which, as the ++ author says, is a "Boring window manager for the adult in you. Many ++ window managers are like Marshmallow Froot Loops; Metacity is like ++ Cheerios." ++ . ++ This package contains the core binaries. ++ ++Package: libmutter-1-0 ++Section: libs ++Architecture: any ++Multi-Arch: same ++Pre-Depends: ${misc:Pre-Depends} ++Depends: ${shlibs:Depends}, ++ ${misc:Depends}, ++ gsettings-desktop-schemas (>= 3.15.92), ++ mutter-common (>= ${source:Version}) ++Breaks: gnome-control-center (<< 1:3.25.2) ++Description: window manager library from the Mutter window manager ++ Mutter is a small window manager, using GTK+ and Clutter to do ++ everything. ++ . ++ Mutter is the clutter-based evolution of Metacity, which, as the ++ author says, is a "Boring window manager for the adult in you. Many ++ window managers are like Marshmallow Froot Loops; Metacity is like ++ Cheerios." ++ . ++ This package contains the window manager shared library, used by mutter ++ itself, and gnome-shell. ++ ++Package: mutter-common ++Section: misc ++Architecture: all ++Multi-Arch: foreign ++Depends: ${misc:Depends} ++Description: shared files for the Mutter window manager ++ Mutter is a small window manager, using GTK+ and Clutter to do ++ everything. ++ . ++ Mutter is the clutter-based evolution of Metacity, which, as the ++ author says, is a "Boring window manager for the adult in you. Many ++ window managers are like Marshmallow Froot Loops; Metacity is like ++ Cheerios." ++ . ++ This package contains the shared files. ++ ++Package: libmutter-1-dev ++Section: libdevel ++Architecture: any ++Multi-Arch: same ++Depends: ${misc:Depends}, ++ libmutter-1-0 (= ${binary:Version}), ++ gir1.2-mutter-1 (= ${binary:Version}), ++ gsettings-desktop-schemas-dev, ++ libgtk-3-dev, ++ libcairo2-dev, ++ libglib2.0-dev, ++ libatk1.0-dev, ++ libpango1.0-dev, ++ libjson-glib-dev, ++ libegl1-mesa-dev, ++ libwayland-dev, ++ libdrm-dev, ++ libgbm-dev, ++ libinput-dev (>= 1.4), ++ libudev-dev, ++ libx11-dev, ++ libxext-dev, ++ libxdamage-dev, ++ libxcomposite-dev, ++ libxi-dev, ++ libgdk-pixbuf2.0-dev, ++ libxfixes-dev, ++ libxrandr-dev, ++ libx11-dev ++Conflicts: libmutter-0-dev ++Description: Development files for the Mutter window manager ++ Mutter is a small window manager, using GTK+ and Clutter to do ++ everything. ++ . ++ Mutter is the clutter-based evolution of Metacity, which, as the ++ author says, is a "Boring window manager for the adult in you. Many ++ window managers are like Marshmallow Froot Loops; Metacity is like ++ Cheerios." ++ . ++ This package contains the development files. ++ ++Package: gir1.2-mutter-1 ++Section: introspection ++Architecture: any ++Multi-Arch: same ++Depends: ${gir:Depends}, ++ ${shlibs:Depends}, ++ ${misc:Depends}, ++ libmutter-1-0 (= ${binary:Version}) ++Breaks: gnome-shell (<< 3.13.92~) ++Description: GObject introspection data for Mutter ++ Mutter is a small window manager, using GTK+ and Clutter to do ++ everything. ++ . ++ Mutter is the clutter-based evolution of Metacity, which, as the ++ author says, is a "Boring window manager for the adult in you. Many ++ window managers are like Marshmallow Froot Loops; Metacity is like ++ Cheerios." ++ . ++ This package contains the GObject introspection data which may be ++ used to generate dynamic bindings. diff --cc debian/copyright index 0000000,0000000..ed9f698 new file mode 100644 --- /dev/null +++ b/debian/copyright @@@ -1,0 -1,0 +1,89 @@@ ++This package was debianized by Thom May on ++Sun, 10 Feb 2002 12:03:22 +0000. ++ ++It was downloaded from https://download.gnome.org/sources/mutter/ ++ ++Upstream Author: Havoc Pennington ++ ++Copyright: ++ Copyright © 2001-2008 Havoc Pennington, Red Hat, Inc., and others ++ Copyright © 2002 The Gnome Foundation ++ Copyright © 2007 The GNOME Project ++ Copyright © 2002 Ross Burton ++ Copyright © 2004-2006 Elijah Newren ++ Copyright © 2001 Dominik Vogt, Matthias Clasen, and fvwm2 team ++ Copyright © 2003-2004 Rob Adams ++ Copyright © 2002 Sun Microsystems, Inc. ++ Copyright © 1986-1998 The Open Group ++ Copyright © 1987 Digital Equipment Corporation ++ Copyright © 2001 Anders Carlsson ++ Copyright © 2008 Thomas Thurman ++ Copyright © 1995-2000 GTK+ Team ++ Copyright © 1988 Wyse Technology, Inc., ++ Copyright © 2008 Iain Holmes ++ Copyright © 2000-2001 Eazel, Inc. ++ Copyright © 2001 Ximian, Inc. ++ Copyright © 2002 Gaute Lindkvist ++ Copyright © 2002 James M. Cape ++ Copyright © 2002 Garrett LeSage ++ Copyright © 2002 Tuomas Kuosmanen ++ Copyright © 2002 Jorn Baayen ++ Copyright © 1997-2000 Dan Pascu and Alfredo Kojima ++ Copyright © 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald ++ Copyright © 1998 Tim Janik ++ Copyright © 1999-2007 Free Software Foundation, Inc. ++ Copyright © 1995-1997 Ulrich Drepper ++ Copyright © 1994 X Consortium ++ Copyright © 2004-2008 Rodney Dawes ++ Copyright © 2004 Scott James Remnant ++ Copyright © 2002 Simos Xenitellis ++ Copyright © 2003-2006 Miloslav Trmac ++ Copyright © 2008 GNOME i18n Project for Vietnamese ++ Copyright © 2003-2006 Sharif FarsiWeb, Inc. ++ Copyright © 2003 Åsmund Skjæveland. ++ Copyright © 2005-2006 Canonical Ltd. and Rosetta Contributors ++ Copyright © 2004-2006 Adam Weinberger and the GNOME Foundation ++ Copyright © 2004 Kakilik Project ++ Copyright © Croatiann team ++ Copyright © 2007-2008 OpenedHand ++ Copyright © 2008-2009 Intel Corporation ++ Copyright © 2008 Matthew Allum ++ ++License: ++ ++ This package is free software; you can redistribute it and/or modify ++ it under the terms of the GNU General Public License as published by ++ the Free Software Foundation; either version 2 of the License, or ++ (at your option) any later version. ++ ++ This package is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this package; if not, write to the Free Software ++ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ++ ++On Debian systems, the complete text of the GNU General ++Public License can be found in `/usr/share/common-licenses/GPL'. ++ ++Files: src/ui/metaaccellabel.c src/ui/metaaccellabel.h ++License: ++ This library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2 of the License, or (at your option) any later version. ++ ++ This library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with this library; if not, write to the ++ Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, ++ Boston, MA 02110-1301 USA ++ ++On Debian systems, the complete text of the GNU General ++Public License can be found in `/usr/share/common-licenses/LGPL'. diff --cc debian/gir1.2-mutter-1.install index 0000000,0000000..c44ed04 new file mode 100644 --- /dev/null +++ b/debian/gir1.2-mutter-1.install @@@ -1,0 -1,0 +1,1 @@@ ++usr/lib/*/mutter/*.typelib diff --cc debian/libmutter-1-0.install index 0000000,0000000..d20633f new file mode 100644 --- /dev/null +++ b/debian/libmutter-1-0.install @@@ -1,0 -1,0 +1,2 @@@ ++usr/lib/*/libmutter-1.so.* ++usr/lib/*/mutter/*.so diff --cc debian/libmutter-1-dev.install index 0000000,0000000..91a880d new file mode 100644 --- /dev/null +++ b/debian/libmutter-1-dev.install @@@ -1,0 -1,0 +1,4 @@@ ++usr/include ++usr/lib/*/lib*.so ++usr/lib/*/pkgconfig/*.pc ++usr/lib/*/mutter/*.gir diff --cc debian/mutter-common.install index 0000000,0000000..132e43b new file mode 100644 --- /dev/null +++ b/debian/mutter-common.install @@@ -1,0 -1,0 +1,5 @@@ ++usr/share/GConf ++usr/share/glib-2.0 ++usr/share/locale ++usr/share/man ++usr/share/gnome-control-center diff --cc debian/mutter.install index 0000000,0000000..e38228f new file mode 100644 --- /dev/null +++ b/debian/mutter.install @@@ -1,0 -1,0 +1,4 @@@ ++usr/bin ++usr/lib/mutter/mutter-restart-helper ++usr/lib/*/mutter/plugins ++usr/share/applications diff --cc debian/mutter.postinst index 0000000,0000000..0dc0097 new file mode 100644 --- /dev/null +++ b/debian/mutter.postinst @@@ -1,0 -1,0 +1,16 @@@ ++#!/bin/sh ++ ++set -e ++ ++action="$1" ++ ++if [ "$action" = configure ]; then ++ # register the alternatives of x-window-manager manually ++ # because dh_installwm doesn't register manpage as slave yet. ++ update-alternatives --install /usr/bin/x-window-manager \ ++ x-window-manager /usr/bin/mutter 60 \ ++ --slave /usr/share/man/man1/x-window-manager.1.gz \ ++ x-window-manager.1.gz /usr/share/man/man1/mutter.1.gz ++fi ++ ++#DEBHELPER# diff --cc debian/mutter.prerm index 0000000,0000000..8256c42 new file mode 100644 --- /dev/null +++ b/debian/mutter.prerm @@@ -1,0 -1,0 +1,12 @@@ ++#!/bin/sh ++ ++set -e ++ ++action="$1" ++ ++if [ "$action" = remove ]; then ++ update-alternatives --remove x-window-manager \ ++ /usr/bin/mutter ++fi ++ ++#DEBHELPER# diff --cc debian/patches/0001-wayland-dma-buf-Don-t-send-modifiers-to-old-clients.patch index 0000000,0000000..e963dc3 new file mode 100644 --- /dev/null +++ b/debian/patches/0001-wayland-dma-buf-Don-t-send-modifiers-to-old-clients.patch @@@ -1,0 -1,0 +1,45 @@@ ++From edfd15b32daca9fef707a25bf312441349506b05 Mon Sep 17 00:00:00 2001 ++From: Daniel Stone ++Date: Mon, 2 Oct 2017 16:46:17 +0100 ++Subject: [PATCH 01/11] wayland-dma-buf: Don't send modifiers to old clients ++ ++The modifier event was only added in v3 of the client; sending it to ++older clients (e.g. GStreamer waylandsink) causes them to disconnect ++immediately. ++ ++Send the older 'format' event to all clients, and only send the newer ++'modifier' event to resource versions 3 or above. ++ ++https://bugzilla.gnome.org/show_bug.cgi?id=788558 ++--- ++ src/wayland/meta-wayland-dma-buf.c | 9 ++++++++- ++ 1 file changed, 8 insertions(+), 1 deletion(-) ++ ++diff --git a/src/wayland/meta-wayland-dma-buf.c b/src/wayland/meta-wayland-dma-buf.c ++index e5d2f7c35..76b8aa219 100644 ++--- a/src/wayland/meta-wayland-dma-buf.c +++++ b/src/wayland/meta-wayland-dma-buf.c ++@@ -473,12 +473,19 @@ send_modifiers (struct wl_resource *resource, ++ gboolean ret; ++ int i; ++ +++ zwp_linux_dmabuf_v1_send_format (resource, format); +++ +++ /* The modifier event was only added in v3; v1 and v2 only have the format +++ * event. */ +++ if (wl_resource_get_version (resource) < ZWP_LINUX_DMABUF_V1_MODIFIER_SINCE_VERSION) +++ return; +++ ++ /* First query the number of available modifiers, then allocate an array, ++ * then fill the array. */ ++ ret = meta_egl_query_dma_buf_modifiers (egl, egl_display, format, 0, NULL, ++ NULL, &num_modifiers, NULL); ++ if (!ret || num_modifiers == 0) ++- return; +++ return; ++ ++ modifiers = g_new0 (uint64_t, num_modifiers); ++ ret = meta_egl_query_dma_buf_modifiers (egl, egl_display, format, ++-- ++2.14.1 ++ diff --cc debian/patches/0006-x11-Protect-XChangeProperty-call-with-error-traps.patch index 0000000,0000000..4393876 new file mode 100644 --- /dev/null +++ b/debian/patches/0006-x11-Protect-XChangeProperty-call-with-error-traps.patch @@@ -1,0 -1,0 +1,33 @@@ ++Description: [PATCH] x11: Protect XChangeProperty call with error traps ++ When closing maximized window of any GTK app gnome-shell and ++ budgie desktop crashes and restarts. This issue specifically affects ++ users of the gnome-shell xorg session together with all budgie desktop ++ users. ++Author: polygamma ++Origin: upstream commit f9c625924e5358afd3e47733e68d166770edd496 ++Bug: https://bugzilla.gnome.org/show_bug.cgi?id=788666 ++Bug-Ubuntu: https://launchpad.net/bugs/1722510 ++Last-Update: 2017-10-09 ++ ++--- ++ src/x11/window-x11.c | 2 ++ ++ 1 file changed, 2 insertions(+) ++ ++diff --git a/src/x11/window-x11.c b/src/x11/window-x11.c ++index 36a5e70a3..4885f5fea 100644 ++--- a/src/x11/window-x11.c +++++ b/src/x11/window-x11.c ++@@ -920,11 +920,13 @@ update_gtk_edge_constraints (MetaWindow *window) ++ ++ meta_verbose ("Setting _GTK_EDGE_CONSTRAINTS to %lu\n", data[0]); ++ +++ meta_error_trap_push (window->display); ++ XChangeProperty (window->display->xdisplay, ++ window->xwindow, ++ window->display->atom__GTK_EDGE_CONSTRAINTS, ++ XA_CARDINAL, 32, PropModeReplace, ++ (guchar*) data, 1); +++ meta_error_trap_pop (window->display); ++ } ++ ++ static gboolean diff --cc debian/patches/0007-settings-Get-UI-scaling-factor-from-primary-logical-.patch index 0000000,0000000..5403a39 new file mode 100644 --- /dev/null +++ b/debian/patches/0007-settings-Get-UI-scaling-factor-from-primary-logical-.patch @@@ -1,0 -1,0 +1,52 @@@ ++From 65d3e479875348978d0137e9913f19fa8b0174d9 Mon Sep 17 00:00:00 2001 ++From: =?UTF-8?q?Jonas=20=C3=85dahl?= ++Date: Wed, 11 Oct 2017 17:55:50 +0800 ++Subject: [PATCH 07/11] settings: Get UI scaling factor from primary logical ++ monitor ++ ++Don't use MAX(logical monitor scales) to determine the UI scaling ++factor, just use the primary logical monitor. That's where the shell UI ++will most likely be. ++ ++https://bugzilla.gnome.org/show_bug.cgi?id=788820 ++--- ++ src/backends/meta-settings.c | 21 ++++++--------------- ++ 1 file changed, 6 insertions(+), 15 deletions(-) ++ ++diff --git a/src/backends/meta-settings.c b/src/backends/meta-settings.c ++index cf66334f1..73741fd5a 100644 ++--- a/src/backends/meta-settings.c +++++ b/src/backends/meta-settings.c ++@@ -67,23 +67,14 @@ calculate_ui_scaling_factor (MetaSettings *settings) ++ { ++ MetaMonitorManager *monitor_manager = ++ meta_backend_get_monitor_manager (settings->backend); ++- GList *logical_monitors; ++- GList *l; ++- float max_scale = 1.0; +++ MetaLogicalMonitor *primary_logical_monitor; ++ ++- logical_monitors = ++- meta_monitor_manager_get_logical_monitors (monitor_manager); ++- for (l = logical_monitors; l; l = l->next) ++- { ++- MetaLogicalMonitor *logical_monitor = l->data; ++- ++- max_scale = MAX (meta_logical_monitor_get_scale (logical_monitor), ++- max_scale); ++- } ++- ++- g_warn_if_fail (fmodf (max_scale, 1.0) == 0.0); +++ primary_logical_monitor = +++ meta_monitor_manager_get_primary_logical_monitor (monitor_manager); +++ if (!primary_logical_monitor) +++ return 1; ++ ++- return (int) max_scale; +++ return (int) meta_logical_monitor_get_scale (primary_logical_monitor); ++ } ++ ++ static gboolean ++-- ++2.14.1 ++ diff --cc debian/patches/0008-backends-add-monitors-updated-internal-signal-to-onl.patch index 0000000,0000000..b573f61 new file mode 100644 --- /dev/null +++ b/debian/patches/0008-backends-add-monitors-updated-internal-signal-to-onl.patch @@@ -1,0 -1,0 +1,220 @@@ ++From 0a3549da0658e46811aab5051d58526b3a578443 Mon Sep 17 00:00:00 2001 ++From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= ++Date: Thu, 12 Oct 2017 19:14:40 -0500 ++Subject: [PATCH 08/11] backends: add 'monitors-updated-internal' signal to ++ only update internal state ++ ++Adding an internal signal and use it to update the internal state before ++emitting "monitors-changed" which will be repeated by the screen to the world. ++ ++https://bugzilla.gnome.org/show_bug.cgi?id=788860 ++--- ++ src/backends/meta-backend.c | 2 -- ++ src/backends/meta-input-settings.c | 2 +- ++ src/backends/meta-monitor-manager.c | 11 +++++++++++ ++ src/backends/meta-screen-cast-monitor-stream.c | 2 +- ++ src/backends/meta-settings.c | 14 ++++++++++++++ ++ src/backends/native/meta-cursor-renderer-native.c | 2 +- ++ src/backends/x11/meta-backend-x11.c | 2 +- ++ src/core/screen.c | 18 ++++++++++++++---- ++ src/wayland/meta-wayland-outputs.c | 2 +- ++ 9 files changed, 44 insertions(+), 11 deletions(-) ++ ++diff --git a/src/backends/meta-backend.c b/src/backends/meta-backend.c ++index faa8d6fdc..89d47eb80 100644 ++--- a/src/backends/meta-backend.c +++++ b/src/backends/meta-backend.c ++@@ -196,8 +196,6 @@ meta_backend_monitors_changed (MetaBackend *backend) ++ priv->is_pointer_position_initialized = TRUE; ++ } ++ } ++- ++- meta_settings_update_ui_scaling_factor (priv->settings); ++ } ++ ++ void ++diff --git a/src/backends/meta-input-settings.c b/src/backends/meta-input-settings.c ++index d6c7b57b6..065875552 100644 ++--- a/src/backends/meta-input-settings.c +++++ b/src/backends/meta-input-settings.c ++@@ -1617,7 +1617,7 @@ meta_input_settings_init (MetaInputSettings *settings) ++ g_hash_table_new_full (NULL, NULL, NULL, (GDestroyNotify) device_mapping_info_free); ++ ++ priv->monitor_manager = g_object_ref (meta_monitor_manager_get ()); ++- g_signal_connect (priv->monitor_manager, "monitors-changed", +++ g_signal_connect (priv->monitor_manager, "monitors-changed-internal", ++ G_CALLBACK (monitors_changed_cb), settings); ++ ++ #ifdef HAVE_LIBWACOM ++diff --git a/src/backends/meta-monitor-manager.c b/src/backends/meta-monitor-manager.c ++index 2caec1b57..fd2aca969 100644 ++--- a/src/backends/meta-monitor-manager.c +++++ b/src/backends/meta-monitor-manager.c ++@@ -46,6 +46,7 @@ ++ #define DEFAULT_DISPLAY_CONFIGURATION_TIMEOUT 20 ++ ++ enum { +++ MONITORS_CHANGED_INTERNAL, ++ CONFIRM_DISPLAY_CHANGE, ++ SIGNALS_LAST ++ }; ++@@ -851,6 +852,14 @@ meta_monitor_manager_class_init (MetaMonitorManagerClass *klass) ++ klass->read_edid = meta_monitor_manager_real_read_edid; ++ klass->is_lid_closed = meta_monitor_manager_real_is_lid_closed; ++ +++ signals[MONITORS_CHANGED_INTERNAL] = +++ g_signal_new ("monitors-changed-internal", +++ G_TYPE_FROM_CLASS (object_class), +++ G_SIGNAL_RUN_LAST, +++ 0, +++ NULL, NULL, NULL, +++ G_TYPE_NONE, 0); +++ ++ signals[CONFIRM_DISPLAY_CHANGE] = ++ g_signal_new ("confirm-display-change", ++ G_TYPE_FROM_CLASS (object_class), ++@@ -2574,6 +2583,8 @@ meta_monitor_manager_notify_monitors_changed (MetaMonitorManager *manager) ++ manager->current_switch_config = META_MONITOR_SWITCH_CONFIG_UNKNOWN; ++ ++ meta_backend_monitors_changed (backend); +++ +++ g_signal_emit (manager, signals[MONITORS_CHANGED_INTERNAL], 0); ++ g_signal_emit_by_name (manager, "monitors-changed"); ++ } ++ ++diff --git a/src/backends/meta-screen-cast-monitor-stream.c b/src/backends/meta-screen-cast-monitor-stream.c ++index ece7efcdd..853090a43 100644 ++--- a/src/backends/meta-screen-cast-monitor-stream.c +++++ b/src/backends/meta-screen-cast-monitor-stream.c ++@@ -130,7 +130,7 @@ meta_screen_cast_monitor_stream_new (GDBusConnection *connection, ++ ++ monitor_stream->stage = stage; ++ ++- g_signal_connect_object (monitor_manager, "monitors-changed", +++ g_signal_connect_object (monitor_manager, "monitors-changed-internal", ++ G_CALLBACK (on_monitors_changed), ++ monitor_stream, 0); ++ ++diff --git a/src/backends/meta-settings.c b/src/backends/meta-settings.c ++index 73741fd5a..cb22bf33c 100644 ++--- a/src/backends/meta-settings.c +++++ b/src/backends/meta-settings.c ++@@ -343,11 +343,25 @@ meta_settings_init (MetaSettings *settings) ++ update_experimental_features (settings); ++ } ++ +++static void +++on_monitors_changed (MetaMonitorManager *monitor_manager, +++ MetaSettings *settings) +++{ +++ meta_settings_update_ui_scaling_factor (settings); +++} +++ ++ void ++ meta_settings_post_init (MetaSettings *settings) ++ { +++ MetaMonitorManager *monitor_manager = +++ meta_backend_get_monitor_manager (settings->backend); +++ ++ update_ui_scaling_factor (settings); ++ update_font_dpi (settings); +++ +++ g_signal_connect_object (monitor_manager, "monitors-changed-internal", +++ G_CALLBACK (on_monitors_changed), +++ settings, G_CONNECT_AFTER); ++ } ++ ++ static void ++diff --git a/src/backends/native/meta-cursor-renderer-native.c b/src/backends/native/meta-cursor-renderer-native.c ++index 72276ebe2..9b2c03aaa 100644 ++--- a/src/backends/native/meta-cursor-renderer-native.c +++++ b/src/backends/native/meta-cursor-renderer-native.c ++@@ -850,7 +850,7 @@ meta_cursor_renderer_native_init (MetaCursorRendererNative *native) ++ MetaMonitorManager *monitors; ++ ++ monitors = meta_monitor_manager_get (); ++- g_signal_connect_object (monitors, "monitors-changed", +++ g_signal_connect_object (monitors, "monitors-changed-internal", ++ G_CALLBACK (on_monitors_changed), native, 0); ++ ++ priv->hw_state_invalidated = TRUE; ++diff --git a/src/backends/x11/meta-backend-x11.c b/src/backends/x11/meta-backend-x11.c ++index 2c49690d7..233532435 100644 ++--- a/src/backends/x11/meta-backend-x11.c +++++ b/src/backends/x11/meta-backend-x11.c ++@@ -454,7 +454,7 @@ meta_backend_x11_post_init (MetaBackend *backend) ++ META_BACKEND_CLASS (meta_backend_x11_parent_class)->post_init (backend); ++ ++ monitor_manager = meta_backend_get_monitor_manager (backend); ++- g_signal_connect (monitor_manager, "monitors-changed", +++ g_signal_connect (monitor_manager, "monitors-changed-internal", ++ G_CALLBACK (on_monitors_changed), backend); ++ } ++ ++diff --git a/src/core/screen.c b/src/core/screen.c ++index 890002340..be4394349 100644 ++--- a/src/core/screen.c +++++ b/src/core/screen.c ++@@ -73,8 +73,10 @@ static void prefs_changed_callback (MetaPreference pref, ++ static void set_desktop_geometry_hint (MetaScreen *screen); ++ static void set_desktop_viewport_hint (MetaScreen *screen); ++ ++-static void on_monitors_changed (MetaMonitorManager *manager, ++- MetaScreen *screen); +++static void on_monitors_changed_internal (MetaMonitorManager *manager, +++ MetaScreen *screen); +++static void on_monitors_changed (MetaMonitorManager *manager, +++ MetaScreen *screen); ++ ++ enum ++ { ++@@ -710,6 +712,8 @@ meta_screen_new (MetaDisplay *display, ++ screen->rect.x = screen->rect.y = 0; ++ ++ manager = meta_monitor_manager_get (); +++ g_signal_connect (manager, "monitors-changed-internal", +++ G_CALLBACK (on_monitors_changed_internal), screen); ++ g_signal_connect (manager, "monitors-changed", ++ G_CALLBACK (on_monitors_changed), screen); ++ ++@@ -2266,8 +2270,8 @@ meta_screen_resize_func (MetaWindow *window, ++ } ++ ++ static void ++-on_monitors_changed (MetaMonitorManager *manager, ++- MetaScreen *screen) +++on_monitors_changed_internal (MetaMonitorManager *manager, +++ MetaScreen *screen) ++ { ++ MetaBackend *backend; ++ MetaCursorRenderer *cursor_renderer; ++@@ -2306,7 +2310,13 @@ on_monitors_changed (MetaMonitorManager *manager, ++ backend = meta_get_backend (); ++ cursor_renderer = meta_backend_get_cursor_renderer (backend); ++ meta_cursor_renderer_force_update (cursor_renderer); +++} ++ +++static void +++on_monitors_changed (MetaMonitorManager *manager, +++ MetaScreen *screen) +++{ +++ /* Inform the external world about what has happened */ ++ g_signal_emit (screen, screen_signals[MONITORS_CHANGED], 0); ++ } ++ ++diff --git a/src/wayland/meta-wayland-outputs.c b/src/wayland/meta-wayland-outputs.c ++index db8d240f2..51f62f98f 100644 ++--- a/src/wayland/meta-wayland-outputs.c +++++ b/src/wayland/meta-wayland-outputs.c ++@@ -422,7 +422,7 @@ meta_wayland_outputs_init (MetaWaylandCompositor *compositor) ++ MetaMonitorManager *monitors; ++ ++ monitors = meta_monitor_manager_get (); ++- g_signal_connect (monitors, "monitors-changed", +++ g_signal_connect (monitors, "monitors-changed-internal", ++ G_CALLBACK (on_monitors_changed), compositor); ++ ++ compositor->outputs = g_hash_table_new_full (NULL, NULL, NULL, wayland_output_destroy_notify); ++-- ++2.14.1 ++ diff --cc debian/patches/0009-monitor-manager-use-g_return_val_if_fail-if-trying-t.patch index 0000000,0000000..4a68e4c new file mode 100644 --- /dev/null +++ b/debian/patches/0009-monitor-manager-use-g_return_val_if_fail-if-trying-t.patch @@@ -1,0 -1,0 +1,27 @@@ ++From bef9829229295ab72c623f748e225edfd66d5272 Mon Sep 17 00:00:00 2001 ++From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= ++Date: Fri, 13 Oct 2017 00:10:22 -0500 ++Subject: [PATCH 09/11] monitor-manager: use g_return_val_if_fail if trying to ++ fetch an invalid monitor ++ ++https://bugzilla.gnome.org/show_bug.cgi?id=788860 ++--- ++ src/backends/meta-monitor-manager.c | 2 +- ++ 1 file changed, 1 insertion(+), 1 deletion(-) ++ ++diff --git a/src/backends/meta-monitor-manager.c b/src/backends/meta-monitor-manager.c ++index fd2aca969..343bb060a 100644 ++--- a/src/backends/meta-monitor-manager.c +++++ b/src/backends/meta-monitor-manager.c ++@@ -2273,7 +2273,7 @@ MetaLogicalMonitor * ++ meta_monitor_manager_get_logical_monitor_from_number (MetaMonitorManager *manager, ++ int number) ++ { ++- g_assert ((unsigned int) number < g_list_length (manager->logical_monitors)); +++ g_return_val_if_fail ((unsigned int) number < g_list_length (manager->logical_monitors), NULL); ++ ++ return g_list_nth (manager->logical_monitors, number)->data; ++ } ++-- ++2.14.1 ++ diff --cc debian/patches/0010-backend-move-the-cursor-render-update-on-screen-chan.patch index 0000000,0000000..6907b36 new file mode 100644 --- /dev/null +++ b/debian/patches/0010-backend-move-the-cursor-render-update-on-screen-chan.patch @@@ -1,0 -1,0 +1,53 @@@ ++From c6c777a604a077359e8c1659ed3468e1f53692d5 Mon Sep 17 00:00:00 2001 ++From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= ++Date: Fri, 13 Oct 2017 00:12:50 -0500 ++Subject: [PATCH 10/11] backend: move the cursor render update on screen ++ changes here ++ ++https://bugzilla.gnome.org/show_bug.cgi?id=788860 ++--- ++ src/backends/meta-backend.c | 2 ++ ++ src/core/screen.c | 7 ------- ++ 2 files changed, 2 insertions(+), 7 deletions(-) ++ ++diff --git a/src/backends/meta-backend.c b/src/backends/meta-backend.c ++index 89d47eb80..c856823e2 100644 ++--- a/src/backends/meta-backend.c +++++ b/src/backends/meta-backend.c ++@@ -196,6 +196,8 @@ meta_backend_monitors_changed (MetaBackend *backend) ++ priv->is_pointer_position_initialized = TRUE; ++ } ++ } +++ +++ meta_cursor_renderer_force_update (priv->cursor_renderer); ++ } ++ ++ void ++diff --git a/src/core/screen.c b/src/core/screen.c ++index be4394349..c14bba0cf 100644 ++--- a/src/core/screen.c +++++ b/src/core/screen.c ++@@ -2273,9 +2273,6 @@ static void ++ on_monitors_changed_internal (MetaMonitorManager *manager, ++ MetaScreen *screen) ++ { ++- MetaBackend *backend; ++- MetaCursorRenderer *cursor_renderer; ++- ++ meta_monitor_manager_get_screen_size (manager, ++ &screen->rect.width, ++ &screen->rect.height); ++@@ -2306,10 +2303,6 @@ on_monitors_changed_internal (MetaMonitorManager *manager, ++ meta_screen_foreach_window (screen, META_LIST_DEFAULT, meta_screen_resize_func, 0); ++ ++ meta_screen_queue_check_fullscreen (screen); ++- ++- backend = meta_get_backend (); ++- cursor_renderer = meta_backend_get_cursor_renderer (backend); ++- meta_cursor_renderer_force_update (cursor_renderer); ++ } ++ ++ static void ++-- ++2.14.1 ++ diff --cc debian/patches/0011-workspace-ensure-that-workarea-data-is-valid-when-fe.patch index 0000000,0000000..8a8c0c0 new file mode 100644 --- /dev/null +++ b/debian/patches/0011-workspace-ensure-that-workarea-data-is-valid-when-fe.patch @@@ -1,0 -1,0 +1,37 @@@ ++From d6e3193c2a22024e213025523d2abba36f4b7bb3 Mon Sep 17 00:00:00 2001 ++From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= ++Date: Thu, 12 Oct 2017 20:07:12 -0500 ++Subject: [PATCH 11/11] workspace: ensure that workarea data is valid when ++ fetching by monitor num ++ ++https://bugzilla.gnome.org/show_bug.cgi?id=788860 ++--- ++ src/core/workspace.c | 7 +++++-- ++ 1 file changed, 5 insertions(+), 2 deletions(-) ++ ++diff --git a/src/core/workspace.c b/src/core/workspace.c ++index f6d3c9619..901de4541 100644 ++--- a/src/core/workspace.c +++++ b/src/core/workspace.c ++@@ -1099,13 +1099,16 @@ meta_workspace_get_work_area_for_monitor (MetaWorkspace *workspace, ++ MetaLogicalMonitor *logical_monitor; ++ MetaWorkspaceLogicalMonitorData *data; ++ ++- ensure_work_areas_validated (workspace); ++- ++ logical_monitor = ++ meta_monitor_manager_get_logical_monitor_from_number (monitor_manager, ++ which_monitor); +++ g_return_if_fail (logical_monitor != NULL); +++ +++ ensure_work_areas_validated (workspace); ++ data = meta_workspace_get_logical_monitor_data (workspace, logical_monitor); ++ +++ g_return_if_fail (data != NULL); +++ ++ *area = data->logical_monitor_work_area; ++ } ++ ++-- ++2.14.1 ++ diff --cc debian/patches/0012-x11-window-Don-t-manage-InputOnly-windows.patch index 0000000,0000000..e4a0b4b new file mode 100644 --- /dev/null +++ b/debian/patches/0012-x11-window-Don-t-manage-InputOnly-windows.patch @@@ -1,0 -1,0 +1,33 @@@ ++From 49ee46d924e36c0d5defcbfcf71bd674e200ebae Mon Sep 17 00:00:00 2001 ++From: Rui Matos ++Date: Sun, 15 Oct 2017 22:44:11 +0200 ++Subject: [PATCH 12/18] x11/window: Don't manage InputOnly windows ++ ++This was dropped by mistake in commit ++f166240225b6ab110b091520103d0370d51899ac. ++ ++https://bugzilla.gnome.org/show_bug.cgi?id=788493 ++--- ++ src/x11/window-x11.c | 6 ++++++ ++ 1 file changed, 6 insertions(+) ++ ++diff --git a/src/x11/window-x11.c b/src/x11/window-x11.c ++index 4885f5fea..5a6f113b0 100644 ++--- a/src/x11/window-x11.c +++++ b/src/x11/window-x11.c ++@@ -3039,6 +3039,12 @@ meta_window_x11_new (MetaDisplay *display, ++ goto error; ++ } ++ +++ if (attrs.class == InputOnly) +++ { +++ meta_verbose ("Not managing InputOnly windows\n"); +++ goto error; +++ } +++ ++ if (is_our_xwindow (display, screen, xwindow, &attrs)) ++ { ++ meta_verbose ("Not managing our own windows\n"); ++-- ++2.14.1 ++ diff --cc debian/patches/0013-compositor-Ignore-offscreen-windows.patch index 0000000,0000000..ced9af0 new file mode 100644 --- /dev/null +++ b/debian/patches/0013-compositor-Ignore-offscreen-windows.patch @@@ -1,0 -1,0 +1,116 @@@ ++From d71b0d3d272046a65013b1c77f289848f8ae4ffd Mon Sep 17 00:00:00 2001 ++From: =?UTF-8?q?Jonas=20=C3=85dahl?= ++Date: Fri, 13 Oct 2017 16:29:20 +0800 ++Subject: [PATCH 13/18] compositor: Ignore offscreen windows when unredirecting ++ ++When determining whether we should unredirect a window or not, ignore ++offscreen windows, and just check the top most visible window. ++ ++Previously this was not an issue, but since 'stack-tracker: Keep ++override redirect windows on top' we started sorting the UI frames ++window, which is an offscreen override redirect window, on top, causing ++the unredirect checking code to always check whether to unredirect the ++UI frames window. This effectively disabled the compositor bypass ++functionality. ++ ++https://bugzilla.gnome.org/show_bug.cgi?id=788493 ++--- ++ src/compositor/compositor-private.h | 2 ++ ++ src/compositor/compositor.c | 47 ++++++++++++++++++++++++++++++++----- ++ 2 files changed, 43 insertions(+), 6 deletions(-) ++ ++diff --git a/src/compositor/compositor-private.h b/src/compositor/compositor-private.h ++index ba58bf175..40c0344cc 100644 ++--- a/src/compositor/compositor-private.h +++++ b/src/compositor/compositor-private.h ++@@ -31,6 +31,8 @@ struct _MetaCompositor ++ ++ CoglContext *context; ++ +++ MetaWindowActor *top_window_actor; +++ ++ /* Used for unredirecting fullscreen windows */ ++ guint disable_unredirect_count; ++ MetaWindow *unredirected_window; ++diff --git a/src/compositor/compositor.c b/src/compositor/compositor.c ++index 17e8a55dd..a75ac12c5 100644 ++--- a/src/compositor/compositor.c +++++ b/src/compositor/compositor.c ++@@ -923,6 +923,32 @@ sync_actor_stacking (MetaCompositor *compositor) ++ g_list_free (backgrounds); ++ } ++ +++/* +++ * Find the top most window that is visible on the screen. The intention of +++ * this is to avoid offscreen windows that isn't actually part of the visible +++ * desktop (such as the UI frames override redirect window). +++ */ +++static MetaWindowActor * +++get_top_visible_window_actor (MetaCompositor *compositor) +++{ +++ GList *l; +++ +++ for (l = g_list_last (compositor->windows); l; l = l->prev) +++ { +++ MetaWindowActor *window_actor = l->data; +++ MetaWindow *window = meta_window_actor_get_meta_window (window_actor); +++ MetaRectangle buffer_rect; +++ +++ meta_window_get_buffer_rect (window, &buffer_rect); +++ +++ if (meta_rectangle_overlap (&compositor->display->screen->rect, +++ &buffer_rect)) +++ return window_actor; +++ } +++ +++ return NULL; +++} +++ ++ void ++ meta_compositor_sync_stack (MetaCompositor *compositor, ++ GList *stack) ++@@ -1009,6 +1035,8 @@ meta_compositor_sync_stack (MetaCompositor *compositor, ++ } ++ ++ sync_actor_stacking (compositor); +++ +++ compositor->top_window_actor = get_top_visible_window_actor (compositor); ++ } ++ ++ void ++@@ -1065,19 +1093,26 @@ static gboolean ++ meta_pre_paint_func (gpointer data) ++ { ++ GList *l; ++- MetaWindowActor *top_window; +++ MetaWindowActor *top_window_actor; ++ MetaCompositor *compositor = data; ++ ++ if (compositor->windows == NULL) ++ return TRUE; ++ ++- top_window = g_list_last (compositor->windows)->data; ++- ++- if (meta_window_actor_should_unredirect (top_window) && +++ top_window_actor = compositor->top_window_actor; +++ if (top_window_actor && +++ meta_window_actor_should_unredirect (top_window_actor) && ++ compositor->disable_unredirect_count == 0) ++- set_unredirected_window (compositor, meta_window_actor_get_meta_window (top_window)); +++ { +++ MetaWindow *top_window; +++ +++ top_window = meta_window_actor_get_meta_window (top_window_actor); +++ set_unredirected_window (compositor, top_window); +++ } ++ else ++- set_unredirected_window (compositor, NULL); +++ { +++ set_unredirected_window (compositor, NULL); +++ } ++ ++ for (l = compositor->windows; l; l = l->next) ++ meta_window_actor_pre_paint (l->data); ++-- ++2.14.1 ++ diff --cc debian/patches/0014-Use-a-single-supported-scales.patch index 0000000,0000000..f0f0598 new file mode 100644 --- /dev/null +++ b/debian/patches/0014-Use-a-single-supported-scales.patch @@@ -1,0 -1,0 +1,187 @@@ ++From fbaf309ac6dc08fe4e01785fcbf96f7b0fcaf7c2 Mon Sep 17 00:00:00 2001 ++From: =?UTF-8?q?Jonas=20=C3=85dahl?= ++Date: Fri, 13 Oct 2017 14:34:19 +0800 ++Subject: [PATCH] monitor-manager/xrandr: Use a single supported scales list ++ for all ++ ++Under X11 we can only ever have the same scale configured on all ++monitors. In order to use e.g. scale 2 when there is a HiDPI monitor ++connected, we must not disallow it because there is a monitor that does ++not support scale 2. Thus we must show the same scale for every monitor ++and monitor mode, even though it might result in a bad experience. ++ ++Do this by iterating through all the monitors adding all supported ++scales by the preferred mode, combining all the supported scales. This ++supported scales list is then used for all monitor and modes no matter ++what. ++ ++https://bugzilla.gnome.org/show_bug.cgi?id=788901 ++https://launchpad.net/bugs/1724024 ++--- ++ src/backends/x11/meta-monitor-manager-xrandr.c | 103 +++++++++++++++++++++++-- ++ 1 file changed, 95 insertions(+), 8 deletions(-) ++ ++diff --git a/src/backends/x11/meta-monitor-manager-xrandr.c b/src/backends/x11/meta-monitor-manager-xrandr.c ++index c369d4960..af1106880 100644 ++--- a/src/backends/x11/meta-monitor-manager-xrandr.c +++++ b/src/backends/x11/meta-monitor-manager-xrandr.c ++@@ -71,6 +71,9 @@ struct _MetaMonitorManagerXrandr ++ ++ int max_screen_width; ++ int max_screen_height; +++ +++ float *supported_scales; +++ int n_supported_scales; ++ }; ++ ++ struct _MetaMonitorManagerXrandrClass ++@@ -1481,6 +1484,17 @@ meta_monitor_manager_xrandr_ensure_initial_config (MetaMonitorManager *manager) ++ meta_monitor_manager_update_logical_state_derived (manager, config); ++ } ++ +++static void +++meta_monitor_manager_xrandr_rebuild_derived (MetaMonitorManager *manager, +++ MetaMonitorsConfig *config) +++{ +++ MetaMonitorManagerXrandr *manager_xrandr = +++ META_MONITOR_MANAGER_XRANDR (manager); +++ +++ g_clear_pointer (&manager_xrandr->supported_scales, g_free); +++ meta_monitor_manager_rebuild_derived (manager, config); +++} +++ ++ static gboolean ++ meta_monitor_manager_xrandr_apply_monitors_config (MetaMonitorManager *manager, ++ MetaMonitorsConfig *config, ++@@ -1492,7 +1506,7 @@ meta_monitor_manager_xrandr_apply_monitors_config (MetaMonitorManager *mana ++ ++ if (!config) ++ { ++- meta_monitor_manager_rebuild_derived (manager, NULL); +++ meta_monitor_manager_xrandr_rebuild_derived (manager, NULL); ++ return TRUE; ++ } ++ ++@@ -1526,7 +1540,7 @@ meta_monitor_manager_xrandr_apply_monitors_config (MetaMonitorManager *mana ++ } ++ else ++ { ++- meta_monitor_manager_rebuild_derived (manager, config); +++ meta_monitor_manager_xrandr_rebuild_derived (manager, config); ++ } ++ } ++ ++@@ -1782,6 +1796,76 @@ meta_monitor_manager_xrandr_calculate_monitor_mode_scale (MetaMonitorManager *ma ++ return meta_monitor_calculate_mode_scale (monitor, monitor_mode); ++ } ++ +++static void +++add_supported_scale (GArray *supported_scales, +++ float scale) +++{ +++ unsigned int i; +++ +++ for (i = 0; i < supported_scales->len; i++) +++ { +++ float supported_scale = g_array_index (supported_scales, float, i); +++ +++ if (scale == supported_scale) +++ return; +++ } +++ +++ g_array_append_val (supported_scales, scale); +++} +++ +++static int +++compare_scales (gconstpointer a, +++ gconstpointer b) +++{ +++ float f = *(float *) a - *(float *) b; +++ +++ if (f < 0) +++ return -1; +++ if (f > 0) +++ return 1; +++ return 0; +++} +++ +++static void +++ensure_supported_monitor_scales (MetaMonitorManager *manager) +++{ +++ MetaMonitorManagerXrandr *manager_xrandr = +++ META_MONITOR_MANAGER_XRANDR (manager); +++ MetaMonitorScalesConstraint constraints; +++ GList *l; +++ GArray *supported_scales; +++ +++ if (manager_xrandr->supported_scales) +++ return; +++ +++ constraints = META_MONITOR_SCALES_CONSTRAINT_NO_FRAC; +++ supported_scales = g_array_new (FALSE, FALSE, sizeof (float)); +++ +++ for (l = manager->monitors; l; l = l->next) +++ { +++ MetaMonitor *monitor = l->data; +++ MetaMonitorMode *monitor_mode; +++ float *monitor_scales; +++ int n_monitor_scales; +++ int i; +++ +++ monitor_mode = meta_monitor_get_preferred_mode (monitor); +++ monitor_scales = +++ meta_monitor_calculate_supported_scales (monitor, +++ monitor_mode, +++ constraints, +++ &n_monitor_scales); +++ +++ for (i = 0; i < n_monitor_scales; i++) +++ add_supported_scale (supported_scales, monitor_scales[i]); +++ g_array_sort (supported_scales, compare_scales); +++ } +++ +++ manager_xrandr->supported_scales = (float *) supported_scales->data; +++ manager_xrandr->n_supported_scales = supported_scales->len; +++ g_array_free (supported_scales, FALSE); +++} +++ ++ static float * ++ meta_monitor_manager_xrandr_calculate_supported_scales (MetaMonitorManager *manager, ++ MetaLogicalMonitorLayoutMode layout_mode, ++@@ -1789,12 +1873,14 @@ meta_monitor_manager_xrandr_calculate_supported_scales (MetaMonitorManager ++ MetaMonitorMode *monitor_mode, ++ int *n_supported_scales) ++ { ++- MetaMonitorScalesConstraint constraints; +++ MetaMonitorManagerXrandr *manager_xrandr = +++ META_MONITOR_MANAGER_XRANDR (manager); ++ ++- constraints = META_MONITOR_SCALES_CONSTRAINT_NO_FRAC; ++- return meta_monitor_calculate_supported_scales (monitor, monitor_mode, ++- constraints, ++- n_supported_scales); +++ ensure_supported_monitor_scales (manager); +++ +++ *n_supported_scales = manager_xrandr->n_supported_scales; +++ return g_memdup (manager_xrandr->supported_scales, +++ manager_xrandr->n_supported_scales * sizeof (float)); ++ } ++ ++ static MetaMonitorManagerCapability ++@@ -1874,6 +1960,7 @@ meta_monitor_manager_xrandr_finalize (GObject *object) ++ manager_xrandr->resources = NULL; ++ ++ g_hash_table_destroy (manager_xrandr->tiled_monitor_atoms); +++ g_free (manager_xrandr->supported_scales); ++ ++ G_OBJECT_CLASS (meta_monitor_manager_xrandr_parent_class)->finalize (object); ++ } ++@@ -1949,7 +2036,7 @@ meta_monitor_manager_xrandr_handle_xevent (MetaMonitorManagerXrandr *manager_xra ++ config = NULL; ++ } ++ ++- meta_monitor_manager_rebuild_derived (manager, config); +++ meta_monitor_manager_xrandr_rebuild_derived (manager, config); ++ } ++ ++ return TRUE; diff --cc debian/patches/0015-monitor-normal-Prefer-modes-with-same-flags.patch index 0000000,0000000..87c26ae new file mode 100644 --- /dev/null +++ b/debian/patches/0015-monitor-normal-Prefer-modes-with-same-flags.patch @@@ -1,0 -1,0 +1,119 @@@ ++From c0dc66e8c0dfc6ab02506343dc8418891159657c Mon Sep 17 00:00:00 2001 ++From: =?UTF-8?q?Jonas=20=C3=85dahl?= ++Date: Wed, 18 Oct 2017 23:22:01 +0800 ++Subject: [PATCH 15/18] monitor/normal: Prefer modes with same flags as ++ preferred mode ++ ++When generating MetaMonitorMode's, prefer CRTC modes that has the same ++set of flags as the preferred mode. This not only is probably a better ++set of configurable modes, but it'll guarantee that the preferred mode ++is added. ++ ++This fixes a crash when the preferred mode was not the first mode with ++the same resolution, refresh rate and set of handled modes. ++ ++https://bugzilla.gnome.org/show_bug.cgi?id=789153 ++--- ++ src/backends/meta-monitor.c | 41 ++++++++++++++++++++++++++++++++--------- ++ 1 file changed, 32 insertions(+), 9 deletions(-) ++ ++diff --git a/src/backends/meta-monitor.c b/src/backends/meta-monitor.c ++index 8ca6ea859..2d06a1e36 100644 ++--- a/src/backends/meta-monitor.c +++++ b/src/backends/meta-monitor.c ++@@ -394,16 +394,22 @@ generate_mode_id (MetaMonitorModeSpec *monitor_mode_spec) ++ ++ static gboolean ++ meta_monitor_add_mode (MetaMonitor *monitor, ++- MetaMonitorMode *monitor_mode) +++ MetaMonitorMode *monitor_mode, +++ gboolean replace) ++ { ++ MetaMonitorPrivate *priv = meta_monitor_get_instance_private (monitor); +++ MetaMonitorMode *existing_mode; ++ ++- if (g_hash_table_lookup (priv->mode_ids, ++- meta_monitor_mode_get_id (monitor_mode))) +++ existing_mode = g_hash_table_lookup (priv->mode_ids, +++ meta_monitor_mode_get_id (monitor_mode)); +++ if (existing_mode && !replace) ++ return FALSE; ++ +++ if (existing_mode) +++ priv->modes = g_list_remove (priv->modes, existing_mode); +++ ++ priv->modes = g_list_append (priv->modes, monitor_mode); ++- g_hash_table_insert (priv->mode_ids, monitor_mode->id, monitor_mode); +++ g_hash_table_replace (priv->mode_ids, monitor_mode->id, monitor_mode); ++ ++ return TRUE; ++ } ++@@ -415,13 +421,17 @@ meta_monitor_normal_generate_modes (MetaMonitorNormal *monitor_normal) ++ MetaMonitorPrivate *monitor_priv = ++ meta_monitor_get_instance_private (monitor); ++ MetaOutput *output; +++ MetaCrtcModeFlag preferred_mode_flags; ++ unsigned int i; ++ ++ output = meta_monitor_get_main_output (monitor); +++ preferred_mode_flags = output->preferred_mode->flags; +++ ++ for (i = 0; i < output->n_modes; i++) ++ { ++ MetaCrtcMode *crtc_mode = output->modes[i]; ++ MetaMonitorMode *mode; +++ gboolean replace; ++ ++ mode = g_new0 (MetaMonitorMode, 1); ++ mode->spec = (MetaMonitorModeSpec) { ++@@ -437,13 +447,26 @@ meta_monitor_normal_generate_modes (MetaMonitorNormal *monitor_normal) ++ .crtc_mode = crtc_mode ++ }; ++ +++ /* +++ * We don't distinguish between all available mode flags, just the ones +++ * that are configurable. We still need to pick some mode though, so +++ * prefer ones that has the same set of flags as the preferred mode; +++ * otherwise take the first one in the list. This guarantees that the +++ * preferred mode is always added. +++ */ +++ replace = crtc_mode->flags == preferred_mode_flags; +++ +++ if (!meta_monitor_add_mode (monitor, mode, replace)) +++ { +++ g_assert (crtc_mode != output->preferred_mode); +++ meta_monitor_mode_free (mode); +++ continue; +++ } +++ ++ if (crtc_mode == output->preferred_mode) ++ monitor_priv->preferred_mode = mode; ++ if (output->crtc && crtc_mode == output->crtc->current_mode) ++ monitor_priv->current_mode = mode; ++- ++- if (!meta_monitor_add_mode (monitor, mode)) ++- meta_monitor_mode_free (mode); ++ } ++ } ++ ++@@ -825,7 +848,7 @@ generate_tiled_monitor_modes (MetaMonitorTiled *monitor_tiled) ++ ++ tiled_modes = g_list_remove_link (tiled_modes, l); ++ ++- if (!meta_monitor_add_mode (monitor, mode)) +++ if (!meta_monitor_add_mode (monitor, mode, FALSE)) ++ { ++ meta_monitor_mode_free (mode); ++ continue; ++@@ -967,7 +990,7 @@ generate_untiled_monitor_modes (MetaMonitorTiled *monitor_tiled) ++ if (!mode) ++ continue; ++ ++- if (!meta_monitor_add_mode (monitor, mode)) +++ if (!meta_monitor_add_mode (monitor, mode, FALSE)) ++ { ++ meta_monitor_mode_free (mode); ++ continue; ++-- ++2.14.1 ++ diff --cc debian/patches/0016-monitor-unit-tests-Check-non-first-preferred-modes.patch index 0000000,0000000..98407ae new file mode 100644 --- /dev/null +++ b/debian/patches/0016-monitor-unit-tests-Check-non-first-preferred-modes.patch @@@ -1,0 -1,0 +1,169 @@@ ++From 297027b8cb7a259907e4be190de1c4a44aa83593 Mon Sep 17 00:00:00 2001 ++From: =?UTF-8?q?Jonas=20=C3=85dahl?= ++Date: Wed, 18 Oct 2017 23:24:36 +0800 ++Subject: [PATCH 16/18] monitor-unit-tests: Check non-first preferred modes ++ ++Check that if there are multiple modes with the same ID (resolution, ++refresh rate and handled flags) we correctly add the preferred mode to ++the list of monitor modes. ++ ++https://bugzilla.gnome.org/show_bug.cgi?id=789153 ++--- ++ src/backends/meta-monitor.c | 2 - ++ src/backends/meta-monitor.h | 2 + ++ src/tests/monitor-unit-tests.c | 99 +++++++++++++++++++++++++++++++++++++++++- ++ 3 files changed, 100 insertions(+), 3 deletions(-) ++ ++diff --git a/src/backends/meta-monitor.c b/src/backends/meta-monitor.c ++index 2d06a1e36..f9233251c 100644 ++--- a/src/backends/meta-monitor.c +++++ b/src/backends/meta-monitor.c ++@@ -34,8 +34,6 @@ ++ #define MINIMUM_LOGICAL_HEIGHT 600 ++ #define MAXIMUM_REFRESH_RATE_DIFF 0.001 ++ ++-#define HANDLED_CRTC_MODE_FLAGS (META_CRTC_MODE_FLAG_INTERLACE) ++- ++ typedef struct _MetaMonitorMode ++ { ++ char *id; ++diff --git a/src/backends/meta-monitor.h b/src/backends/meta-monitor.h ++index f4260d61f..e6f394b07 100644 ++--- a/src/backends/meta-monitor.h +++++ b/src/backends/meta-monitor.h ++@@ -48,6 +48,8 @@ typedef struct _MetaMonitorCrtcMode ++ MetaCrtcMode *crtc_mode; ++ } MetaMonitorCrtcMode; ++ +++#define HANDLED_CRTC_MODE_FLAGS (META_CRTC_MODE_FLAG_INTERLACE) +++ ++ typedef gboolean (* MetaMonitorModeFunc) (MetaMonitor *monitor, ++ MetaMonitorMode *mode, ++ MetaMonitorCrtcMode *monitor_crtc_mode, ++diff --git a/src/tests/monitor-unit-tests.c b/src/tests/monitor-unit-tests.c ++index b2d18c48b..e65c30291 100644 ++--- a/src/tests/monitor-unit-tests.c +++++ b/src/tests/monitor-unit-tests.c ++@@ -419,7 +419,7 @@ check_monitor_mode (MetaMonitor *monitor, ++ flags = meta_monitor_mode_get_flags (mode); ++ ++ g_assert_cmpfloat (refresh_rate, ==, crtc_mode->refresh_rate); ++- g_assert_cmpint (flags, ==, crtc_mode->flags); +++ g_assert_cmpint (flags, ==, (crtc_mode->flags & HANDLED_CRTC_MODE_FLAGS)); ++ } ++ ++ data->expect_crtc_mode_iter++; ++@@ -2730,6 +2730,101 @@ meta_test_monitor_underscanning_config (void) ++ check_monitor_configuration (&test_case); ++ } ++ +++static void +++meta_test_monitor_preferred_non_first_mode (void) +++{ +++ MonitorTestCase test_case = { +++ .setup = { +++ .modes = { +++ { +++ .width = 800, +++ .height = 600, +++ .refresh_rate = 60.0, +++ .flags = META_CRTC_MODE_FLAG_NHSYNC, +++ }, +++ { +++ .width = 800, +++ .height = 600, +++ .refresh_rate = 60.0, +++ .flags = META_CRTC_MODE_FLAG_PHSYNC, +++ }, +++ }, +++ .n_modes = 2, +++ .outputs = { +++ { +++ .crtc = -1, +++ .modes = { 0, 1 }, +++ .n_modes = 2, +++ .preferred_mode = 1, +++ .possible_crtcs = { 0 }, +++ .n_possible_crtcs = 1, +++ .width_mm = 222, +++ .height_mm = 125 +++ } +++ }, +++ .n_outputs = 1, +++ .crtcs = { +++ { +++ .current_mode = -1 +++ } +++ }, +++ .n_crtcs = 1 +++ }, +++ +++ .expect = { +++ .monitors = { +++ { +++ .outputs = { 0 }, +++ .n_outputs = 1, +++ .modes = { +++ { +++ .width = 800, +++ .height = 600, +++ .refresh_rate = 60.0, +++ .crtc_modes = { +++ { +++ .output = 0, +++ .crtc_mode = 1 +++ } +++ } +++ }, +++ }, +++ .n_modes = 1, +++ .current_mode = 0, +++ .width_mm = 222, +++ .height_mm = 125 +++ } +++ }, +++ .n_monitors = 1, +++ .logical_monitors = { +++ { +++ .monitors = { 0 }, +++ .n_monitors = 1, +++ .layout = { .x = 0, .y = 0, .width = 800, .height = 600 }, +++ .scale = 1 +++ }, +++ }, +++ .n_logical_monitors = 1, +++ .primary_logical_monitor = 0, +++ .n_outputs = 1, +++ .crtcs = { +++ { +++ .current_mode = 1, +++ } +++ }, +++ .n_crtcs = 1, +++ .screen_width = 800, +++ .screen_height = 600, +++ } +++ }; +++ MetaMonitorTestSetup *test_setup; +++ +++ test_setup = create_monitor_test_setup (&test_case, +++ MONITOR_TEST_FLAG_NO_STORED); +++ emulate_hotplug (test_setup); +++ check_monitor_configuration (&test_case); +++} +++ ++ static void ++ meta_test_monitor_custom_vertical_config (void) ++ { ++@@ -5317,6 +5412,8 @@ init_monitor_tests (void) ++ meta_test_monitor_no_outputs); ++ add_monitor_test ("/backends/monitor/underscanning-config", ++ meta_test_monitor_underscanning_config); +++ add_monitor_test ("/backends/monitor/preferred-non-first-mode", +++ meta_test_monitor_preferred_non_first_mode); ++ ++ add_monitor_test ("/backends/monitor/custom/vertical-config", ++ meta_test_monitor_custom_vertical_config); ++-- ++2.14.1 ++ diff --cc debian/patches/0017-compositor-Avoid-a-crash-if-top-window-finalized.patch index 0000000,0000000..555ef00 new file mode 100644 --- /dev/null +++ b/debian/patches/0017-compositor-Avoid-a-crash-if-top-window-finalized.patch @@@ -1,0 -1,0 +1,31 @@@ ++From 6eacf9a398da3db6152566abe5cc6b6e0afd9a3d Mon Sep 17 00:00:00 2001 ++From: Rui Matos ++Date: Tue, 17 Oct 2017 17:17:55 +0200 ++Subject: [PATCH 17/18] compositor: Avoid a crash if the top window actor is ++ finalized ++ ++Since we're not holding a reference, the top window actor might be ++finalized when we paint resulting in a use after free crash. ++ ++https://bugzilla.gnome.org/show_bug.cgi?id=788493 ++--- ++ src/compositor/compositor.c | 3 +++ ++ 1 file changed, 3 insertions(+) ++ ++diff --git a/src/compositor/compositor.c b/src/compositor/compositor.c ++index a75ac12c5..1d5b9ab20 100644 ++--- a/src/compositor/compositor.c +++++ b/src/compositor/compositor.c ++@@ -671,6 +671,9 @@ meta_compositor_remove_window (MetaCompositor *compositor, ++ if (compositor->unredirected_window == window) ++ set_unredirected_window (compositor, NULL); ++ +++ if (compositor->top_window_actor == window_actor) +++ compositor->top_window_actor = NULL; +++ ++ meta_window_actor_destroy (window_actor); ++ } ++ ++-- ++2.14.1 ++ diff --cc debian/patches/0018-Revert-ClutterActor-Optimize-away-idempotent-scale.patch index 0000000,0000000..fbbaa50 new file mode 100644 --- /dev/null +++ b/debian/patches/0018-Revert-ClutterActor-Optimize-away-idempotent-scale.patch @@@ -1,0 -1,0 +1,47 @@@ ++From 193216c2a7b9196fe3ce69192d94bf2995814113 Mon Sep 17 00:00:00 2001 ++From: Michael Catanzaro ++Date: Thu, 19 Oct 2017 19:53:13 -0500 ++Subject: [PATCH 18/18] Revert "ClutterActor: Optimize away idempotent ++ scale/position updates" ++ ++This reverts commit 5cb5baa7d42712f9e0db8dfaa0485e2d833e4d83. ++ ++There's a cascade of regressions that needs to be sorted out before ++relanding this: ++ ++https://bugzilla.gnome.org/show_bug.cgi?id=784314 ++--- ++ clutter/clutter/clutter-actor.c | 10 ++++------ ++ 1 file changed, 4 insertions(+), 6 deletions(-) ++ ++diff --git a/clutter/clutter/clutter-actor.c b/clutter/clutter/clutter-actor.c ++index dbb202f9c..6954f0396 100644 ++--- a/clutter/clutter/clutter-actor.c +++++ b/clutter/clutter/clutter-actor.c ++@@ -4828,8 +4828,7 @@ clutter_actor_set_scale_factor (ClutterActor *self, ++ g_assert (pspec != NULL); ++ g_assert (scale_p != NULL); ++ ++- if (*scale_p != factor) ++- _clutter_actor_create_transition (self, pspec, *scale_p, factor); +++ _clutter_actor_create_transition (self, pspec, *scale_p, factor); ++ } ++ ++ static inline void ++@@ -10264,10 +10263,9 @@ clutter_actor_set_position (ClutterActor *self, ++ cur_position.x = clutter_actor_get_x (self); ++ cur_position.y = clutter_actor_get_y (self); ++ ++- if (!clutter_point_equals (&cur_position, &new_position)) ++- _clutter_actor_create_transition (self, obj_props[PROP_POSITION], ++- &cur_position, ++- &new_position); +++ _clutter_actor_create_transition (self, obj_props[PROP_POSITION], +++ &cur_position, +++ &new_position); ++ } ++ ++ /** ++-- ++2.14.1 ++ diff --cc debian/patches/0019-Revert-tests-Fix-actor-anchors-test.patch index 0000000,0000000..3f5ee5d new file mode 100644 --- /dev/null +++ b/debian/patches/0019-Revert-tests-Fix-actor-anchors-test.patch @@@ -1,0 -1,0 +1,29 @@@ ++From 79fe635f5f94db96c9ee6a0da7becc8b283b4689 Mon Sep 17 00:00:00 2001 ++From: Jeremy Bicha ++Date: Sat, 21 Oct 2017 18:58:37 -0400 ++Subject: [PATCH] Revert "tests: Fix actor-anchors test" ++ ++This reverts commit dd451547a5e7bcce6d9752cb1936ee8222b82315. ++ ++since we reverted commit 5cb5baa with commit 193216c ++--- ++ clutter/tests/conform/actor-anchors.c | 3 ++- ++ 1 file changed, 2 insertions(+), 1 deletion(-) ++ ++diff --git a/clutter/tests/conform/actor-anchors.c b/clutter/tests/conform/actor-anchors.c ++index 55395880b..ee3b6a5e6 100644 ++--- a/clutter/tests/conform/actor-anchors.c +++++ b/clutter/tests/conform/actor-anchors.c ++@@ -407,7 +407,8 @@ test_scale_center (TestState *state) ++ g_assert (scale_x == 4.0); ++ g_assert (scale_y == 2.0); ++ g_assert (gravity == CLUTTER_GRAVITY_NONE); ++- assert_notifications (NOTIFY_SCALE_CENTER_X | NOTIFY_SCALE_CENTER_Y +++ assert_notifications (NOTIFY_SCALE_X | NOTIFY_SCALE_Y +++ | NOTIFY_SCALE_CENTER_X | NOTIFY_SCALE_CENTER_Y ++ | NOTIFY_SCALE_GRAVITY); ++ assert_coords (state, 100 + 10 - 10 * 4, 200 + 20 - 20 * 2, ++ 100 + 10 + (RECT_WIDTH - 10) * 4, ++-- ++2.14.1 ++ diff --cc debian/patches/bgo768531_workaround-startup-notifications.patch index 0000000,0000000..aa355ce new file mode 100644 --- /dev/null +++ b/debian/patches/bgo768531_workaround-startup-notifications.patch @@@ -1,0 -1,0 +1,46 @@@ ++From 4ed430b4ef3013c96fa56cdc57b925b42d20ead9 Mon Sep 17 00:00:00 2001 ++From: =?UTF-8?q?Florian=20M=C3=BCllner?= ++Date: Thu, 20 Oct 2016 18:00:04 +0200 ++Subject: [PATCH] gtk-shell: Work around non-working startup notifications ++ ++GNOME Shell relies on the MetaScreen::startup-sequence-changed signal, ++which is tied to (lib)startup-notification and therefore X11. As a result, ++when we remove the startup sequence of a wayland client, GNOME Shell will ++not be notified about this until startup-notification's timeout is hit. ++As a temporary stop-gap, go through XWayland even for wayland clients, ++so that the signal is emitted when expected. ++ ++Bug: https://bugzilla.gnome.org/show_bug.cgi?id=768531 ++Applied-upstream: no ++--- ++ src/wayland/meta-wayland-gtk-shell.c | 10 ++++++++++ ++ 1 file changed, 10 insertions(+) ++ ++diff --git a/src/wayland/meta-wayland-gtk-shell.c b/src/wayland/meta-wayland-gtk-shell.c ++index d6e249f..9d1a19e 100644 ++--- a/src/wayland/meta-wayland-gtk-shell.c +++++ b/src/wayland/meta-wayland-gtk-shell.c ++@@ -219,11 +219,21 @@ gtk_shell_set_startup_id (struct wl_client *client, ++ struct wl_resource *resource, ++ const char *startup_id) ++ { +++#if 0 ++ MetaDisplay *display; ++ ++ display = meta_get_display (); ++ meta_startup_notification_remove_sequence (display->startup_notification, ++ startup_id); +++#else +++ /* HACK: MetaScreen::startup-sequence-changed is currently tied to +++ (lib)startup-notification, which means it only works on X11; +++ so for now, always go through XWayland, even for wayland clients */ +++ gdk_x11_display_broadcast_startup_message (gdk_display_get_default (), +++ "remove", +++ "ID", startup_id, +++ NULL); +++#endif ++ } ++ ++ static void ++-- ++2.9.3 diff --cc debian/patches/series index 0000000,0000000..6dd4f75 new file mode 100644 --- /dev/null +++ b/debian/patches/series @@@ -1,0 -1,0 +1,18 @@@ ++bgo768531_workaround-startup-notifications.patch ++skip-failing-tests.patch ++skip-failing-tests-325.patch ++0001-wayland-dma-buf-Don-t-send-modifiers-to-old-clients.patch ++0006-x11-Protect-XChangeProperty-call-with-error-traps.patch ++0007-settings-Get-UI-scaling-factor-from-primary-logical-.patch ++0008-backends-add-monitors-updated-internal-signal-to-onl.patch ++0009-monitor-manager-use-g_return_val_if_fail-if-trying-t.patch ++0010-backend-move-the-cursor-render-update-on-screen-chan.patch ++0011-workspace-ensure-that-workarea-data-is-valid-when-fe.patch ++0012-x11-window-Don-t-manage-InputOnly-windows.patch ++0013-compositor-Ignore-offscreen-windows.patch ++0014-Use-a-single-supported-scales.patch ++0015-monitor-normal-Prefer-modes-with-same-flags.patch ++0016-monitor-unit-tests-Check-non-first-preferred-modes.patch ++0017-compositor-Avoid-a-crash-if-top-window-finalized.patch ++0018-Revert-ClutterActor-Optimize-away-idempotent-scale.patch ++0019-Revert-tests-Fix-actor-anchors-test.patch diff --cc debian/patches/skip-failing-tests-325.patch index 0000000,0000000..61f890d new file mode 100644 --- /dev/null +++ b/debian/patches/skip-failing-tests-325.patch @@@ -1,0 -1,0 +1,18 @@@ ++Description: Skip test that started failing with 3.25 ++ That way we can still benefit by running all the other tests. ++Author: Jeremy Bicha ++Bug: https://bugzilla.gnome.org/785319 ++--- ++ clutter/tests/conform/Makefile.am | 1 - ++ 1 file changed, 1 deletion(-) ++ ++--- a/clutter/tests/conform/Makefile.am +++++ b/clutter/tests/conform/Makefile.am ++@@ -26,7 +26,6 @@ actor_tests = \ ++ actor-layout \ ++ actor-meta \ ++ actor-offscreen-limit-max-size \ ++- actor-offscreen-redirect \ ++ actor-paint-opacity \ ++ actor-size \ ++ $(NULL) diff --cc debian/patches/skip-failing-tests.patch index 0000000,0000000..4d37a7b new file mode 100644 --- /dev/null +++ b/debian/patches/skip-failing-tests.patch @@@ -1,0 -1,0 +1,21 @@@ ++Description: Don't run failing tests. ++ That way we can still benefit by running all the other tests. ++Author: Jeremy Bicha ++Date: Fri, 05 May 2017 08:26:36 -0500 ++Bug: https://bugzilla.gnome.org/782215 ++ https://bugzilla.gnome.org/753836 ++--- ++ clutter/tests/conform/Makefile.am | 2 -- ++ 1 file changed, 2 deletions(-) ++ ++--- a/clutter/tests/conform/Makefile.am +++++ b/clutter/tests/conform/Makefile.am ++@@ -28,8 +28,6 @@ actor_tests = \ ++ actor-offscreen-limit-max-size \ ++ actor-offscreen-redirect \ ++ actor-paint-opacity \ ++- actor-pick \ ++- actor-shader-effect \ ++ actor-size \ ++ $(NULL) ++ diff --cc debian/rules index 0000000,0000000..198adfb new file mode 100755 --- /dev/null +++ b/debian/rules @@@ -1,0 -1,0 +1,56 @@@ ++#!/usr/bin/make -f ++ ++-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk ++ ++export DEB_LDFLAGS_MAINT_APPEND = -Wl,-O1 -Wl,--as-needed ++ ++%: ++ dh $@ --with gir,gnome ++ ++override_dh_autoreconf: ++ dh_autoreconf --as-needed ++ ++ifeq ($(DEB_HOST_ARCH_OS),linux) ++CONFFLAGS = \ ++ --enable-egl-device \ ++ --enable-wayland \ ++ --enable-native-backend ++else ++CONFFLAGS += \ ++ --disable-wayland-egl-platform \ ++ --disable-wayland-egl-server \ ++ --disable-kms-egl-platform \ ++ --disable-wayland \ ++ --disable-native-backend ++endif ++ ++override_dh_auto_configure: ++ dh_auto_configure -- \ ++ --libexecdir="\$${prefix}/lib/mutter" \ ++ --enable-startup-notification \ ++ --enable-compile-warnings \ ++ $(CONFFLAGS) ++ ++# See https://bugs.debian.org/874077 ++# Ignore test failures on Debian and on s390x ++override_dh_auto_test: ++ifneq (,$(findstring $(DEB_HOST_ARCH),"s390x")) ++ -xvfb-run dh_auto_test ++else ifeq (yes,$(shell dpkg-vendor --derives-from Ubuntu && echo yes)) ++ xvfb-run dh_auto_test ++else ++ -xvfb-run dh_auto_test ++endif ++ ++override_dh_install: ++ dh_install --list-missing ++ ++override_dh_girepository: ++ dh_girepository /usr/lib/$(DEB_HOST_MULTIARCH)/mutter ++ ++override_dh_makeshlibs: ++ dh_makeshlibs -V'libmutter-1-0 (>= 3.25.90)' ++ ++override_dh_strip: ++ dh_strip --dbgsym-migration='mutter-dbg (<< 3.18.3-2~)' ++ diff --cc debian/source/format index 0000000,0000000..163aaf8 new file mode 100644 --- /dev/null +++ b/debian/source/format @@@ -1,0 -1,0 +1,1 @@@ ++3.0 (quilt) diff --cc debian/watch index 0000000,0000000..ac38817 new file mode 100644 --- /dev/null +++ b/debian/watch @@@ -1,0 -1,0 +1,3 @@@ ++version=4 ++https://download.gnome.org/sources/@PACKAGE@/([\d\.]+[02468])/ \ ++ @PACKAGE@@ANY_VERSION@\.tar\.xz