Merge branch 'develop'

7 files changed, 42 insertions, 6 deletions

diff --git a/debian/changelog b/debian/changelog
index cbe80f1..6833100 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,18 @@
+simple-scan (3.26.2-2) unstable; urgency=medium
+
+  * New patches/0015-xdg-email.patch: Add space between xdg-email and parameter.
+  * debian/copyright: refresh years.
+  * debian/control: Switch from python-scour to python3-scour since dh_scour
+      is now provided by python3-scour only as of scour 0.36-1.
+  * Bump compat to 11:
+    - Change debian/compat to 11.
+    - Change debhelper version at debian/control to >= 11.
+  * Declare compliance with Debian Policy 4.1.3 (No changes needed).
+  * New source.lintian-overrides: Override lintian error
+      missing-build-dependency-for-dh-addon.
+
+ -- Jörg Frings-Fürst <debian@jff.email>  Sun, 14 Jan 2018 17:29:46 +0100
+
 simple-scan (3.26.2-1) unstable; urgency=medium
 
   * New upstream release (Closes: #881345):
diff --git a/debian/compat b/debian/compat
index f599e28..b4de394 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-10
+11
diff --git a/debian/control b/debian/control
index 23377ab..016518d 100644
--- a/debian/control
+++ b/debian/control
@@ -2,9 +2,9 @@ Source: simple-scan
 Section: gnome
 Priority: optional
 Maintainer: Jörg Frings-Fürst <debian@jff.email>
-Standards-Version: 4.1.1
+Standards-Version: 4.1.3
 Build-Depends:
- debhelper (>= 10),
+ debhelper (>= 11),
  gnome-pkg-tools (>= 0.10),
  libcairo2-dev,
  libcolord-dev,
@@ -18,7 +18,7 @@ Build-Depends:
  librsvg2-dev,
  libxml2-utils,
  meson,
- python-scour,
+ python3-scour,
  valac (>= 0.22),
  yelp-tools,
  zlib1g-dev (>= 1.2.7)
diff --git a/debian/copyright b/debian/copyright
index 84bf9e4..ee27b65 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,14 +4,14 @@ Upstream-Contact: Robert Ancell <robert.ancell@canonical.com>
 Source: https://launchpad.net/simple-scan/+download
 
 Files: *
-Copyright: 2009-2016 Canonical Ltd
+Copyright: 2009-2017 Canonical Ltd
 License: GPL-3+
 
 Files: debian/*
 Copyright:
  2009-2012 Alessio Treglia <alessio@debian.org>
  2009      Robert Ancell <robert.ancell@canonical.com>
- 2014-2017 Jörg Frings-Fürst <debian@jff.email>
+ 2014-2018 Jörg Frings-Fürst <debian@jff.email>
 License: GPL-3+
 
 License: GPL-3+
diff --git a/debian/patches/0015-xdg-email.patch b/debian/patches/0015-xdg-email.patch
new file mode 100644
index 0000000..a86c354
--- /dev/null
+++ b/debian/patches/0015-xdg-email.patch
@@ -0,0 +1,18 @@
+Description: Add space between xdg-email ans parameter
+Author: Jörg Frings-Fürst <debian@jff.email>
+Last-Update: 2018-01-13 
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+Index: trunk/src/app-window.vala
+===================================================================
+--- trunk.orig/src/app-window.vala
++++ trunk/src/app-window.vala
+@@ -1193,7 +1193,7 @@ public class AppWindow : Gtk.Application
+             yield book.save_async (type, settings.get_int ("jpeg-quality"), file, null, null);
+             var command_line = "xdg-email";
+             if (type == "pdf")
+-                command_line += "--attach %s".printf (file.get_path ());
++                command_line += " --attach %s".printf (file.get_path ());
+             else
+             {
+                 for (var i = 0; i < book.n_pages; i++) {
diff --git a/debian/patches/series b/debian/patches/series
index 82e9ebc..283f89a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 #0100-typos.patch
 #0005-zlib.patch
+0015-xdg-email.patch
 0010-metadata.patch
diff --git a/debian/source.lintian-overrides b/debian/source.lintian-overrides
new file mode 100644
index 0000000..25255de
--- /dev/null
+++ b/debian/source.lintian-overrides
@@ -0,0 +1,2 @@
+# see bug #885106
+simple-scan source: missing-build-dependency-for-dh-addon