~zulcss/ubuntu/lucid/ntp/ntp-lp-47683

Viewing all changes in revision 20.

  • Committer: Bazaar Package Importer
  • Author(s): Scott Kitterman
  • Date: 2008-02-25 19:36:36 UTC
  • Revision ID: james.westby@ubuntu.com-20080225193636-nrgs3sx4twsui2ut
Tags: 1:4.2.4p4+dfsg-3ubuntu1
* 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.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: