~dobey/ubuntu/precise/avahi/bring-back-gir

Viewing all changes in revision 104.

  • Committer: Bazaar Package Importer
  • Author(s): Steve Langasek
  • Date: 2011-07-01 13:29:42 UTC
  • mfrom: (4.2.8 sid)
  • Revision ID: james.westby@ubuntu.com-20110701132942-vunvk3zdqfmchlde
Tags: 0.6.30-4ubuntu1
* Merge from Debian unstable.  Remaining changes:
  - Build with CFLAGS=-UGTK_DISABLE_DEPRECATED due to deprecation of
    gtk_vbox_new.
  - 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-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.
  - debian/avahi-{daemon,dnsconfd}.links: Remove systemd configuration
    symlinks.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: