-
Committer:
Bazaar Package Importer
-
Author(s):
Martin Pitt
-
Date:
2007-04-23 17:10:37 UTC
-
mfrom:
(1.1.19 upstream)
-
Revision ID:
james.westby@ubuntu.com-20070423171037-wn452z20f95u3fv9
Tags: 0.6.18-1ubuntu1
* Merge with Debian unstable; remaining Ubuntu changes:
- debian/control: Replace Debian's XS-X-Vcs-Svn with Ubuntu's XS-Vcs-Bzr.
- debian/avahi-daemon.ifupdown: Only check DNS if we are in 'start' mode.
This avoids long delays when this is called as part of if-post-down.
(LP #84128)
- debian/avahi-daemon-check-dns.sh: Do not do the expensive .local checks
if the avahi daemon is not running.
- debian/patches/03_foreground-console.patch: Restrict access to
privileged Avahi dbus functions to console users.
- kubuntu_03_fix_duplicate_entries_in_menu.patch: Fix duplicate menu entry
for avahi-discover. (Forwarded upstream: http://avahi.org/ticket/135)
* Drop avahi_status and enable_avahi scripts, since we now enable avahi by
default and there is no big reason to keep those scripts and the control
center patches.
* Drop debian/patches/00upstream-ServiceBrowserNew-crash.patch, upstream
now.
* debian/control: Fix XS-Vcs-Bzr URL.