Some buildsystem changes

5 files changed, 33 insertions, 12 deletions

diff --git a/debian/changelog b/debian/changelog
index 0a16fd4..185b19e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,8 +17,14 @@ simple-scan (3.28.1-1) unstable; urgency=medium
       + 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>  Tue, 10 Jul 2018 21:31:03 +0200
 
diff --git a/debian/control b/debian/control
index b465f78..8ada372 100644
--- a/debian/control
+++ b/debian/control
@@ -5,28 +5,26 @@ Maintainer: Jörg Frings-Fürst <debian@jff.email>
 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,
  libwebp-dev,
- libxml2-utils,
  meson,
  python3-cairo,
  python3-gi,
  python-gi-cairo,
  python3-scour,
  scour,
- valac (>= 0.22),
- yelp-tools,
- zlib1g-dev (>= 1.2.7)
+ 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
diff --git a/debian/files b/debian/files
deleted file mode 100644
index dbbe0a0..0000000
--- a/debian/files
+++ /dev/null
@@ -1 +0,0 @@
-simple-scan_3.28.1-1_source.buildinfo gnome optional
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)