Control: tags -1 +patch
Let me know if you need more information about these patches.
debhelper 10.3 is the first version that supported meson.
Thanks,
Jeremy Bicha
From d8d7420c6081042ff5513fe1db54dc506af41660 Mon Sep 17 00:00:00 2001
From: Jeremy Bicha <jbi...@debian.org>
Date: Thu, 16 Nov 2017 13:31:20 -0500
Subject: [PATCH 1/3] Update Build-Depends from Ubuntu
---
debian/control | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/debian/control b/debian/control
index 23377ab..32c80b3 100644
--- a/debian/control
+++ b/debian/control
@@ -4,23 +4,22 @@ Priority: optional
Maintainer: Jörg Frings-Fürst <debian@jff.email>
Standards-Version: 4.1.1
Build-Depends:
- debhelper (>= 10),
+ debhelper (>= 10.3~),
+ gettext,
gnome-pkg-tools (>= 0.10),
+ itstool,
libcairo2-dev,
libcolord-dev,
libglib2.0-dev (>= 2.32),
libgtk-3-dev,
libgdk-pixbuf2.0-dev (>=2.31.1),
libgusb-dev,
- libjpeg-dev,
- libpackagekit-glib2-dev,
+ libpackagekit-glib2-dev (>= 1.1.5),
libsane-dev,
- librsvg2-dev,
- libxml2-utils,
+ libwebp-dev,
meson,
python-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
From a2f04c2c91666aeb88b3576d076c764da1a14ed4 Mon Sep 17 00:00:00 2001
From: Jeremy Bicha <jbi...@debian.org>
Date: Thu, 16 Nov 2017 13:32:21 -0500
Subject: [PATCH 2/3] Update apport hook to report versions for more scanner
drivers
---
debian/source_simple-scan.py | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/debian/source_simple-scan.py b/debian/source_simple-scan.py
index 6fab46c..5c9711f 100644
--- a/debian/source_simple-scan.py
+++ b/debian/source_simple-scan.py
@@ -8,7 +8,11 @@ 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', '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)
--
2.14.1
From f78505ff27f6febc4d620be39f6c79c61e41a561 Mon Sep 17 00:00:00 2001
From: Jeremy Bicha <jbi...@debian.org>
Date: Thu, 16 Nov 2017 13:35:44 -0500
Subject: [PATCH 3/3] Add workaround for Ubuntu translations issue
On Ubuntu, dh_gnome automatically runs dh_translations.
The override is harmless on Debian.
Closes: #881934
---
debian/rules | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/debian/rules b/debian/rules
index 0112413..2ad0f7a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -32,10 +32,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
--
2.14.1
