Merge tag 'debian/40.7-1' into develop

New upstream release

4 files changed, 59 insertions, 2 deletions

diff --git a/debian/changelog b/debian/changelog
index 1e292dc..1f954af 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,17 @@
-simple-scan (40.7-1) UNRELEASED; urgency=medium
+simple-scan (40.7-1) unstable; urgency=medium
 
   * New upstream release.
   * debian/copyright:
     - Add year 2022 to myself.
   * Declare compliance with Debian Policy 4.6.0.1 (No changes needed).
   * New .gitignore.
+  * New patches:
+    - debian/patches/0001-Remove_incorrect_i18n.merge_file_argument.patch:
+      Fix build error with meson > 0.60.
+    - debian/patches/0005-Build_error_with_vala.patch:
+      Fix accessibility conflict of constant and its value.
 
- -- Jörg Frings-Fürst <debian@jff.email>  Sun, 09 Jan 2022 17:52:55 +0100
+ -- Jörg Frings-Fürst <debian@jff.email>  Sun, 06 Feb 2022 15:20:34 +0100
 
 simple-scan (40.6-1) unstable; urgency=medium
 
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