d/*.manpages: Rewrite to install from new directory; remove useless lintian-overrides

5 files changed, 5 insertions, 17 deletions

diff --git a/debian/changelog b/debian/changelog
index e98a348..a826a15 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -54,6 +54,7 @@ sane-backends (1.0.29-1~experimental1) experimental; urgency=medium
   * debian/control:
     - Add missing depends.
     - Change Conflicts/Replaces to the new release.
+  * debian/*.manpages: Rewrite to install from new directory.
 
  -- Jörg Frings-Fürst <debian@jff.email>  Tue, 23 Jul 2019 12:32:06 +0200
 
diff --git a/debian/libsane-common.lintian-overrides b/debian/libsane-common.lintian-overrides
index 0a1a9f4..1386138 100644
--- a/debian/libsane-common.lintian-overrides
+++ b/debian/libsane-common.lintian-overrides
@@ -4,13 +4,3 @@
 libsane-common: spelling-error-in-manpage usr/share/man/man5/sane-gt68xx.5.gz afe safe
 libsane-common: spelling-error-in-manpage usr/share/man/man5/sane-gt68xx.5.gz afe safe
 libsane-common: spelling-error-in-manpage usr/share/man/man5/sane-gt68xx.5.gz afe safe
-
-#
-# See bug #934452
-#
-libsane-common: spelling-error-in-manpage usr/share/man/man5/sane-canon_dr.5.gz busses buses
-libsane-common: spelling-error-in-manpage usr/share/man/man5/sane-canon_dr.5.gz busses buses
-libsane-common: spelling-error-in-manpage usr/share/man/man5/sane-cardscan.5.gz busses buses
-libsane-common: spelling-error-in-manpage usr/share/man/man5/sane-fujitsu.5.gz busses buses
-libsane-common: spelling-error-in-manpage usr/share/man/man5/sane-fujitsu.5.gz busses buses
-libsane-common: spelling-error-in-manpage usr/share/man/man5/sane-kodak.5.gz busses buses
diff --git a/debian/libsane-common.manpages b/debian/libsane-common.manpages
index d8b3598..fa664f3 100644
--- a/debian/libsane-common.manpages
+++ b/debian/libsane-common.manpages
@@ -1 +1 @@
-doc/*.man
+usr/share/man/man5/*.5
diff --git a/debian/sane-utils.lintian-overrides b/debian/sane-utils.lintian-overrides
index 94f310e..2be92a2 100644
--- a/debian/sane-utils.lintian-overrides
+++ b/debian/sane-utils.lintian-overrides
@@ -1,4 +1,4 @@
 #
 # /etc/init.d/saned exists
 #
-sane-utils: package-supports-alternative-init-but-no-init.d-script lib/systemd/system/saned@.service
\ No newline at end of file
+#sane-utils: package-supports-alternative-init-but-no-init.d-script lib/systemd/system/saned@.service
diff --git a/debian/sane-utils.manpages b/debian/sane-utils.manpages
index 02e37a7..357020f 100644
--- a/debian/sane-utils.manpages
+++ b/debian/sane-utils.manpages
@@ -1,5 +1,2 @@
-doc/gamma4scanimage.man
-doc/sane-find-scanner.man
-doc/scanimage.man
-doc/saned.man
-doc/sane-umax_pp.man
+usr/share/man/man8/*.8
+usr/share/man/man1/*.1