diff -Nru gitg-41/debian/changelog gitg-41/debian/changelog --- gitg-41/debian/changelog 2022-01-02 16:35:32.000000000 +0000 +++ gitg-41/debian/changelog 2022-02-13 15:11:00.000000000 +0000 @@ -1,3 +1,12 @@ +gitg (41-2) unstable; urgency=medium + + * Team upload + * d/p/meson-drop-unused-argument-for-i18n.merge_file.patch: + Add patch from upstream to fix FTBFS with Meson 0.61 + (Closes: #1005564) + + -- Simon McVittie Sun, 13 Feb 2022 15:11:00 +0000 + gitg (41-1) unstable; urgency=medium * New upstream release diff -Nru gitg-41/debian/patches/meson-drop-unused-argument-for-i18n.merge_file.patch gitg-41/debian/patches/meson-drop-unused-argument-for-i18n.merge_file.patch --- gitg-41/debian/patches/meson-drop-unused-argument-for-i18n.merge_file.patch 1970-01-01 00:00:00.000000000 +0000 +++ gitg-41/debian/patches/meson-drop-unused-argument-for-i18n.merge_file.patch 2022-02-13 15:11:00.000000000 +0000 @@ -0,0 +1,35 @@ +From: Jan Beich +Date: Mon, 24 Jan 2022 12:17:52 +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:8:0: ERROR: Function does not take positional arguments. +data/meson.build:44:0: ERROR: Function does not take positional arguments. + +Origin: upstream, 42, commit:1978973b12848741b08695ec2020bac98584d636 +Bug-Debian: https://bugs.debian.org/1005564 +--- + data/meson.build | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/data/meson.build b/data/meson.build +index a8b90fd..2413531 100644 +--- a/data/meson.build ++++ b/data/meson.build +@@ -6,7 +6,6 @@ desktop_config = configuration_data() + desktop_config.set('icon', application_id) + desktop_config.set('binary', gitg_name) + i18n.merge_file( +- desktop, + type: 'desktop', + input: configure_file( + input: desktop + '.in.in', +@@ -42,7 +41,6 @@ appdata_config = configuration_data() + appdata_config.set('app-id', application_id) + appdata_config.set('gettext', gitg_name) + i18n.merge_file( +- appdata, + type: 'xml', + input: configure_file( + input: appdata + '.in.in', diff -Nru gitg-41/debian/patches/series gitg-41/debian/patches/series --- gitg-41/debian/patches/series 2022-01-02 16:35:32.000000000 +0000 +++ gitg-41/debian/patches/series 2022-02-13 15:11:00.000000000 +0000 @@ -0,0 +1 @@ +meson-drop-unused-argument-for-i18n.merge_file.patch