summaryrefslogtreecommitdiff
path: root/debian/patches/0001-Remove_incorrect_i18n.merge_file_argument.patch
blob: 0fb73d0390f48ef9fb0771991c1ff4af1b6ae30f (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
Fix accessibility conflict of constant and its value
Origin: upstream, https://gitlab.gnome.org/GNOME/simple-scan/-/commit/c50802b213c325cfa957d66955f6de96908710d9
Forwarded: not-needed
Applied-Upstream: commit: /c50802b213c325cfa957d66955f6de96908710d9
Last-Update: 2022-02-06
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
Index: trunk/data/meson.build
===================================================================
--- trunk.orig/data/meson.build
+++ trunk/data/meson.build
@@ -8,16 +8,14 @@ install_data ('org.gnome.SimpleScan.gsch
               install_dir: join_paths (datadir, 'glib-2.0', 'schemas'))
 meson.add_install_script ('meson_compile_gschema.py')
 
-i18n.merge_file ('desktop-file',
-                 input: 'simple-scan.desktop.in',
+i18n.merge_file (input: 'simple-scan.desktop.in',
                  output: 'simple-scan.desktop',
                  install: true,
                  install_dir: join_paths (datadir, 'applications'),
                  po_dir: '../po',
                  type: 'desktop')
 
-i18n.merge_file ('appdata-file',
-                 input: 'simple-scan.appdata.xml.in',
+i18n.merge_file (input: 'simple-scan.appdata.xml.in',
                  output: 'simple-scan.appdata.xml',
                  install: true,
                  install_dir: join_paths (datadir, 'metainfo'),