[pkg-ntp-maintainers] [pkg-ntp] 01/02: Fix arch:all FTBFS due to improper moving of sntp manpage

[Bernhard Schmidt]

This is an automated email from the git hooks/post-receive script.

berni pushed a commit to branch master
in repository pkg-ntp.

commit da3842975f2dd3abec19e067b46bf942d5f9c3d3
Author: Bernhard Schmidt <berni at debian.org>
Date:   Tue Jun 20 08:44:47 2017 +0200

    Fix arch:all FTBFS due to improper moving of sntp manpage
    
    Closes: #865227
---
 debian/ntp.install  | 11 ++++++++++-
 debian/rules        |  5 +----
 debian/sntp.install |  1 +
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/debian/ntp.install b/debian/ntp.install
index 49d4527..82dfcc6 100644
--- a/debian/ntp.install
+++ b/debian/ntp.install
@@ -19,5 +19,14 @@ debian/tmp/usr/share/doc/ntp/ntpsnmpd.html
 debian/tmp/usr/share/doc/ntp/ntpsweep.html
 debian/tmp/usr/share/doc/ntp/ntptrace.html
 debian/tmp/usr/share/doc/ntp/update-leap.html
-debian/tmp/usr/share/man/man*/*
+debian/tmp/usr/share/man/man1/calc_tickadj.1
+debian/tmp/usr/share/man/man1/ntpdc.1
+debian/tmp/usr/share/man/man1/ntpq.1
+debian/tmp/usr/share/man/man1/ntptrace.1
+debian/tmp/usr/share/man/man1/update-leap.1
+debian/tmp/usr/share/man/man5/ntp.conf.5
+debian/tmp/usr/share/man/man5/ntp.keys.5
+debian/tmp/usr/share/man/man8/ntp-keygen.8
+debian/tmp/usr/share/man/man8/ntp-wait.8
+debian/tmp/usr/share/man/man8/ntpd.8
 debian/ntp-systemd-wrapper usr/lib/ntp
diff --git a/debian/rules b/debian/rules
index b3140e2..8eb7dd9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -50,12 +50,9 @@ override_dh_install:
 	# Remove empty directory (/usr/libexec/)
 	find debian/tmp -type d -empty -delete
 
+	ls -laR debian/tmp/usr/share/man/
 	dh_install --fail-missing
 
-	# move sntp manpage to sntp binary package
-	mkdir -p debian/sntp/usr/share/man/man1/
-	mv debian/ntp/usr/share/man/man1/sntp.1 debian/sntp/usr/share/man/man1/
-
 	rm -f debian/ntp-doc/usr/share/doc/ntp-doc/html/hints/solaris*
 
 override_dh_installinit:
diff --git a/debian/sntp.install b/debian/sntp.install
index 6ac3720..aeec192 100644
--- a/debian/sntp.install
+++ b/debian/sntp.install
@@ -1,2 +1,3 @@
 debian/tmp/usr/bin/sntp
 debian/tmp/usr/share/doc/sntp/sntp.html
+debian/tmp/usr/share/man/man1/sntp.1

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ntp/pkg-ntp.git