-
Committer:
Package Import Robot
-
Author(s):
Steve Langasek
-
Date:
2013-12-13 15:56:07 UTC
-
mfrom:
(114.1.2 trunk)
-
Revision ID:
package-import@ubuntu.com-20131213155607-4tlwgre22bsmf77p
Tags: 0.6.31-3ubuntu1
* 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.