Merge branch 'feature/upstream' into develop

1 files changed, 6 insertions, 16 deletions

diff --git a/debian/rules b/debian/rules
index 9eec217..0112413 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,29 +20,19 @@
 # - remove gcc-6 comments
 # - remove override_dh_auto_build
 #
+# 2017-07-16 Jörg Frings-Fürst <debian@jff-webhosting.net>
+#
+# - switch to meson
+# - remove override_dh_strip
+#
 
 #
 # Hardening
 #
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
-
 %:
-	dh $@ --with=autoreconf,scour
-
-# Autoreconf due to 01_lpi.patch
-override_dh_autoreconf:
-	[ -e gnome-doc-utils.make ] || \
-	ln -s /usr/share/gnome-doc-utils/gnome-doc-utils.make
-	dh_autoreconf
-
-override_dh_auto_clean:
-	dh_auto_clean
-	[ ! -h gnome-doc-utils.make ] || \
-	rm gnome-doc-utils.make
-
-override_dh_strip:
-	dh_strip -psimple-scan --dbg-package=simple-scan-dbg
+	dh $@  --buildsystem=meson --with=scour
 
 override_dh_installdocs:
 	dh_installdocs --link-doc=simple-scan