-
Committer:
Bazaar Package Importer
-
Author(s):
Robert Ancell
-
Date:
2009-05-06 14:04:57 UTC
-
mfrom:
(4.1.13 sid)
-
Revision ID:
james.westby@ubuntu.com-20090506140457-72h3msg32nuc4j7v
Tags: 0.6.27-2ubuntu1
* Merge from Debian unstable, remaining Ubuntu changes:
* debian/control:
- Remove linux-any as it is not yet supported by Soyuz
- Add versioned dependency on the dbus that satisfies our upstart job
dependency.
- Add udebs corresponding to libavahi-common3 and libavahi-core6, so that
we can use them for Eucalyptus integration in the installer.
- Recommend dhcp3-client instead of isc-dhcp-client (not yet available in
Ubuntu)
* debian/rules:
* debian/avahi-daemon.init:
* debian/avahi-dnsconfd.init:
- Avahi init scripts (daemon or dnsconfd) do not need to
be started before gdm, and do not need to be stopped specially on
shutdown.
* debian/avahi-daemon.postinst:
* debian/avahi-dnsconfd.postinst:
- Use Ubuntu versions for migration scripts
* debian/avahi-autoipd.preinst:
* debian/avahi-autoipd.install:
* debian/avahi-autoipd.postinst:
* debian/avahi-autoipd.postrm:
- Disable DHCP 3 to 4 migration (not yet in Ubuntu)
* debian/avahi-daemon.upstart:
* debian/avahi-dnsconfd.upstart:
- Add Upstart config
* debian/patches/03_gir_1.1.patch:
- Compile with the latest Gobject introspection