merge 1:4.2.8p12+dfsg-3

[Christian Ehrhardt ]

This merge is a a bit more special than usual.

NTP is no more in Main since 18.04 and also gladly the issues with it dropped to almost none (by not being used). Chrony (its replacement) OTOH has way less issues and also is easier to support upstream.

We have upstreamed or debianized most of our changes, but on this merge want to -intentionally- drop some delta that is not.

We have three main delta elements left:
a) set ubuntu time servers
b) some tweaks on pps documentaiton
c) dhclient integration to read systemd-leasefile

Of these:
a) we want to keep just this as only there we can guarantee the servers are working
b) we want to drop as it just isn't important to adapt that on merges (people should use chrony/gpsd for that anyway)
c) we want to avoid the maintenance of this on a non main package. Therefore keep this as-is as long as it merges easily, but in case of any trouble drop it.

[Christian Ehrhardt  (paelzer)]

I passed once over the open recent NTP bugs before this merge, we really don't have anything big left - I'm glad that chrony seems to have took over this smoothly.

Note: so far the dhclient delta (c) applies cleanly, so keeping it

[Andreas Hasenack (ahasenack)]

795c542d8e4b2c157c4c788a39df7f777ee1f2d9 in (lp1806382/logical/1%4.2.8p11+dfsg-1ubuntu1 says:

    * d/ntp.dhcp add support for parsing systemd networkd lease files LP: #1717983

But it's actually changing more files:
debian/ntp-systemd-netif.path (add)
debian/ntp-systemd-netif.service (change)
debian/rules (change)

Maybe the commit message, and d/changelog after that, could be updated?

[Andreas Hasenack (ahasenack)]

ops, sorry, this was meant for the MP, let me paste it there

[Launchpad Janitor (janitor)]

This bug was fixed in the package ntp - 1:4.2.8p12+dfsg-3ubuntu1

---------------
ntp (1:4.2.8p12+dfsg-3ubuntu1) disco; urgency=medium

  * Merge with Debian unstable (LP: #1806382). Remaining changes:
    - d/ntp.conf, d/ntpdate.default: Change default server to ntp.ubuntu.com.
    - add support for parsing systemd networkd lease files LP: 1717983
      + d/ntp.dhcp add support for parsing systemd networkd lease files
      + d/ntp-systemd-netif.service: service to call hook
      + d/ntp-systemd-netif.path: respond to lease changes
  * Dropped Changes (accepted in Debian)
    - Add PPS support (this is accepted in Debian and only had some readme
      and example entries left):

ntp (1:4.2.8p12+dfsg-3) unstable; urgency=low

  * Treat testsuite errors as non-fatal on some architectures
    Fixes FTBFS on ppc64el, ia64, powerpc, ppc64

ntp (1:4.2.8p12+dfsg-2) unstable; urgency=low

  * Drop ntpdate ifupdown hooks (Closes: #908286)
    These have been a constant source of problems and one-shot syncs
    are not a proper solution for timekeeping. See ntpdate.NEWS for
    details
  * Do not install /var/lib/ntpdate, not used anymore
  * Drop maintscript snippets for upgrading from versions prior to Jessie
  * Reenable unittest
    - disable always failing test-decodenetnum with a patch
  * Set Rules-Requires-Root: no

ntp (1:4.2.8p12+dfsg-1) unstable; urgency=medium

  [ Bernhard Schmidt ]
  * New upstream version 4.2.8p12
  * Update Maintainer address to <email address hidden> (Closes: #899940)
  * Update ntpdate.8 from ntpdate.html (Closes: #476491, #515246)

  [ Peter Eisentraut ]
  * Remove Peter Eisentraut from Uploaders

 -- Christian Ehrhardt <email address hidden> Mon, 03 Dec 2018 13:05:00 +0100