diff -Nru avahi-0.6.32~rc+dfsg/debian/avahi-daemon.avahi-cups-reload.upstart avahi-0.6.32~rc+dfsg/debian/avahi-daemon.avahi-cups-reload.upstart
--- avahi-0.6.32~rc+dfsg/debian/avahi-daemon.avahi-cups-reload.upstart	1970-01-01 01:00:00.000000000 +0100
+++ avahi-0.6.32~rc+dfsg/debian/avahi-daemon.avahi-cups-reload.upstart	2015-11-24 09:16:36.000000000 +0100
@@ -0,0 +1,6 @@
+author "Dmitrijs Ledkovs <dmitrijs.ledkovs@canonical.com>"
+description "Reload cups, upon starting avahi-daemon to make sure remote queues are populated"
+
+start on started avahi-daemon
+task
+exec reload cups
diff -Nru avahi-0.6.32~rc+dfsg/debian/avahi-daemon.upstart avahi-0.6.32~rc+dfsg/debian/avahi-daemon.upstart
--- avahi-0.6.32~rc+dfsg/debian/avahi-daemon.upstart	1970-01-01 01:00:00.000000000 +0100
+++ avahi-0.6.32~rc+dfsg/debian/avahi-daemon.upstart	2015-11-24 09:16:36.000000000 +0100
@@ -0,0 +1,23 @@
+# avahi-daemon - mDNS/DNS-SD daemon
+#
+# The Avahi daemon provides mDNS/DNS-SD discovery support (Bonjour/Zeroconf)
+# allowing applications to discover services on the network.
+
+description	"mDNS/DNS-SD daemon"
+
+start on (filesystem
+	  and started dbus)
+stop on stopping dbus
+
+expect daemon
+respawn
+
+pre-start script
+    /lib/init/apparmor-profile-load usr.sbin.avahi-daemon
+end script
+
+script
+	opts="-D"
+	[ -e "/etc/eucalyptus/avahi-daemon.conf" ] && opts="${opts} -f /etc/eucalyptus/avahi-daemon.conf"
+	exec avahi-daemon ${opts}
+end script
diff -Nru avahi-0.6.32~rc+dfsg/debian/avahi-dnsconfd.upstart avahi-0.6.32~rc+dfsg/debian/avahi-dnsconfd.upstart
--- avahi-0.6.32~rc+dfsg/debian/avahi-dnsconfd.upstart	1970-01-01 01:00:00.000000000 +0100
+++ avahi-0.6.32~rc+dfsg/debian/avahi-dnsconfd.upstart	2015-11-24 09:16:36.000000000 +0100
@@ -0,0 +1,15 @@
+# avahi-dnsconfd - unicast DNS configuration daemon
+#
+# The avahi-dnsconfd daemon provides DNS configuration using mDNS in a
+# DHCP-like fashion
+
+description	"unicast DNS configuration daemon"
+
+start on (filesystem
+	  and started avahi-daemon)
+stop on stopping avahi-daemon
+
+expect daemon
+respawn
+
+exec avahi-dnsconfd -D
diff -Nru avahi-0.6.32~rc+dfsg/debian/changelog avahi-0.6.32~rc+dfsg/debian/changelog
--- avahi-0.6.32~rc+dfsg/debian/changelog	2015-11-04 21:48:19.000000000 +0100
+++ avahi-0.6.32~rc+dfsg/debian/changelog	2015-11-24 09:29:17.000000000 +0100
@@ -1,3 +1,24 @@
+avahi (0.6.32~rc+dfsg-1ubuntu1) xenial; urgency=medium
+
+  * Merge from Debian unstable, remaining changes:
+    - Add debian/avahi-daemon.upstart, debian/avahi-dnsconfd.upstart,
+      debian/avahi-cups-reload.upstart
+  * Dropped Ubuntu changes:
+    - debian/control: Add versioned dependency on the dbus that satisfies our
+      upstart job dependency. This happened before precise already.
+    - Add udebs corresponding to libavahi-common3 and libavahi-core7, so
+      that we can use them for Eucalyptus integration in the installer.
+      Eucalyptus is long gone, and these udebs haven't been used in a long
+      time.
+    - d/p/skip-nproc-in-container.patch: Detect whether we are running in a
+      container, and do not set rlimit_nproc if so. Current LXC does not
+      create /run/container_type any more so the patch is a no-op. It's also
+      not necessary any more as avahi does not fail if it cannot set the
+      rlimit.
+  * Drop obsolete dh_installinit --upstart-only option. (LP: #1519228)
+
+ -- Martin Pitt <martin.pitt@ubuntu.com>  Tue, 24 Nov 2015 09:17:30 +0100
+
 avahi (0.6.32~rc+dfsg-1) unstable; urgency=medium
 
   * Team upload.
@@ -33,6 +54,48 @@
 
  -- Michael Biebl <biebl@debian.org>  Mon, 13 Apr 2015 21:51:24 +0200
 
+avahi (0.6.31-4ubuntu4) vivid; urgency=medium
+
+  * No change rebuild to get debug symbols on all architectures.
+
+ -- Brian Murray <brian@ubuntu.com>  Mon, 17 Nov 2014 09:22:40 -0800
+
+avahi (0.6.31-4ubuntu3) utopic; urgency=medium
+
+  * Drop upstart dependency. We ship init scripts for sysv, upstart, and
+    systemd now. (LP: #1351306)
+
+ -- Martin Pitt <martin.pitt@ubuntu.com>  Fri, 01 Aug 2014 15:16:40 +0200
+
+avahi (0.6.31-4ubuntu2) utopic; urgency=high
+
+  * No change rebuild against new dh_installinit, to call update-rc.d at
+    postinst.
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Wed, 28 May 2014 10:39:06 +0100
+
+avahi (0.6.31-4ubuntu1) trusty; urgency=medium
+
+  * Merge from 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-cups-reload.upstart
+    - d/p/skip-nproc-in-container.patch: Detect whether we are running in a
+      container, and do not set rlimit_nproc if so.
+  * Dropped changes, included in Debian:
+    - d/p/so_reuseport-may-not-exist-in-running-kernel.patch:  If
+      SO_REUSEPORT returns ENOPROTOOPT, continue as if we did not have the
+      call at all.
+    - d/p/avahi-core-reserve-space-for-record-data-when-size-estimate.patch:
+      fix a bug where avahi will use 100% CPU after cups is restarted.
+    - Add two new symbols to libavahi-core7.symbols file.
+    - d/p/suse-patch-gtk-box.patch: Use gtk_box API.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Tue, 31 Dec 2013 00:04:39 -0800
+
 avahi (0.6.31-4) unstable; urgency=medium
 
   * Team upload.
@@ -51,6 +114,31 @@
 
  -- Laurent Bigonville <bigon@debian.org>  Thu, 26 Dec 2013 18:24:41 +0100
 
+avahi (0.6.31-3ubuntu1) trusty; urgency=medium
+
+  * Merge from 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-cups-reload.upstart
+    - d/p/avahi-core-reserve-space-for-record-data-when-size-estimate.patch:
+      fix a bug where avahi will use 100% CPU after cups is restarted.
+    - d/p/suse-patch-gtk-box.patch: Use gtk_box API.
+    - Add two new symbols to libavahi-core7.symbols file.
+    - d/p/so_reuseport-may-not-exist-in-running-kernel.patch:  If
+      SO_REUSEPORT returns ENOPROTOOPT, continue as if we did not have the
+      call at all.
+    - d/p/skip-nproc-in-container.patch: Detect whether we are running in a
+      container, and do not set rlimit_nproc if so.
+  * Dropped changes, included in Debian:
+    - Build-depend on and use dh_autotools-dev to fix FTBFS on new arches.
+    - debian/avahi-{daemon,dnsconfd}.links: Remove systemd configuration
+      symlinks.  Superseded by dh-systemd.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Fri, 13 Dec 2013 15:56:07 -0800
+
 avahi (0.6.31-3) unstable; urgency=low
 
   * Team upload.
@@ -79,6 +167,55 @@
 
  -- Laurent Bigonville <bigon@debian.org>  Sat, 07 Dec 2013 16:24:13 +0100
 
+avahi (0.6.31-2ubuntu5) trusty; urgency=low
+
+  * d/p/skip-nproc-in-container.patch: Detect whether we are running in a
+    container, and do not set rlimit_nproc if so (LP: #1251257)
+
+ -- Serge Hallyn <serge.hallyn@ubuntu.com>  Mon, 18 Nov 2013 20:44:14 +0000
+
+avahi (0.6.31-2ubuntu4) saucy; urgency=low
+
+  * When userspace defines SO_REUSEPORT we will attempt to enable socket
+    port number reuse.  However if the running kernel does not support
+    this call it will fail preventing daemon startup.  If this call is
+    present but fails ENOPROTOOPT then we know that actually the kernel
+    does not support it and we should continue as if we did not have the
+    call at all.  (LP: #1228204)
+
+ -- Andy Whitcroft <apw@canonical.com>  Fri, 20 Sep 2013 16:07:36 +0100
+
+avahi (0.6.31-2ubuntu3) saucy; urgency=low
+
+  * Build-depend on and use dh_autotools-dev to fix FTBFS on new arches.
+
+ -- Adam Conrad <adconrad@ubuntu.com>  Fri, 13 Sep 2013 20:27:08 -0400
+
+avahi (0.6.31-2ubuntu2) saucy; urgency=low
+
+  * Use gkt_box API, using patch from SUSE. Thus fixing assignments that
+    make pointers from integers without a cast.
+  * Add two new symbols to libavahi-core7.symbols file.
+
+ -- Dmitrijs Ledkovs <dmitrij.ledkov@ubuntu.com>  Thu, 30 May 2013 17:03:51 +0100
+
+avahi (0.6.31-2ubuntu1) saucy; urgency=low
+
+  * 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.
+    - Apply a patch
+      avahi-core-reserve-space-for-record-data-when-size-estimate.patch to
+      fix http://pad.lv/1059286 .
+    - Add avahi-cups-reload.upstart job, to refresh remote queues.
+
+ -- Dmitrijs Ledkovs <dmitrij.ledkov@ubuntu.com>  Thu, 30 May 2013 15:46:06 +0100
+
 avahi (0.6.31-2) unstable; urgency=low
 
   * Use recommended maintscript versioning scheme.
@@ -90,6 +227,46 @@
 
  -- Michael Biebl <biebl@debian.org>  Wed, 06 Mar 2013 22:58:55 +0100
 
+avahi (0.6.31-1ubuntu3) raring; urgency=low
+
+  * Reload cups to refresh remote queues, when avahi-daemon starts. (LP:
+    #1158686). Until cups learns to reconnect to avahi by itself
+    https://www.cups.org/str.php?L4300 .
+
+ -- Dmitrijs Ledkovs <dmitrij.ledkov@ubuntu.com>  Fri, 22 Mar 2013 10:49:47 +0000
+
+avahi (0.6.31-1ubuntu2) quantal-proposed; urgency=low
+
+  * debian/patches/avahi-core-reserve-space-for-record-data-when-size-estimate.patch:
+    avahi-core: reserve space for record data when size estimate. This
+    prevents avahi-daemon from falling into an invalid loop when many CUPS/IPP
+    printer shares get registered (LP: #1059286,
+    http://lists.freedesktop.org/archives/avahi/2012-September/002188.html).
+
+ -- Till Kamppeter <till.kamppeter@gmail.com>  Mon,  8 Oct 2012 22:23:00 +0200
+
+avahi (0.6.31-1ubuntu1) quantal; urgency=low
+
+  * 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.
+
+ -- Iain Lane <iain.lane@canonical.com>  Tue, 22 May 2012 22:21:27 +0100
+
 avahi (0.6.31-1) unstable; urgency=low
 
   * New upstream release.
@@ -111,6 +288,33 @@
 
  -- Michael Biebl <biebl@debian.org>  Tue, 10 Jan 2012 00:59:49 +0100
 
+avahi (0.6.30-5ubuntu2) precise; urgency=low
+
+  * Build using dh_python2.
+
+ -- Matthias Klose <doko@ubuntu.com>  Sat, 17 Dec 2011 12:06:42 +0100
+
+avahi (0.6.30-5ubuntu1) precise; urgency=low
+
+  * Merge from Debian testing.  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.
+  * Pass CFLAGS from the environment through to configure.  This by default
+    will turn on optimisations and debug symbol generation, both of which
+    are currently disabled.
+
+ -- Christopher James Halse Rogers <raof@ubuntu.com>  Tue, 18 Oct 2011 14:46:25 +1100
+
 avahi (0.6.30-5) unstable; urgency=low
 
   * debian/control: Make python-avahi Architecture: any so the path to
@@ -119,12 +323,50 @@
 
  -- Michael Biebl <biebl@debian.org>  Sat, 02 Jul 2011 10:37:15 +0200
 
+avahi (0.6.30-4ubuntu1) oneiric; urgency=low
+
+  * 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.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Fri, 01 Jul 2011 13:29:42 +0000
+
 avahi (0.6.30-4) unstable; urgency=low
 
   * Add multiarch support. Patch courtesy of Steve Langasek. (Closes: #631836)
 
  -- Michael Biebl <biebl@debian.org>  Fri, 01 Jul 2011 02:28:05 +0200
 
+avahi (0.6.30-3ubuntu3) oneiric; urgency=low
+
+  * Build with CFLAGS=-UGTK_DISABLE_DEPRECATED due to deprecation of
+    gtk_vbox_new.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Mon, 27 Jun 2011 10:41:14 +0000
+
+avahi (0.6.30-3ubuntu2) oneiric; urgency=low
+
+  * No-change rebuild to get consistent changelog files for multiarch.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Mon, 27 Jun 2011 09:21:11 +0100
+
+avahi (0.6.30-3ubuntu1) oneiric; urgency=low
+
+  * Merge with Debian to get GTK 3 support. See 0.6.30-2ubuntu1 for remaining
+    Ubuntu changes.
+
+ -- Martin Pitt <martin.pitt@ubuntu.com>  Mon, 16 May 2011 21:46:44 +0200
+
 avahi (0.6.30-3) unstable; urgency=low
 
   * Enable GTK3 support. (Closes: #610772)
@@ -136,6 +378,28 @@
 
  -- Michael Biebl <biebl@debian.org>  Fri, 29 Apr 2011 16:50:38 +0200
 
+avahi (0.6.30-2ubuntu1) oneiric; urgency=low
+
+  * Merge with Debian unstable; 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-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.
+   - Multiarch support:
+     + debian/compat: Move to dh compat 9.
+     + debian/control: Add Multi-Arch: tags, bump debhelper build
+       dependency to debhelper which supports Multiarch, and add
+       ${misc:Pre-Depends} fields.
+     + debian/*.install: Update path to libraries, pkg-config files, etc.
+
+ -- Martin Pitt <martin.pitt@ubuntu.com>  Thu, 28 Apr 2011 22:03:23 +0200
+
 avahi (0.6.30-2) unstable; urgency=low
 
   * Remove Qt3 integration library. With KDE3 gone, there is no more package
@@ -183,6 +447,53 @@
 
  -- Michael Biebl <biebl@debian.org>  Mon, 07 Mar 2011 10:35:51 +0100
 
+avahi (0.6.30-0ubuntu2) natty; urgency=low
+
+  * Reapply multiarch patches, on the wrong branch again Make python-avahi
+  * Architecture: any, since the substituted path to the arch-specific .db
+    file will be arch-specific. LP: #743438.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Wed, 06 Apr 2011 16:13:36 -0700
+
+avahi (0.6.30-0ubuntu1) natty; urgency=low
+
+  * New upstream version, fixes `iface > 0' assertion errors (lp: #743031)
+  * debian/patches/02_avahi-discover.patch:
+    - the patch is in the new version
+
+ -- Sebastien Bacher <seb128@ubuntu.com>  Tue, 05 Apr 2011 16:12:15 +0200
+
+avahi (0.6.29-0ubuntu2) natty; urgency=low
+
+  * FFe LP: #733501: build for multiarch.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Thu, 24 Mar 2011 21:27:33 -0700
+
+avahi (0.6.29-0ubuntu1) natty; urgency=low
+
+  * New upstream release
+  * debian/patches/02_avahi-discover.patch:
+    - Fix avahi-discover
+  * debian/patches/03_read_null_udp_packets.patch:
+    - Applied upstream
+
+ -- Robert Ancell <robert.ancell@canonical.com>  Wed, 09 Mar 2011 12:29:14 +1100
+
+avahi (0.6.28-4ubuntu1) natty; urgency=low
+
+  * 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.
+
+ -- Martin Pitt <martin.pitt@ubuntu.com>  Thu, 24 Feb 2011 18:57:28 +0100
+
 avahi (0.6.28-4) unstable; urgency=high
 
   * Bump debhelper compatibility level to 8 and update build dependency
diff -Nru avahi-0.6.32~rc+dfsg/debian/control avahi-0.6.32~rc+dfsg/debian/control
--- avahi-0.6.32~rc+dfsg/debian/control	2015-11-04 21:48:19.000000000 +0100
+++ avahi-0.6.32~rc+dfsg/debian/control	2015-11-24 09:16:36.000000000 +0100
@@ -1,7 +1,8 @@
 Source: avahi
 Section: net
 Priority: optional
-Maintainer: Utopia Maintenance Team <pkg-utopia-maintainers@lists.alioth.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Utopia Maintenance Team <pkg-utopia-maintainers@lists.alioth.debian.org>
 Uploaders: Sjoerd Simons <sjoerd@debian.org>,
            Sebastian Dröge <slomo@debian.org>,
            Loic Minier <lool@dooz.org>,
diff -Nru avahi-0.6.32~rc+dfsg/debian/rules avahi-0.6.32~rc+dfsg/debian/rules
--- avahi-0.6.32~rc+dfsg/debian/rules	2015-11-04 21:48:19.000000000 +0100
+++ avahi-0.6.32~rc+dfsg/debian/rules	2015-11-24 09:16:59.000000000 +0100
@@ -49,6 +49,7 @@
 override_dh_installinit:
 	dh_installinit -pavahi-daemon --restart-after-upgrade
 	dh_installinit -pavahi-dnsconfd --restart-after-upgrade
+	dh_installinit -pavahi-daemon --no-start --name avahi-cups-reload
 
 override_dh_installdocs:
 	dh_installdocs --all docs/NEWS docs/README