Move install of man pages from debian/rules to *.manpages

5 files changed, 16 insertions, 6 deletions

diff --git a/debian/changelog b/debian/changelog
index 0756806..b8d2480 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,8 @@ sane-backends (1.0.27-1~experimental3) UNRELEASED; urgency=medium
     + Initializing usb_mode (Closes:# 869673).
       Thanks to Florian Lindemann <linde@bfw-online.de> and
       Olaf Meeuwissen <paddy-hack@member.fsf.org>.
+  * Move install of man pages from debian/rules to libsane-common.manpages and
+    sane-utils.manpages.
 
  -- Jörg Frings-Fürst <debian@jff-webhosting.net>  Wed, 02 Aug 2017 18:20:24 +0200
 
diff --git a/debian/libsane-common.manpages b/debian/libsane-common.manpages
new file mode 100644
index 0000000..d8b3598
--- /dev/null
+++ b/debian/libsane-common.manpages
@@ -0,0 +1 @@
+doc/*.man
diff --git a/debian/rules b/debian/rules
index fb48f8f..0cbf6ad 100755
--- a/debian/rules
+++ b/debian/rules
@@ -80,8 +80,6 @@ override_dh_install-arch:
 	# Install the pkg-config file
 	mkdir -p debian/libsane-dev/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/
 	cp tools/sane-backends.pc debian/libsane-dev/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/
-	mkdir -p $(CURDIR)/debian/sane-utils/usr/share/man/man5/
-	cp $(CURDIR)/doc/sane-umax_pp.man $(CURDIR)/debian/sane-utils/usr/share/man/man5/umax_pp.5
 
 override_dh_install-indep:
 	dh_install
@@ -90,6 +88,14 @@ override_dh_install-indep:
 	$(CURDIR)/tools/sane-desc -s $(CURDIR)/doc/descriptions -m hal-new > \
 	$(CURDIR)/debian/libsane-common/usr/share/hal/fdi/preprobe/10osvendor/20-libsane.fdi
 
+override_dh_installman-indep:
+	dh_installman
+	$(RM) $(CURDIR)/debian/libsane-common/usr/share/man/man1/gamma4scanimage.1
+	$(RM) $(CURDIR)/debian/libsane-common/usr/share/man/man1/sane-find-scanner.1
+	$(RM) $(CURDIR)/debian/libsane-common/usr/share/man/man1/scanimage.1
+	$(RM) $(CURDIR)/debian/libsane-common/usr/share/man/man5/sane-umax_pp.5
+	$(RM) $(CURDIR)/debian/libsane-common/usr/share/man/man8/saned.8
+
 override_dh_installdocs-arch:
 	dh_installdocs
 	# move files that belong to libsane-dev
diff --git a/debian/sane-utils.install b/debian/sane-utils.install
index a953300..ed670e4 100644
--- a/debian/sane-utils.install
+++ b/debian/sane-utils.install
@@ -3,10 +3,6 @@ usr/bin/gamma4scanimage
 usr/bin/sane-find-scanner
 usr/bin/scanimage
 usr/sbin/saned
-usr/share/man/man1/gamma4scanimage.1
-usr/share/man/man1/sane-find-scanner.1
-usr/share/man/man1/scanimage.1
-usr/share/man/man8/saned.8
 tools/umax_pp usr/bin
 debian/saned.socket lib/systemd/system
 debian/saned@.service lib/systemd/system
diff --git a/debian/sane-utils.manpages b/debian/sane-utils.manpages
new file mode 100644
index 0000000..02e37a7
--- /dev/null
+++ b/debian/sane-utils.manpages
@@ -0,0 +1,5 @@
+doc/gamma4scanimage.man
+doc/sane-find-scanner.man
+doc/scanimage.man
+doc/saned.man
+doc/sane-umax_pp.man