Package: release.debian.org
Severity: normal
User: release.debian@packages.debian.org
Usertags: unblock
While preparing gnome-shell/3.30.2-9 (see separate unblock request) I
thought I should also look into updating the closely-related mutter
package from the upstream gnome-3-30 stable branch.
> mutter (3.30.2-7) UNRELEASED; urgency=medium
>
> [ Iain Lane ]
> * Update metadata for debian/buster branch
>
> [ Simon McVittie ]
> * Update to upstream gnome-3-30 branch at 3.30.2-10-gdb8a29b34
>- d/p/clutter-evdev-Fix-toggling-accessibility-features-from-ke.patch:
> Allow keyboard accessibility features to be switched on when using
> Wayland mode. Previously, this was wrongly controlled by the
> "togglekeys" setting, which is off by default and has no UI, meaning
> that in practice keyboard accessibility features were always off.
>- d/p/clutter-Fix-check-for-keyboard-a11y-features.patch:
> Fix the sense of the check for keyboard accessibility features.
> Previously, they were enabled when disabled in gnome-control-center
> and vice versa.
These are basically a single "transaction". The first patch makes
keyboard accessibility features (Universal Access -> Typing Assist
(AccessX) in gnome-control-center) work in Wayland mode at all; the
second makes them work *correctly*.
> * d/libmutter-3-0.symbols: Add meta_gpu_kms_get_current_time_ns,
>which was added in 3.30.2-2 by
>d/p/Sync-to-the-hardware-refresh-rate-not-just-60.00Hz.patch
>
> -- Simon McVittie Sat, 27 Apr 2019 19:48:48 +0100
OK to upload?
Thanks,
Simon
debian/changelog | 22 +++
debian/control | 2 +-
debian/control.in | 2 +-
debian/gbp.conf| 4 +-
debian/libmutter-3-0.symbols | 1 +
...tter-Fix-check-for-keyboard-a11y-features.patch | 26 +
...x-toggling-accessibility-features-from-ke.patch | 67 ++
debian/patches/series | 2 +
8 files changed, 122 insertions(+), 4 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 2210383f9..1f4dbd83f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,25 @@
+mutter (3.30.2-7) UNRELEASED; urgency=medium
+
+ [ Iain Lane ]
+ * Update metadata for debian/buster branch
+
+ [ Simon McVittie ]
+ * Update to upstream gnome-3-30 branch at 3.30.2-10-gdb8a29b34
+- d/p/clutter-evdev-Fix-toggling-accessibility-features-from-ke.patch:
+ Allow keyboard accessibility features to be switched on when using
+ Wayland mode. Previously, this was wrongly controlled by the
+ "togglekeys" setting, which is off by default and has no UI, meaning
+ that in practice keyboard accessibility features were always off.
+- d/p/clutter-Fix-check-for-keyboard-a11y-features.patch:
+ Fix the sense of the check for keyboard accessibility features.
+ Previously, they were enabled when disabled in gnome-control-center
+ and vice versa.
+ * d/libmutter-3-0.symbols: Add meta_gpu_kms_get_current_time_ns,
+which was added in 3.30.2-2 by
+d/p/Sync-to-the-hardware-refresh-rate-not-just-60.00Hz.patch
+
+ -- Simon McVittie Sat, 27 Apr 2019 19:48:48 +0100
+
mutter (3.30.2-6) unstable; urgency=medium
* Team upload
diff --git a/debian/control b/debian/control
index 49ed75497..4e81c169b 100644
--- a/debian/control
+++ b/debian/control
@@ -59,7 +59,7 @@ Build-Depends: debhelper (>= 11),
zenity
Rules-Requires-Root: no
Standards-Version: 4.3.0
-Vcs-Git: https://salsa.debian.org/gnome-team/mutter.git
+Vcs-Git: https://salsa.debian.org/gnome-team/mutter.git -b debian/buster
Vcs-Browser: https://salsa.debian.org/gnome-team/mutter
Package: mutter
diff --git a/debian/control.in b/debian/control.in
index bf0027521..459a7bad3 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -55,7 +55,7 @@ Build-Depends: debhelper (>= 11),
zenity
Rules-Requires-Root: no
Standards-Version: 4.3.0
-Vcs-Git: https://salsa.debian.org/gnome-team/mutter.git
+Vcs-Git: https://salsa.debian.org/gnome-team/mutter.git -b debian/buster
Vcs-Browser: https://salsa.debian.org/gnome-team/mutter
Package: mutter
diff --git a/debian/gbp.conf b/debian/gbp.conf
index b24011a15..b4c4ed510 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,7 +1,7 @@
[DEFAULT]
pristine-tar = True
-debian-branch = debian/master
-upstream-branch = upstream/latest
+debian-branch = debian/buster
+upstream-branch = upstream/3.30.x
upstream-vcs-tag = %(version)s
[buildpackage]
diff --git a/debian/libmutter-3-0.symbols b/debian/libmutter-3-0.symbols
index 7fe75199f..15d78c4e9 100644
--- a/debian/libmutter-3-0.symbols
+++ b/debian/libmutter-3-0.symbols
@@ -699,6 +699,7 @@ libmutter-3.so.0 libmutter-3-0 #MINVER#
(arch=linux-any)meta_gpu_kms_can_have_outputs@Base 3.29.92
(arch=linux-any)meta_gpu
