[pkg-ntp-maintainers] [pkg-ntp] 10/13: Use 'debian' location file

[Bernhard Schmidt]

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

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

commit f435bc2882e5f41c0b4d1bf6e05c94482c08aa17
Author: Bernhard Schmidt <berni at debian.org>
Date:   Sun May 7 21:14:32 2017 +0200

    Use 'debian' location file
    
    Use 'debian' location file to decide where binaries and manpages go.
    Add d/p/debian-locfile.patch to adjust the values in the upstream provided
    file to the locations used in Debian packaging before
    
    Closes: #852946
---
 debian/patches/debian-locfile.patch | 25 +++++++++++++++++++++++++
 debian/patches/series               |  1 +
 debian/rules                        | 16 +---------------
 3 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/debian/patches/debian-locfile.patch b/debian/patches/debian-locfile.patch
new file mode 100644
index 0000000..f225065
--- /dev/null
+++ b/debian/patches/debian-locfile.patch
@@ -0,0 +1,25 @@
+--- a/sntp/loc/debian
++++ b/sntp/loc/debian
+@@ -1,6 +1,6 @@
+ # Debian installations and man page suffixes
+ MDOC
+-calc_tickadj,sbin,8
++calc_tickadj,bin,1
+ ntp-keygen,sbin,8
+ ntp-wait,sbin,8
+ ntpd,sbin,8
+@@ -9,10 +9,10 @@
+ ntpdsim,sbin,8
+ ntpq,bin,1
+ ntpsnmpd,sbin,8
+-ntpsweep,bin,1
++ntpsweep,noinst,1
+ ntptime,sbin,8
+ ntptrace,bin,1
+-sntp,bin,1
+-tickadj,sbin,8
++sntp,sbin,1
++tickadj,noinst,8
+ timetrim,sbin,8
+-update-leap,sbin,8
++update-leap,bin,1
diff --git a/debian/patches/series b/debian/patches/series
index 040df97..3c6c76d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,3 +7,4 @@ openssl-disable-check.patch
 libedit.patch
 reproducible-build.patch
 sntp-sysexits.patch
+debian-locfile.patch
diff --git a/debian/rules b/debian/rules
index f09c9b2..a6df7cf 100755
--- a/debian/rules
+++ b/debian/rules
@@ -27,18 +27,10 @@ endif
 		--disable-local-libopts \
 		--enable-ntp-signd \
 		--disable-dependency-tracking \
-		--with-locfile=legacy \
+		--with-locfile=debian \
 		--with-openssl-libdir=/usr/lib/$(DEB_HOST_MULTIARCH)
 
 override_dh_install:
-	# move the administrator programs from /usr/bin to /usr/sbin
-	for file in ntpdate ntp-wait ntpd ntptime ntp-keygen sntp; do \
-		mv debian/tmp/usr/bin/$$file debian/tmp/usr/sbin/$$file || exit; \
-	done
-
-	# don't install tickadj
-	rm debian/tmp/usr/bin/tickadj
-
 	install -D -m 0755 scripts/ntpsweep/ntpsweep debian/ntp/usr/bin/ntpsweep
 	install -D -m 0644 debian/ntp.dhcp debian/ntp/etc/dhcp/dhclient-exit-hooks.d/ntp
 	install -D -m 0755 debian/ntp.networkmanager debian/ntp/etc/NetworkManager/dispatcher.d/ntp
@@ -52,12 +44,6 @@ override_dh_install:
 	install -D -m 0644 debian/apparmor-profile.tunable debian/ntp/etc/apparmor.d/tunables/ntpd
 	dh_link -pntp etc/apparmor.d/usr.sbin.ntpd etc/apparmor/init/network-interface-security/usr.sbin.ntpd
 
-	# move upstream manpages to the locations used before 4.2.8p9+dfsg-2.1
-	mkdir -p debian/tmp/usr/share/man/man8/
-	mv debian/tmp/usr/share/man/man1/ntp-keygen.1 debian/tmp/usr/share/man/man8/ntp-keygen.8
-	mv debian/tmp/usr/share/man/man1/ntp-wait.1 debian/tmp/usr/share/man/man8/ntp-wait.8
-	mv debian/tmp/usr/share/man/man1/ntpd.1 debian/tmp/usr/share/man/man8/ntpd.8
-
 	# Remove empty directory (/usr/libexec/)
 	find debian/tmp -type d -empty -delete
 

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