Merge branch 'feature/upstream' into develop

4 files changed, 28 insertions, 16 deletions

diff --git a/debian/changelog b/debian/changelog
index 8f9d8db..8fece38 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,15 +1,23 @@
-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).
-
- -- Jörg Frings-Fürst <debian@jff.email>  Tue, 06 Mar 2018 19:02:24 +0100
+simple-scan (3.28.1-1) UNRELEASED; urgency=medium
+
+  * New upstream release.
+  * Remove upstream applied patches:
+    - 0010-metadata.patch
+    - 0015-xdg-email.patch
+  * debian/copyright:
+    - refresh years.
+    - Use secure copyright format URI.
+  * 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.
+    - Add missing Build-Depends:
+      + libwebp-dev
+      + python3-cairo
+      + python3-gi
+      + python3-gi-cairo
+  * Declare compliance with Debian Policy 4.1.4 (No changes needed).
+
+ -- Jörg Frings-Fürst <debian@jff.email>  Mon, 30 Apr 2018 15:45:51 +0200
 
 simple-scan (3.26.2-1) unstable; urgency=medium
 
diff --git a/debian/control b/debian/control
index b33c807..b357079 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: simple-scan
 Section: gnome
 Priority: optional
 Maintainer: Jörg Frings-Fürst <debian@jff.email>
-Standards-Version: 4.1.3
+Standards-Version: 4.1.4
 Build-Depends:
  debhelper (>= 11),
  gnome-pkg-tools (>= 0.10),
@@ -16,8 +16,12 @@ Build-Depends:
  libpackagekit-glib2-dev,
  libsane-dev,
  librsvg2-dev,
+ libwebp-dev,
  libxml2-utils,
  meson,
+ python3-cairo,
+ python3-gi,
+ python-gi-cairo,
  python3-scour,
  scour,
  valac (>= 0.22),
diff --git a/debian/copyright b/debian/copyright
index ee27b65..f60e3c0 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,4 +1,4 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: Simple Scan
 Upstream-Contact: Robert Ancell <robert.ancell@canonical.com>
 Source: https://launchpad.net/simple-scan/+download
diff --git a/debian/patches/series b/debian/patches/series
index 283f89a..f4d4e7f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,4 @@
 #0100-typos.patch
 #0005-zlib.patch
-0015-xdg-email.patch
-0010-metadata.patch
+#0015-xdg-email.patch
+#0010-metadata.patch