Switch to meson Part2

3 files changed, 11 insertions, 9 deletions

diff --git a/debian/changelog b/debian/changelog
index 97c9127..53c2e95 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,13 @@ simple-scan (3.25.1-1) UNRELEASED; urgency=medium
 
   * New upstream release:
     - Updated translations.
+    - Check if files exist in multi-file saves.
+    - Remove "Save As" - save now always prompts when overwriting
+      (Closes: #852730).
+    - Add a continuous scan option.
+    - Make email and print actions insensitive when document empty.
+    - Remove .ps and .tiff output support - this is not required.
+    - Switch from autotools to Meson.
   * New README.source to explain the branching model used.
   * Switch buildsystem to meson:
     + debian/control:
@@ -9,7 +16,9 @@ simple-scan (3.25.1-1) UNRELEASED; urgency=medium
       - Remove dh-autoreconf from Build-Depends.
     + debian/rules:
       - Remove the --with=autoreconf parameter.
-      - Remove override_dh_autoreconf section.
+      - Remove override_dh_auto_clean and override_dh_autoreconf section.
+    + debian/simple-scan.install:
+      - Remove useless /usr/bin and /usr/share.
     + Remove useless debian/patches/0005-zlib.patch.
   * Declare compliance with Debian Policy 4.0.0. (No changes needed).
   * Use the automatic debug symbol packages:
diff --git a/debian/rules b/debian/rules
index 36ded38..3acfc8d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -33,12 +33,7 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
 
 %:
-	dh $@ --with=scour
-
-override_dh_auto_clean:
-	dh_auto_clean
-	[ ! -h gnome-doc-utils.make ] || \
-	rm gnome-doc-utils.make
+	dh $@  --buildsystem=meson --with=scour
 
 override_dh_installdocs:
 	dh_installdocs --link-doc=simple-scan
diff --git a/debian/simple-scan.install b/debian/simple-scan.install
index b7d9a09..63d50cc 100644
--- a/debian/simple-scan.install
+++ b/debian/simple-scan.install
@@ -1,3 +1 @@
 debian/source_simple-scan.py usr/share/apport/package-hooks/
-usr/bin
-usr/share