-
Committer:
Package Import Robot
-
Author(s):
Iain Lane
-
Date:
2012-05-22 22:21:27 UTC
-
mfrom:
(4.2.11 sid)
-
Revision ID:
package-import@ubuntu.com-20120522222127-uwxpp45exjk0lx13
Tags: 0.6.31-1ubuntu1
* Merge with Debian unstable. Remaining changes:
- debian/control: Add versioned dependency on the dbus that satisfies our
upstart job dependency.
- Add udebs corresponding to libavahi-common3 and libavahi-core7, so
that we can use them for Eucalyptus integration in the installer.
- Add debian/avahi-daemon.upstart, debian/avahi-dnsconfd.upstart
- debian/avahi-{daemon,dnsconfd}.links: Remove systemd configuration
symlinks.
* Dropped changes
- debian/avahi-autoipd.{pre,post}inst: Adjust package versions for conffile
migration for the version when Ubuntu did the DHCP4 migration. We're now
one LTS cycle since this, so there's no need to keep code paths for this
upgrade.
- Build with CFLAGS=-UGTK_DISABLE_DEPRECATED due to deprecation of
gtk_vbox_new. No longer necessary.
- Pass CFLAGS from the environment through to configure. Seems to be no
longer necessary with the move to compat 9.