Codebase list gnome-shell-extensions / d3b93c7
Merge branch 'debian' into kali/master Sophie Brun 2 years ago
3 changed file(s) with 36 addition(s) and 0 deletion(s). Raw diff Collapse all Expand all
0 gnome-shell-extensions (41.1-2) unstable; urgency=medium
1
2 * Team upload
3 * d/p/meson-Drop-unused-argument-for-i18n.merge_file.patch:
4 Backport patch from upstream to fix FBTFS with Meson 0.61
5 (Closes: #1005534)
6
7 -- Simon McVittie <[email protected]> Tue, 15 Feb 2022 11:18:30 +0000
8
09 gnome-shell-extensions (41.1-1kali1) kali-dev; urgency=medium
110
211 * Sync with Debian
0 From: Jan Beich <[email protected]>
1 Date: Tue, 25 Jan 2022 11:49:54 +0000
2 Subject: meson: Drop unused argument for i18n.merge_file()
3
4 Ignored in Meson < 0.60.0, deprecated since 0.60.1 and fatal since 0.61.0.
5
6 data/meson.build:23:0: ERROR: Function does not take positional arguments.
7
8 Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell-extensions/-/merge_requests/210>
9 Origin: backport, 42.beta, commit:cdaa837d48894737ca0b4e7d2dfb365119e53759
10 Bug-Debian: https://bugs.debian.org/1005534
11 ---
12 data/meson.build | 2 +-
13 1 file changed, 1 insertion(+), 1 deletion(-)
14
15 diff --git a/data/meson.build b/data/meson.build
16 index 27f4287..a4bcd5e 100644
17 --- a/data/meson.build
18 +++ b/data/meson.build
19 @@ -1,5 +1,5 @@
20 session_desktop = 'gnome-classic.desktop'
21 -i18n.merge_file('',
22 +i18n.merge_file(
23 input: session_desktop + '.in',
24 output: session_desktop,
25 po_dir: '../po',
00 gnome-session-classic-wrapper-script.patch
1 meson-Drop-unused-argument-for-i18n.merge_file.patch
12 apps-menu-with-multiple-levels.patch