From: Peter Michael Green Date: Sun, 23 Sep 2018 14:00:00 +0000 (+0000) Subject: Manual merge of version 3.28.3-2+rpi1 and 3.30.0-1 to produce 3.30.0-1+rpi1 X-Git-Tag: archive/raspbian/3.30.0-1+rpi1~4 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=77de15c809af3496681508eac0c635f1c5797519;p=mutter.git Manual merge of version 3.28.3-2+rpi1 and 3.30.0-1 to produce 3.30.0-1+rpi1 --- 77de15c809af3496681508eac0c635f1c5797519 diff --cc debian/changelog index 2c1fba4,f8c2eef..710a6d2 --- a/debian/changelog +++ b/debian/changelog @@@ -1,12 -1,147 +1,158 @@@ - mutter (3.28.3-2+rpi1) buster-staging; urgency=medium ++mutter (3.30.0-1+rpi1) buster-staging; urgency=medium + + [changes brought forward from 3.28.0-2+rpi1 by Peter Michael Green at Wed, 04 Apr 2018 10:10:12 +0000] + * Add build-depends on libmtdev-dev. + * Disable parallel building. ++ * Fix clean target + [changes introduced in 3.28.1-1+rpi1 by Peter Michael Green] + * Add build-depends on libgles2-mesa-dev + - -- Raspbian forward porter Thu, 09 Aug 2018 14:06:28 +0000 ++ -- Peter Michael Green Sat, 22 Sep 2018 11:59:57 +0000 ++ + mutter (3.30.0-1) unstable; urgency=medium + + [ Didier Roche ] + * New upstream release: + - Updated translations + + [ Iain Lane ] + * Merge experimental branch back into master and update references to it + accordingly. This upload is going to unstable. + + -- Didier Roche Wed, 05 Sep 2018 11:30:26 +0100 + + mutter (3.29.92-1) experimental; urgency=medium + + * Team upload + + [ Marco Trevisan (Treviño) ] + * New upstream development release + - Fix a crash when drmModeGetResources() fails, for example when + using Wayland on Nvidia hardware (Closes: #900002) + * Rebase patch series + * d/p/renderer-native-Check-calculated-transform-when-creating-.patch: + - dropped as applied upstream + + [ Simon McVittie ] + * Standards-Version: 4.2.1 (no changes required) + * Update debian/libmutter-3-0.symbols + + -- Simon McVittie Thu, 30 Aug 2018 08:45:01 +0100 + + mutter (3.29.91-1) experimental; urgency=medium + + * Team upload + * New upstream development release + * Update wayland-protocols build-dependency to 1.16 + * d/copyright: Update + * Rebase patch series + * d/*.install: Sort file lists (wrap-and-sort -a) + * Normalize package lists with wrap-and-sort -a + * d/control: Normalize package stanza order with wrap-and-sort -abk + * Standards-Version: 4.2.0 (no changes required) + * d/libmutter-3-0.symbols: Update + * d/rules: Tell dh_shlibdeps about our private libraries + + -- Simon McVittie Mon, 20 Aug 2018 21:17:31 +0100 + + mutter (3.29.90-2) experimental; urgency=medium + + * Team upload + * Build-depend on GLib 2.57.2 for the new approach to overriding + GSettings per desktop + * d/p/clutter-actor-Inherit-clone-branch-depth-from-parent.patch, + d/p/Updated-Slovenian-translation.patch, + d/p/Updated-Slovenian-translation-1.patch: + Update to upstream 3.29.90-3-ga87c447b7 + * d/p/renderer-native-Check-calculated-transform-when-creating-.patch: + Apply proposed patch to fix a regression with rotated screens + (Closes: #905363) + * d/gbp.conf: Don't number patches + + -- Simon McVittie Sat, 04 Aug 2018 16:32:49 +0100 + + mutter (3.29.90-1) experimental; urgency=medium + + * Team upload + * New upstream release + - Don't try to use an invalid monitor mode to figure out scaling + (LP: #1723615) + * d/p/window-wayland-Always-update-monitor-for-non-user-ops.patch, + d/p/native-gpu-Handle-drmModeSetCrtc-failing-gracefully.patch, + d/p/wayland-Nullify-monitor-resources-when-updating-outputs.patch, + d/p/monitor-manager-Filter-out-low-screen-resolutions.patch, + d/p/window-Don-t-refuse-to-move-focus-to-the-grab-window.patch, + d/p/window-Explicitly-exclude-unmanaging-window-from-focus-ag.patch: + Drop patches that were applied upstream + * d/libmutter-3-0.symbols: Update + - Ignore ABI change in experimental: removal of + meta_prefs_override_preference_schema() + - Add Breaks on previous experimental gnome-shell + + -- Simon McVittie Wed, 01 Aug 2018 09:03:19 +0100 + + mutter (3.29.4-3) experimental; urgency=medium + + * Team upload + + [ Marco Trevisan (Treviño) ] + * d/p/window-wayland-Always-update-monitor-for-non-user-ops.patch: + - Always update monitor in wayland, avoiding crash (LP: #1784398) + * d/p/monitor-manager-Filter-out-low-screen-resolutions.patch: + - Don't return screen resolutions that can't be applied (LP: #1772831) + + [ Simon McVittie ] + * d/p/series: Sort patches that were already applied upstream to the + beginning of the patch series + * d/p/window-Don-t-refuse-to-move-focus-to-the-grab-window.patch, + d/p/window-Explicitly-exclude-unmanaging-window-from-focus-ag.patch: + Add patches from upstream to avoid crashing if a modal dialog closes + while being dragged (LP: #1422253) + * d/p/native-gpu-Handle-drmModeSetCrtc-failing-gracefully.patch, + d/p/wayland-Nullify-monitor-resources-when-updating-outputs.patch: + Add more bug fixes from upstream + * Update symbols file + + -- Simon McVittie Tue, 31 Jul 2018 09:43:13 +0100 + + mutter (3.29.4-2) experimental; urgency=medium + + * Generate dependencies for libmutter-3-0, not libmutter-2-0 + * d/libmutter-3-0.symbols: Update + * Standards-Version: 4.1.5 (no changes required) + * Set Rules-Requires-Root to no + * d/copyright: Remove obsolete FSF postal addresses + + -- Simon McVittie Fri, 27 Jul 2018 09:49:53 +0100 + + mutter (3.29.4-1) experimental; urgency=medium + + * debian/control*, gbp.conf: Update for experimental (3.29 series). + * New upstream release 3.29.4 (etc) + + Fix crash with parent-less modal dialogs + + Preserve paint volumes where possible to optimize CPU usage + + Fix Korean Hangul support on wayland + + Improve support for proprietary Nvidia driver + + Only upload HW cursor sprite to the GPU that will display them + + Improve EGLstream support + + Remove MetaScreen to prepare for non-mandatary X11 dependency + + Misc. bug fixes + + Fix size change animations on wayland + + Handle touch events on server-side titlebars + + Fix various input-method regressions + + Fix wayland build on FreeBSD + + Fix swapped colors in screenshots (again) + + Allow building with elogind + + Consider display rotation for cursor + + Fall back to non-modifier GBM surfaces + + Take inhibitors into account for monitoring idle + * debian/control*: Drop libupower-glib BD - mutter now accesses upower + directly. + * d/p/core-Return-1-if-meta_window_get_monitor-is-called-on-an-.patch: Drop, + this is applied upstream. + * debian/*: SONAME 2 -> 3 + + -- Iain Lane Wed, 25 Jul 2018 17:39:37 +0100 mutter (3.28.3-2) unstable; urgency=medium diff --cc debian/control index 7b5bf14,d6e1479..5a5716a --- a/debian/control +++ b/debian/control @@@ -34,33 -39,25 +39,27 @@@ Build-Depends: debhelper (>= 11) 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, + libxdamage-dev, libxext-dev, + libxfixes-dev, + libxi-dev (>= 2:1.6.0), + libxinerama-dev, + libxkbcommon-dev (>= 0.4.3), + libxkbcommon-x11-dev, + libxkbfile-dev, libxrandr-dev, libxrender-dev, - libsm-dev, - libice-dev, - libpam0g-dev, - libwayland-dev (>= 1.13.0) [linux-any], - wayland-protocols (>= 1.12) [linux-any], + libxt-dev, + wayland-protocols (>= 1.16) [linux-any], + xauth , xkb-data, xvfb , - xauth , - zenity + zenity, + libmtdev-dev, + libgles2-mesa-dev Rules-Requires-Root: no - Standards-Version: 4.1.5 + Standards-Version: 4.2.1 Vcs-Git: https://salsa.debian.org/gnome-team/mutter.git Vcs-Browser: https://salsa.debian.org/gnome-team/mutter diff --cc debian/control.in index 590f256,de5d64b..0c8ad0b --- a/debian/control.in +++ b/debian/control.in @@@ -30,33 -35,25 +35,27 @@@ Build-Depends: debhelper (>= 11) 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, + libxdamage-dev, libxext-dev, + libxfixes-dev, + libxi-dev (>= 2:1.6.0), + libxinerama-dev, + libxkbcommon-dev (>= 0.4.3), + libxkbcommon-x11-dev, + libxkbfile-dev, libxrandr-dev, libxrender-dev, - libsm-dev, - libice-dev, - libpam0g-dev, - libwayland-dev (>= 1.13.0) [linux-any], - wayland-protocols (>= 1.12) [linux-any], + libxt-dev, + wayland-protocols (>= 1.16) [linux-any], + xauth , xkb-data, xvfb , - xauth , - zenity + zenity, + libmtdev-dev, + libgles2-mesa-dev Rules-Requires-Root: no - Standards-Version: 4.1.5 + Standards-Version: 4.2.1 Vcs-Git: https://salsa.debian.org/gnome-team/mutter.git Vcs-Browser: https://salsa.debian.org/gnome-team/mutter diff --cc debian/rules index 5766b63,43c0c3d..2b2fb89 --- a/debian/rules +++ b/debian/rules @@@ -56,34 -59,3 +59,35 @@@ override_dh_shlibdeps override_dh_strip: dh_strip --dbgsym-migration='mutter-dbg (<< 3.18.3-2~)' + +override_dh_auto_clean: + dh_auto_clean + rm -f src/gtk-primary-selection-protocol.c + rm -f src/gtk-primary-selection-server-protocol.h + rm -f src/gtk-shell-protocol.c + rm -f src/gtk-shell-server-protocol.h + rm -f src/gtk-text-input-protocol.c + rm -f src/gtk-text-input-server-protocol.h + rm -f src/keyboard-shortcuts-inhibit-unstable-v1-protocol.c + rm -f src/keyboard-shortcuts-inhibit-unstable-v1-server-protocol.h + rm -f src/linux-dmabuf-unstable-v1-protocol.c + rm -f src/linux-dmabuf-unstable-v1-server-protocol.h + rm -f src/pointer-constraints-unstable-v1-protocol.c + rm -f src/pointer-constraints-unstable-v1-server-protocol.h + rm -f src/pointer-gestures-unstable-v1-protocol.c + rm -f src/pointer-gestures-unstable-v1-server-protocol.h + rm -f src/relative-pointer-unstable-v1-protocol.c + rm -f src/relative-pointer-unstable-v1-server-protocol.h + rm -f src/tablet-unstable-v2-protocol.c + rm -f src/tablet-unstable-v2-server-protocol.h + rm -f src/xdg-foreign-unstable-v1-protocol.c + rm -f src/xdg-foreign-unstable-v1-server-protocol.h + rm -f src/xdg-output-unstable-v1-protocol.c + rm -f src/xdg-output-unstable-v1-server-protocol.h + rm -f src/xdg-shell-protocol.c + rm -f src/xdg-shell-server-protocol.h + rm -f src/xdg-shell-unstable-v6-protocol.c + rm -f src/xdg-shell-unstable-v6-server-protocol.h + rm -f src/xwayland-keyboard-grab-unstable-v1-protocol.c + rm -f src/xwayland-keyboard-grab-unstable-v1-server-protocol.h ++