diff options
| author | Jörg Frings-Fürst <debian@jff.email> | 2022-02-06 19:47:02 +0100 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff.email> | 2022-02-06 19:47:02 +0100 |
| commit | 055f6f3e01bb718bfdd61331e1b13b0cdba6d718 (patch) | |
| tree | 2ca6334d6cc4a21e36eaf26289e2b7de41614b48 /debian/patches | |
| parent | abcd042fc0ee8698096f21b056574426a991dbd2 (diff) | |
| parent | 9f26dc8a2172b29a1d50a47a060ae3b9d0bee21e (diff) | |
Merge branch 'release/debian/40.7-1'debian/40.7-1
Diffstat (limited to 'debian/patches')
| -rw-r--r-- | debian/patches/0001-Remove_incorrect_i18n.merge_file_argument.patch | 30 | ||||
| -rw-r--r-- | debian/patches/0005-Build_error_with_vala.patch | 20 | ||||
| -rw-r--r-- | debian/patches/series | 2 |
3 files changed, 52 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'), diff --git a/debian/patches/0005-Build_error_with_vala.patch b/debian/patches/0005-Build_error_with_vala.patch new file mode 100644 index 0000000..76387f0 --- /dev/null +++ b/debian/patches/0005-Build_error_with_vala.patch @@ -0,0 +1,20 @@ +Remove incorrect i18n.merge_file argument +Origin: upstream, https://gitlab.gnome.org/GNOME/simple-scan/-/commit/da6626debe00be1a0660f30cf2bf7629186c01d5 +Bug: https://gitlab.gnome.org/GNOME/simple-scan/-/issues/284 +Forwarded: not-needed +Last-Update: 2022-02-06 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +Index: trunk/src/simple-scan.vala +=================================================================== +--- trunk.orig/src/simple-scan.vala ++++ trunk/src/simple-scan.vala +@@ -14,7 +14,7 @@ public class SimpleScan : Gtk.Applicatio + static bool show_version; + static bool debug_enabled; + static string? fix_pdf_filename = null; +- public const OptionEntry[] options = ++ const OptionEntry[] options = + { + { "version", 'v', 0, OptionArg.NONE, ref show_version, + /* Help string for command line --version flag */ diff --git a/debian/patches/series b/debian/patches/series index e69de29..e4ed019 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -0,0 +1,2 @@ +0001-Remove_incorrect_i18n.merge_file_argument.patch +0005-Build_error_with_vala.patch |