-
Committer:
Bazaar Package Importer
-
Author(s):
Robert Ancell
-
Date:
2009-05-06 14:04:57 UTC
-
mfrom:
(4.1.7 squeeze)
-
Revision ID:
james.westby@ubuntu.com-20090506140457-8aeoihjy8sew39cm
Tags: 0.6.25-1ubuntu1
* Merge from debian unstable, remaining changes: LP: #?????
- debian/patches/01_avahi-daemon.conf.patch: Disable IPv6. According to
upstream it is not ready yet and causes hiccups.
- debian/avahi-dnsconfd.postinst:
debian/rules:
debian/avahi-dnsconfd.init:
avahi-daemon.postinst:
avahi-daemon.init: Avahi init scripts (daemon or dnsconfd) do not need to
be started before gdm, and do not need to be stopped specially on
shutdown.
- debian/rules:
debian/python-avahi.install:
debian/avahi-discover.install: Python 2.6 transition (LP: #36814)