diff options
author | Jörg Frings-Fürst <debian@jff.email> | 2022-02-06 19:47:23 +0100 |
---|---|---|
committer | Jörg Frings-Fürst <debian@jff.email> | 2022-02-06 19:47:23 +0100 |
commit | 14afa21f4a428f9a6a5788dc1fb8a3507a42d02f (patch) | |
tree | 2ca6334d6cc4a21e36eaf26289e2b7de41614b48 /debian/patches/0001-Remove_incorrect_i18n.merge_file_argument.patch | |
parent | 93ed045b57d6a54c8aca76949c0017decbd2b787 (diff) | |
parent | 055f6f3e01bb718bfdd61331e1b13b0cdba6d718 (diff) |
Merge tag 'debian/40.7-1' into develop
New upstream release
Diffstat (limited to 'debian/patches/0001-Remove_incorrect_i18n.merge_file_argument.patch')
-rw-r--r-- | debian/patches/0001-Remove_incorrect_i18n.merge_file_argument.patch | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/debian/patches/0001-Remove_incorrect_i18n.merge_file_argument.patch b/debian/patches/0001-Remove_incorrect_i18n.merge_file_argument.patch new file mode 100644 index 0000000..0fb73d0 --- /dev/null +++ b/debian/patches/0001-Remove_incorrect_i18n.merge_file_argument.patch @@ -0,0 +1,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'), |