Merge branch 'release/3.28.1-1'3.28.1-1

12 files changed, 87 insertions, 125 deletions

diff --git a/debian/changelog b/debian/changelog
index 8f9d8db..5a08639 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,15 +1,33 @@
-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) unstable; urgency=medium
+
+  * New upstream release (Closes: #892944).
+  * Remove upstream applied patches:
+    - 0010-metadata.patch
+    - 0015-xdg-email.patch
+  * debian/copyright:
+    - refresh years.
+    - Use secure copyright format URI.
+    - Add new upstream authors.
+  * 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 to use all features:
+      + libwebp-dev
+      + python3-cairo
+      + python3-gi
+      + python3-gi-cairo
+    - Switch Vcs-* to new location.
+    - Switch to new homepage.
+    - Remove unneeded build depends versions.
+  * Declare compliance with Debian Policy 4.1.5 (No changes needed).
+  * Refresh debian/upstream/metadata.
+  * Some buildsystem changes (Closes: #881934):
+    - debian/rules: Add gnome and dh_translation handling.
+    - debian/control: Refresh build depends.
+    - debian/source_simple-scan.py: Report versions for more scanner drivers.
+    Thanks to Jeremy Bicha <jbicha@debian.org>
+
+ -- Jörg Frings-Fürst <debian@jff.email>  Mon, 16 Jul 2018 10:42:36 +0200
 
 simple-scan (3.26.2-1) unstable; urgency=medium
 
diff --git a/debian/control b/debian/control
index b33c807..8ada372 100644
--- a/debian/control
+++ b/debian/control
@@ -2,30 +2,32 @@ 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.5
 Build-Depends:
  debhelper (>= 11),
- gnome-pkg-tools (>= 0.10),
+ gettext,
+ gnome-pkg-tools,
+ itstool,
  libcairo2-dev,
  libcolord-dev,
- libglib2.0-dev (>= 2.32),
+ libglib2.0-dev,
  libgtk-3-dev,
- libgdk-pixbuf2.0-dev (>=2.31.1),
+ libgdk-pixbuf2.0-dev,
  libgusb-dev,
- libjpeg-dev,
  libpackagekit-glib2-dev,
  libsane-dev,
- librsvg2-dev,
- libxml2-utils,
+ libwebp-dev,
  meson,
+ python3-cairo,
+ python3-gi,
+ python-gi-cairo,
  python3-scour,
  scour,
- valac (>= 0.22),
- yelp-tools,
- zlib1g-dev (>= 1.2.7)
-Homepage: https://launchpad.net/simple-scan
-Vcs-Git: https://anonscm.debian.org/cgit/collab-maint/simple-scan.git
-Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/simple-scan.git
+ valac,
+ zlib1g-dev
+Homepage: https://gitlab.gnome.org/GNOME/simple-scan
+Vcs-Git: git://jff.email/opt/git/simple-scan.git
+Vcs-Browser: https://jff.email/cgit/simple-scan.git
 
 Package: simple-scan
 Architecture: linux-any
diff --git a/debian/copyright b/debian/copyright
index ee27b65..2ff678c 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,17 +1,27 @@
-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
+Source: https://gitlab.gnome.org/GNOME/simple-scan
 
 Files: *
-Copyright: 2009-2017 Canonical Ltd
+Copyright: 2009-2018 Canonical Ltd
+License: GPL-3+
+
+Files: src/screensaver.vala
+       src/libwebpmux.vapi
+       src/libwebp.vapi
+Copyright: 2017      Stéphane Fillion
+License: GPL-3+
+
+Files: src/autosave-manager.vala
+Copyright: 2011      Timo Kluck
+           2011      Robert Ancell <robert.ancell@canonical.com>
 License: GPL-3+
 
 Files: debian/*
-Copyright:
- 2009-2012 Alessio Treglia <alessio@debian.org>
- 2009      Robert Ancell <robert.ancell@canonical.com>
- 2014-2018 Jörg Frings-Fürst <debian@jff.email>
+Copyright: 2009-2012 Alessio Treglia <alessio@debian.org>
+           2009      Robert Ancell <robert.ancell@canonical.com>
+           2014-2018 Jörg Frings-Fürst <debian@jff.email>
 License: GPL-3+
 
 License: GPL-3+
diff --git a/debian/files b/debian/files
new file mode 100644
index 0000000..dbbe0a0
--- /dev/null
+++ b/debian/files
@@ -0,0 +1 @@
+simple-scan_3.28.1-1_source.buildinfo gnome optional
diff --git a/debian/patches/0005-zlib.patch b/debian/patches/0005-zlib.patch
deleted file mode 100644
index 3e1fb0a..0000000
--- a/debian/patches/0005-zlib.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Description: add zlib
-Last-Update: 2015-01-19
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: trunk/configure.ac
-===================================================================
---- trunk.orig/configure.ac
-+++ trunk/configure.ac
-@@ -71,6 +71,7 @@ AM_CONDITIONAL(HAVE_PACKAGEKIT, test $ha
- 
- AC_CHECK_HEADERS([sane/sane.h],[],[AC_MSG_ERROR([SANE not found])])
- AC_CHECK_HEADERS([sane/saneopts.h],[],[AC_MSG_ERROR([SANE not found])])
-+AC_CHECK_HEADERS([zlib.h],[],[AC_MSG_ERROR([ZLib not found])])
- 
- dnl ###########################################################################
- dnl Documentation
-Index: trunk/src/Makefile.am
-===================================================================
---- trunk.orig/src/Makefile.am
-+++ trunk/src/Makefile.am
-@@ -57,6 +57,7 @@ simple_scan_LDADD = \
- 	$(COLORD_LIBS) \
- 	$(PACKAGEKIT_LIBS) \
- 	-lsane \
-+	-lz \
- 	-lm
- 
- CLEANFILES = \
diff --git a/debian/patches/0010-metadata.patch b/debian/patches/0010-metadata.patch
deleted file mode 100644
index 7277159..0000000
--- a/debian/patches/0010-metadata.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Description: Install metadate into /usr/share/metainfo/
-Author: Jörg Frings-Fürst <debian@jff.email>
-Last-Update: 2017-11-12
----
-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
-@@ -23,7 +23,7 @@ i18n.merge_file ('appdata-file',
-                  input: 'simple-scan.appdata.xml.in',
-                  output: 'simple-scan.appdata.xml',
-                  install: true,
--                 install_dir: join_paths (datadir, 'appdata'),
-+                 install_dir: join_paths (datadir, 'metainfo'),
-                  po_dir: '../po')
- 
- install_man ('simple-scan.1')
diff --git a/debian/patches/0015-xdg-email.patch b/debian/patches/0015-xdg-email.patch
deleted file mode 100644
index a86c354..0000000
--- a/debian/patches/0015-xdg-email.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-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/0100-typos.patch b/debian/patches/0100-typos.patch
deleted file mode 100644
index 0f63a81..0000000
--- a/debian/patches/0100-typos.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Description: Typos
-Author: Jörg Frings-Fürst <debian@jff-webhosting.net>
-Last-Update: 206-04-10
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: trunk/src/autosave-manager.vala
-===================================================================
---- trunk.orig/src/autosave-manager.vala
-+++ trunk/src/autosave-manager.vala
-@@ -74,7 +74,7 @@ public class AutosaveManager
-         catch (Error e)
-         {
-             if (!(e is FileError.NOENT))
--                warning ("Could not load autosave infomation; not restoring any autosaves: %s", e.message);
-+                warning ("Could not load autosave information; not restoring any autosaves: %s", e.message);
-             return;
-         }
-         var pages = get_value (file, "simple-scan", "pages");
diff --git a/debian/patches/series b/debian/patches/series
index 283f89a..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +0,0 @@
-#0100-typos.patch
-#0005-zlib.patch
-0015-xdg-email.patch
-0010-metadata.patch
diff --git a/debian/rules b/debian/rules
index 0112413..a5b6d0e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -25,6 +25,11 @@
 # - switch to meson
 # - remove override_dh_strip
 #
+# 2018-07-16 Jörg Frings-Fürst <debian@jff.email>
+#
+# - use gnome and override_dh_translation.
+#
+
 
 #
 # Hardening
@@ -32,10 +37,18 @@
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
 %:
-	dh $@  --buildsystem=meson --with=scour
+	dh $@  --buildsystem=meson --with gnome,scour
 
 override_dh_installdocs:
 	dh_installdocs --link-doc=simple-scan
 
 override_dh_installchangelogs:
 	dh_installchangelogs NEWS
+
+override_dh_gnome_clean:
+	dh_gnome_clean --no-control
+
+# Work around Ubuntu translations issue
+override_dh_translations:
+	ninja -C obj-$(DEB_HOST_GNU_TYPE) simple-scan-pot
+	dh_translations
diff --git a/debian/source_simple-scan.py b/debian/source_simple-scan.py
index 6fab46c..7d74c50 100644
--- a/debian/source_simple-scan.py
+++ b/debian/source_simple-scan.py
@@ -8,7 +8,12 @@ import os.path
 from apport.hookutils import *
 
 LOG_FILE = os.path.expanduser('~/.cache/simple-scan/simple-scan.log')
-driver_packages = ['libsane', 'libsane-extras', 'hplip', 'hpoj']
+driver_packages = ['libsane', 'libsane1', 'libsane-extras', # SANE drivers
+                   'hplip', 'hpoj', # HP drivers
+                   'iscan', 'iscan-data', 'iscan-network-nt', # Epson drivers
+                   'brscan', 'brscan2', 'brscan3', 'brscan4' # Brother drivers
+                  ]
+
 
 def add_info(report):
     attach_hardware(report)
diff --git a/debian/upstream/metadata b/debian/upstream/metadata
index abbb658..94669e3 100644
--- a/debian/upstream/metadata
+++ b/debian/upstream/metadata
@@ -1,6 +1,5 @@
-Bug-Database: https://bugs.launchpad.net/simple-scan
-Bug-Submit: https://bugs.launchpad.net/simple-scan/+filebug
-Contact: https://launchpad.net/~simple-scan-team
+Bug-Database: https://gitlab.gnome.org/GNOME/simple-scan/issues
+Bug-Submit: https://gitlab.gnome.org/GNOME/simple-scan/issues/new?issue%5Bassignee_id%5D=&issue%5Bmilestone_id%5D=
 Name: simple-scan
-Repository: http://bazaar.launchpad.net/~simple-scan-team/simple-scan/trunk
-Repository-Browse: http://bazaar.launchpad.net/~simple-scan-team/simple-scan/trunk/files
+Repository: https://gitlab.gnome.org/GNOME/simple-scan.git
+Repository-Browse: https://gitlab.gnome.org/GNOME/simple-scan/tree/master