[pkg-ntp-maintainers] [pkg-ntp] 05/05: Use tzdata leapfile in default configuration

[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 b48d3a37936b4253256bb2689c23d2e403f12d4d
Author: Bernhard Schmidt <berni at debian.org>
Date:   Thu May 4 22:47:48 2017 +0200

    Use tzdata leapfile in default configuration
    
    Closes: #858548
    Thanks: Edmund Grimley Evans
---
 debian/control  | 2 +-
 debian/ntp.conf | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index 9fee2bb..a39d60e 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,7 @@ Vcs-Git: https://anonscm.debian.org/git/pkg-ntp/pkg-ntp.git/
 
 Package: ntp
 Architecture: any
-Depends: adduser, lsb-base (>= 3.2-13), netbase, ${misc:Depends}, ${shlibs:Depends}
+Depends: adduser, lsb-base (>= 3.2-13), netbase, tzdata, ${misc:Depends}, ${shlibs:Depends}
 Pre-Depends: dpkg (>= 1.15.7.2)
 Recommends: ${perl:Depends}
 Suggests: ntp-doc
diff --git a/debian/ntp.conf b/debian/ntp.conf
index b51b4f9..d473b43 100644
--- a/debian/ntp.conf
+++ b/debian/ntp.conf
@@ -2,6 +2,9 @@
 
 driftfile /var/lib/ntp/ntp.drift
 
+# Leap seconds definition provided by tzdata
+leapfile /usr/share/zoneinfo/leap-seconds.list
+
 # Enable this if you want statistics to be logged.
 #statsdir /var/log/ntpstats/
 

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