~ubuntu-branches/ubuntu/natty/avahi/natty

Viewing all changes in revision 94.

  • Committer: Bazaar Package Importer
  • Author(s): Martin Pitt
  • Date: 2011-02-24 18:57:28 UTC
  • mfrom: (4.2.2 sid)
  • Revision ID: james.westby@ubuntu.com-20110224185728-lgwqnrfpactd19py
Tags: 0.6.28-4ubuntu1
* Resynchronise with Debian. Remaining Ubuntu 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.
 - Add debian/avahi-daemon.upstart, debian/avahi-dnsconfd.upstart
 - debian/avahi-autoipd.{pre,post}inst: Adjust package versions for conffile
   migration for the version when Ubuntu did the DHCP4 migration. This needs
   to be kept until after the next LTS.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: