[pkg-ntp-maintainers] [pkg-ntp] 01/02: Merge branch 'experimental'

[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 3a536fcc85e11642c00fa5f864e8efbf045182f6
Merge: fd7b925 138be12
Author: Bernhard Schmidt <Bernhard.Schmidt at lrz.de>
Date:   Sat Jun 17 21:50:50 2017 +0200

    Merge branch 'experimental'

 debian/README.Debian                    |   4 +-
 debian/apparmor-profile                 |   3 +
 debian/compat                           |   2 +-
 debian/control                          |  24 ++-
 debian/man/ntp-keygen.8                 |  12 --
 debian/man/ntp-wait.8                   |  23 --
 debian/man/ntp.conf.5                   | 358 --------------------------------
 debian/man/ntpd.8                       | 175 ----------------
 debian/man/ntpdc.1                      |  46 ----
 debian/man/ntpq.1                       |  40 ----
 debian/man/ntptrace.1                   |  27 ---
 debian/ntp-systemd-wrapper              |  21 ++
 debian/ntp.conf                         |   3 +
 debian/ntp.cron.daily                   |   2 +-
 debian/ntp.dirs                         |   1 +
 debian/ntp.install                      |   8 +-
 debian/ntp.manpages                     |   7 -
 debian/ntp.postinst                     |  14 +-
 debian/ntp.service                      |  15 ++
 debian/ntp.triggers                     |   2 +
 debian/patches/debian-locfile.patch     |  24 +++
 debian/patches/reproducible-build.patch |  11 +
 debian/patches/series                   |   3 +
 debian/patches/sntp-kod-location.patch  |  30 +++
 debian/patches/sntp-sysexits.patch      |  34 +++
 debian/rules                            | 103 ++-------
 debian/sntp.install                     |   2 +
 debian/source_ntp.py                    |  22 ++
 28 files changed, 231 insertions(+), 785 deletions(-)

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