-
Committer:
Bazaar Package Importer
-
Author(s):
Mathias Gug
-
Date:
2007-11-26 15:42:41 UTC
-
mfrom:
(1.2.4 upstream)
-
Revision ID:
james.westby@ubuntu.com-20071126154241-dzkrxix5uwpa19il
Tags: 1:4.2.4p4+dfsg-2ubuntu1
* Merge from debian unstable, remaining changes:
- debian/ntp.conf, debian/ntpdate.default:
- Change default server to ntp.ubuntu.com.
- debian/rules:
- Call update-rcd-params with multiuser instead defaults.
- debian/control:
- Set Ubuntu maintainer address.
- Update version in conflicts/replaces to that which was shipped in edgy,
which was later than that in Debian (due to the ubuntuX).
- Add sysv-rc dependency.
- debian/ntp-server.postinst:
- Remove stop script symlinks from rc0 and rc6.