« back to all changes in this revision
Viewing changes to avahi-autoipd/main.c
- Committer: Bazaar Package Importer
- Date: 2010-12-06 15:31:58 UTC
- mfrom: (4.1.16 experimental)
- Revision ID: james.westby@ubuntu.com-20101206153158-et2wuk7kftodlc8b
* Resynchronise with Debian. Remaining changes:
- debian/control:
+ 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.
- 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.upstart, debian/avahi-dnsconfd.upstart:
+ Add Upstart config
* Restore Debian changes to migrate to DHCP 4, now that we have it in
Ubuntu. Adjust package versions for conffile migration.
* Launchpad supports 'linux-any' these days; restore Debian change to use
that.
- debian/control:
+ 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.
- 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.upstart, debian/avahi-dnsconfd.upstart:
+ Add Upstart config
* Restore Debian changes to migrate to DHCP 4, now that we have it in
Ubuntu. Adjust package versions for conffile migration.
* Launchpad supports 'linux-any' these days; restore Debian change to use
that.
- files added:
- debian/avahi-autoipd.preinst
- files removed:
- .pc/02_avahi_client.patch
- .pc/02_avahi_client.patch/avahi-client
- .pc/03_gir_1.1.patch
- .pc/03_gir_1.1.patch/avahi-gobject
- files modified:
- .pc/applied-patches
added
removed
avahi-autoipd/main.c
