-
Committer:
Bazaar Package Importer
-
Author(s):
Steve Kowalik
-
Date:
2007-05-18 22:41:56 UTC
-
mfrom:
(1.2.3 upstream)
-
Revision ID:
james.westby@ubuntu.com-20070518224156-563ruqxsxvqvoy8h
Tags: 1:4.2.4p0+dfsg-1ubuntu1
* Merge from Debian unstable.
* Remaining Ubuntu changes:
- Update version in conflicts/replaces to that which was shipped in edgy,
which was later than that in Debian (due to the ubuntuX).
- Change default server to ntp.ubuntu.com.
- Remove stop links from rc0 and rc6
- Call dh_installinit with --error-handler
- Set Ubuntu maintainer address.