* Merge from debian unstable, remaining changes are: + debian/ntp.conf, debian/ntpdate.default: Change default server to ntp.ubuntu.com. + debian/ntpdate.ifup: Stop ntp before running ntpdate when an interface comes up, then start again afterwards. + debian/ntp.init, debian/rules: Only stop when entering single user mode. + Add enforcing AppArmor profile (LP: #382905): - debian/control: add Conflicts/Replaces on apparmor-profiles < 2.3.1+1403-0ubuntu10 (since we are now shipping usr.sbin.ntpd) and apparmor < 2.3.1+1403-0ubuntu10 (since we are now shipping tunables/ntpd) - debian/control: add Suggests on apparmor - debian/ntp.dirs: add apparmor directories - debian/ntp.preinst: force complain on certain upgrades - debian/ntp.postinst: reload apparmor profile - debian/ntp.postrm: remove the force-complain file - add debian/apparmor-profile* - debian/rules: install apparmor-profile and apparmor-profile.tunable - debian/README.Debian: add note on AppArmor + debian/{control,rules}: add and enable hardened build for PIE (Debian bug 542721). + debian/apparmor-profile: adjust location of drift files (LP: #456308) + debian/rules, debian/ntp.dirs, debian/source_ntp.py: Add apport hook. + debian/ntpdate-debian: Disregard empty ntp.conf files. (LP: #83604) + debian/ntp.preinst: Remove empty /etc/ntp.conf on fresh intallation, to work around the system-tools-backends part of LP #83604. + debian/ntpdate.ifup: Fix interaction with openntpd. (LP: #877210) + Dropped: - ntpdate-accept-same-timestamp-replies.patch: Accepted upstream