diff --git a/debian/changelog b/debian/changelog index c4f1ef54..5f7c8049 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +gnome-shell-extensions (41.1-2) unstable; urgency=medium + + * Team upload + * d/p/meson-Drop-unused-argument-for-i18n.merge_file.patch: + Backport patch from upstream to fix FBTFS with Meson 0.61 + (Closes: #1005534) + + -- Simon McVittie Tue, 15 Feb 2022 11:18:30 +0000 + gnome-shell-extensions (41.1-1) unstable; urgency=medium * New upstream release diff --git a/debian/patches/gnome-session-classic-wrapper-script.patch b/debian/patches/gnome-session-classic-wrapper-script.patch index a95b6704..4c1ce7fd 100644 --- a/debian/patches/gnome-session-classic-wrapper-script.patch +++ b/debian/patches/gnome-session-classic-wrapper-script.patch @@ -16,7 +16,7 @@ as a workaround. Once [1] is fixed, this should be removed again. 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/gnome-classic.desktop.in b/data/gnome-classic.desktop.in -index 5df6821..34827ee 100644 +index 13da2b5..d627655 100644 --- a/data/gnome-classic.desktop.in +++ b/data/gnome-classic.desktop.in @@ -1,7 +1,7 @@ diff --git a/debian/patches/meson-Drop-unused-argument-for-i18n.merge_file.patch b/debian/patches/meson-Drop-unused-argument-for-i18n.merge_file.patch new file mode 100644 index 00000000..3b75388c --- /dev/null +++ b/debian/patches/meson-Drop-unused-argument-for-i18n.merge_file.patch @@ -0,0 +1,26 @@ +From: Jan Beich +Date: Tue, 25 Jan 2022 11:49:54 +0000 +Subject: meson: Drop unused argument for i18n.merge_file() + +Ignored in Meson < 0.60.0, deprecated since 0.60.1 and fatal since 0.61.0. + +data/meson.build:23:0: ERROR: Function does not take positional arguments. + +Part-of: +Origin: backport, 42.beta, commit:cdaa837d48894737ca0b4e7d2dfb365119e53759 +Bug-Debian: https://bugs.debian.org/1005534 +--- + data/meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/data/meson.build b/data/meson.build +index 27f4287..a4bcd5e 100644 +--- a/data/meson.build ++++ b/data/meson.build +@@ -1,5 +1,5 @@ + session_desktop = 'gnome-classic.desktop' +-i18n.merge_file('', ++i18n.merge_file( + input: session_desktop + '.in', + output: session_desktop, + po_dir: '../po', diff --git a/debian/patches/series b/debian/patches/series index 41d1e603..a5a41972 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ gnome-session-classic-wrapper-script.patch +meson-Drop-unused-argument-for-i18n.merge_file.patch