2007-06-25 Padraig O'Briain <
[email protected]>
* SUNWavahi.spec: Remove
* SUNWavahi-bridge-dsd.spec: Add
* ext-sources/avahi-bridge-dsd.xml: Add
* patches/avahi-08-man-page.diff: Rename avahi-daemon. Remove reference
to avahi web site from man pages. These changes were requested by
the avahi maintainer Lennart Poettering <
[email protected]>.
--- a/ChangeLog Mon Jun 25 09:57:42 2007 +0000
+++ b/ChangeLog Mon Jun 25 10:17:35 2007 +0000
@@ -1,3 +1,12 @@
+2007-06-25 Padraig O'Briain <[email protected]>
+
+ * SUNWavahi.spec: Remove
+ * SUNWavahi-bridge-dsd.spec: Add
+ * ext-sources/avahi-bridge-dsd.xml: Add
+ * patches/avahi-08-man-page.diff: Rename avahi-daemon. Remove reference
+ to avahi web site from man pages. These changes were requested by
+ the avahi maintainer Lennart Poettering <[email protected]>.
+
2007-06-25 Padraig O'Briain <[email protected]>
* SUNWlibdaemon.spec: Update to 0.11
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/SUNWavahi-bridge-dsd.spec Mon Jun 25 10:17:35 2007 +0000
@@ -0,0 +1,123 @@
+#
+# spec file for package SUNWavahi-bridge-dsd
+#
+# includes module(s): avahi
+#
+# Copyright (c) 2006 Sun Microsystems, Inc.
+# This file and all modifications and additions to the pristine
+# package are under the same license as the package itself.
+#
+
+%include Solaris.inc
+
+%use avahi = avahi.spec
+
+Name: SUNWavahi-bridge-dsd
+Summary: Avahi client and bridge to SUNWdsd.
+Version: %{avahi.version}
+SUNW_BaseDir: %{_basedir}
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
+Source1: avahi-bridge-dsd.xml
+
+%include default-depend.inc
+Requires: SUNWavahi-bridge-dsd-root
+Requires: SUNWlibdaemon
+Requires: SUNWlexpt
+Requires: SUNWdsd
+
+%package root
+Summary: %{summary} - / filesystem
+SUNW_BaseDir: /
+%include default-depend.inc
+
+
+%package devel
+Summary: %{summary} - development files
+SUNW_BaseDir: %{_prefix}
+%include default-depend.inc
+
+%prep
+rm -rf %name-%version
+mkdir %name-%version
+%avahi.prep -d %name-%version
+
+%build
+PKG_CONFIG_DISABLE_UNISTALLED=
+unset PKG_CONFIG_DISABLE_UNISTALLED
+export PKG_CONFIG_PATH=../avahi-%{avahi.version}:%{_pkg_config_path}
+export CFLAGS="%optflags -I/usr/sfw/include"
+export RPM_OPT_FLAGS="$CFLAGS"
+export LDFLAGS="%_ldflags -L/usr/lib/mdns -R/usr/lib/mdns -ldns_sd -lsocket -lnsl -L/usr/sfw/lib -R/usr/sfw/lib -lexpat"
+
+%avahi.build -d %name-%version
+
+%install
+%avahi.install -d %name-%version
+mkdir -p $RPM_BUILD_ROOT/var/svc/manifest/system
+chmod -R 755 $RPM_BUILD_ROOT/var/svc
+cp %SOURCE1 $RPM_BUILD_ROOT/var/svc/manifest/system/
+
+mv $RPM_BUILD_ROOT%{_sbindir}/avahi-daemon $RPM_BUILD_ROOT%{_sbindir}/avahi-daemon-bridge-dsd
+
+%{?pkgbuild_postprocess: %pkgbuild_postprocess -v -c "%{version}:%{jds_version}:%{name}:$RPM_ARCH:%(date +%%Y-%%m-%%d):%{support_level}" $RPM_BUILD_ROOT}
+
+%clean
+#rm -rf $RPM_BUILD_ROOT
+
+%if %(test -f /usr/sadm/install/scripts/i.manifest && echo 0 || echo 1)
+%iclass manifest -f i.manifest
+%endif
+
+%files
+%defattr (-, root, bin)
+%dir %attr (0755, root, bin) %{_bindir}
+%{_bindir}/*
+%dir %attr (0755, root, bin) %{_sbindir}
+%{_sbindir}/avahi-daemon-bridge-dsd
+%dir %attr (0755, root, bin) %{_libdir}
+%{_libdir}/libavahi*.so*
+%dir %attr (0755, root, sys) %{_datadir}
+%{_datadir}/avahi/service-types*
+%dir %attr (0755, root, other) %{_datadir}/applications
+%{_datadir}/applications/avahi-discover.desktop
+%{_datadir}/applications/bssh.desktop
+%{_datadir}/applications/bvnc.desktop
+%{_datadir}/avahi/interfaces/avahi-discover.glade
+%{_datadir}/avahi/introspection/Server.introspect
+%{_datadir}/avahi/introspection/EntryGroup.introspect
+%{_datadir}/avahi/introspection/DomainBrowser.introspect
+%{_datadir}/avahi/introspection/ServiceBrowser.introspect
+%{_datadir}/avahi/introspection/ServiceTypeBrowser.introspect
+%{_datadir}/avahi/introspection/ServiceResolver.introspect
+%{_datadir}/avahi/introspection/AddressResolver.introspect
+%{_datadir}/avahi/introspection/HostNameResolver.introspect
+%{_datadir}/avahi/introspection/RecordBrowser.introspect
+%{_datadir}/avahi/avahi-service.dtd
+%dir %attr (0755, root, bin) %{_mandir}
+%{_mandir}/man1/*
+%{_mandir}/man5/*
+%attr (-, root, bin) %{_libdir}/python*
+
+%files root
+%defattr (-, root, bin)
+%dir %attr (0755, root, sys) %{_sysconfdir}
+%config %{_sysconfdir}/*
+%dir %attr (0755, root, sys) /var
+%dir %attr (0755, root, sys) /var/svc
+%dir %attr (0755, root, sys) /var/svc/manifest
+%dir %attr (0755, root, sys) /var/svc/manifest/system
+%class(manifest) %attr (0444, root, sys) /var/svc/manifest/system/avahi-bridge-dsd.xml
+
+
+%files devel
+%defattr (-, root, bin)
+%dir %attr (0755, root, bin) %{_libdir}
+%dir %attr (0755, root, other) %{_libdir}/pkgconfig
+%{_libdir}/pkgconfig/*
+%dir %attr (0755, root, bin) %{_includedir}
+%{_includedir}/*
+
+
+%changelog
+* Wed June 28 2006 - [email protected]
+- Initial spec file created.
--- a/SUNWavahi.spec Mon Jun 25 09:57:42 2007 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,126 +0,0 @@
-#
-# spec file for package SUNWavahi
-#
-# includes module(s): avahi
-#
-# Copyright (c) 2006 Sun Microsystems, Inc.
-# This file and all modifications and additions to the pristine
-# package are under the same license as the package itself.
-#
-
-%include Solaris.inc
-
-%use avahi = avahi.spec
-
-Name: SUNWavahi
-Summary: DNS Service Discovery and Multicast DNS
-Version: %{avahi.version}
-SUNW_BaseDir: %{_basedir}
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source1: avahi.xml
-
-%include default-depend.inc
-BuildRequires: SUNWgnome-python-libs-devel
-Requires: SUNWgnome-python-libs
-Requires: SUNWavahi-root
-Requires: SUNWlibdaemon
-Requires: SUNWlexpt
-Requires: SUNWdsd
-
-%package root
-Summary: %{summary} - / filesystem
-SUNW_BaseDir: /
-%include default-depend.inc
-
-
-%package devel
-Summary: %{summary} - development files
-SUNW_BaseDir: %{_prefix}
-%include default-depend.inc
-
-%prep
-rm -rf %name-%version
-mkdir %name-%version
-%avahi.prep -d %name-%version
-
-%build
-PKG_CONFIG_DISABLE_UNISTALLED=
-unset PKG_CONFIG_DISABLE_UNISTALLED
-export PKG_CONFIG_PATH=../avahi-%{avahi.version}:%{_pkg_config_path}
-export CFLAGS="%optflags -I/usr/sfw/include"
-export RPM_OPT_FLAGS="$CFLAGS"
-export LDFLAGS="%_ldflags -L/usr/lib/mdns -R/usr/lib/mdns -ldns_sd -lsocket -lnsl -L/usr/sfw/lib -R/usr/sfw/lib -lexpat"
-
-%avahi.build -d %name-%version
-
-%install
-%avahi.install -d %name-%version
-mkdir -p $RPM_BUILD_ROOT/var/svc/manifest/system
-chmod -R 755 $RPM_BUILD_ROOT/var/svc
-cp %SOURCE1 $RPM_BUILD_ROOT/var/svc/manifest/system/
-
-%{?pkgbuild_postprocess: %pkgbuild_postprocess -v -c "%{version}:%{jds_version}:%{name}:$RPM_ARCH:%(date +%%Y-%%m-%%d):%{support_level}" $RPM_BUILD_ROOT}
-
-%clean
-#rm -rf $RPM_BUILD_ROOT
-
-%if %(test -f /usr/sadm/install/scripts/i.manifest && echo 0 || echo 1)
-%iclass manifest -f i.manifest
-%endif
-
-%files
-%defattr (-, root, bin)
-%dir %attr (0755, root, bin) %{_bindir}
-%{_bindir}/*
-%dir %attr (0755, root, bin) %{_sbindir}
-%{_sbindir}/avahi-daemon
-%dir %attr (0755, root, bin) %{_libdir}
-%{_libdir}/libavahi*.so*
-%dir %attr (0755, root, sys) %{_datadir}
-%{_datadir}/avahi/service-types*
-%dir %attr (0755, root, other) %{_datadir}/applications
-%{_datadir}/applications/avahi-discover.desktop
-%{_datadir}/applications/bssh.desktop
-%{_datadir}/applications/bvnc.desktop
-%{_datadir}/avahi/interfaces/avahi-discover.glade
-%{_datadir}/avahi/introspection/Server.introspect
-%{_datadir}/avahi/introspection/EntryGroup.introspect
-%{_datadir}/avahi/introspection/DomainBrowser.introspect
-%{_datadir}/avahi/introspection/ServiceBrowser.introspect
-%{_datadir}/avahi/introspection/ServiceTypeBrowser.introspect
-%{_datadir}/avahi/introspection/ServiceResolver.introspect
-%{_datadir}/avahi/introspection/AddressResolver.introspect
-%{_datadir}/avahi/introspection/HostNameResolver.introspect
-%{_datadir}/avahi/introspection/RecordBrowser.introspect
-%{_datadir}/avahi/avahi-service.dtd
-%dir %attr (0755, root, bin) %{_mandir}
-%{_mandir}/man1/*
-%{_mandir}/man5/*
-%attr (-, root, bin) %{_libdir}/python*
-
-%files root
-%defattr (-, root, bin)
-%dir %attr (0755, root, sys) %{_sysconfdir}
-%config %{_sysconfdir}/*
-%dir %attr (0755, root, sys) /var
-%dir %attr (0755, root, sys) /var/svc
-%dir %attr (0755, root, sys) /var/svc/manifest
-%dir %attr (0755, root, sys) /var/svc/manifest/system
-%class(manifest) %attr (0444, root, sys) /var/svc/manifest/system/avahi.xml
-
-
-%files devel
-%defattr (-, root, bin)
-%dir %attr (0755, root, bin) %{_libdir}
-%dir %attr (0755, root, other) %{_libdir}/pkgconfig
-%{_libdir}/pkgconfig/*
-%dir %attr (0755, root, bin) %{_includedir}
-%{_includedir}/*
-
-
-%changelog
-* Thu Jun 14 2007 - [email protected]
-- Add Build/Requires SUNWgnome-python-libs/-devel to find pygtk module.
-
-* Wed June 28 2006 - [email protected]
-- Initial spec file created.
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/ext-sources/avahi-bridge-dsd.xml Mon Jun 25 10:17:35 2007 +0000
@@ -0,0 +1,96 @@
+<?xml version="1.0"?>
+<!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
+<!--
+ Copyright 2006 Sun Microsystems, Inc. All rights reserved.
+ Use is subject to license terms.
+
+ CDDL HEADER START
+
+ The contents of this file are subject to the terms of the
+ Common Development and Distribution License, Version 1.0 only
+ (the "License"). You may not use this file except in compliance
+ with the License.
+
+ You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+ or http://www.opensolaris.org/os/licensing.
+ See the License for the specific language governing permissions
+ and limitations under the License.
+
+ When distributing Covered Code, include this CDDL HEADER in each
+ file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+ If applicable, add the following below this CDDL HEADER, with the
+ fields enclosed by brackets "[]" replaced with your own identifying
+ information: Portions Copyright [yyyy] [name of copyright owner]
+
+ CDDL HEADER END
+
+ ident "@(#)avahi-bridge-dsd.xml 1.1 06/04/24 SMI"
+
+ NOTE: This service manifest is not editable; its contents will
+ be overwritten by package or patch operations, including
+ operating system upgrade. Make customizations in a different
+ file.
+
+ Service manifest for avahi.
+-->
+
+<service_bundle type='manifest' name='SUNWavahi-bridge-dsd:avahi-bridge-dsd'>
+
+<service
+ name='system/avahi-bridge-dsd'
+ type='service'
+ version='1'>
+
+ <create_default_instance enabled='true' />
+
+ <single_instance />
+
+ <dependency name='usr'
+ type='service'
+ grouping='require_all'
+ restart_on='none'>
+ <service_fmri value='svc:/system/filesystem/local' />
+ </dependency>
+
+ <dependency name='dbus'
+ type='service'
+ grouping='require_all'
+ restart_on='none'>
+ <service_fmri value='svc:/system/dbus' />
+ </dependency>
+
+ <exec_method
+ type='method'
+ name='start'
+ exec='/usr/sbin/avahi-daemon-bridge-dsd -D'
+ timeout_seconds='30'>
+ </exec_method>
+
+ <exec_method
+ type='method'
+ name='stop'
+ exec='/usr/sbin/avahi-daemon -k'
+ timeout_seconds='30' />
+
+ <property_group name='startd' type='framework'>
+ <!-- sub-process core dumps shouldn't restart session -->
+ <propval name='ignore_error' type='astring'
+ value='core,signal' />
+ </property_group>
+
+ <stability value='Unstable' />
+
+ <template>
+ <common_name>
+ <loctext xml:lang='C'>
+ Avahi Daemon Bridge to Bonjour
+ </loctext>
+ </common_name>
+ <documentation>
+ <manpage title='avahi-daemon-bridge-dsd' section='1M' manpath='/usr/man' />
+ </documentation>
+ </template>
+
+</service>
+
+</service_bundle>
--- a/patches/avahi-08-man-page.diff Mon Jun 25 09:57:42 2007 +0000
+++ b/patches/avahi-08-man-page.diff Mon Jun 25 10:17:35 2007 +0000
@@ -1,12 +1,12 @@
--- /usr/tmp/clean/avahi-0.6.19/man/Makefile.am Wed May 9 15:30:24 2007
-+++ avahi-0.6.19/man/Makefile.am Wed Jun 6 14:31:45 2007
++++ avahi-0.6.19/man/Makefile.am Wed Jun 13 15:22:13 2007
@@ -47,6 +47,11 @@
avahi-autoipd.action.8.xml \
bssh.1.xml
+if HAVE_BONJOUR
+noinst_DATA += \
-+ avahi-daemon.1.xml
++ avahi-daemon-bridge-dsd.1.xml
+endif
+
CLEANFILES = \
@@ -18,9 +18,9 @@
+if HAVE_BONJOUR
+man_MANS += \
-+ avahi-daemon.1
++ avahi-daemon-bridge-dsd.1
+
-+avahi-daemon.1.xml: avahi-daemon.1.xml.in Makefile
++avahi-daemon-bridge-dsd.1.xml: avahi-daemon-bridge-dsd.1.xml.in Makefile
+ sed -e 's,@PACKAGE_BUGREPORT\@,$(PACKAGE_BUGREPORT),g' \
+ -e 's,@PACKAGE_URL\@,$(PACKAGE_URL),g' $< > $@
+endif
@@ -33,7 +33,7 @@
CLEANFILES += $(man_MANS)
+if HAVE_BONJOUR
-+avahi-daemon.1: avahi-daemon.1.xml Makefile
++avahi-daemon-bridge-dsd.1: avahi-daemon-bridge-dsd.1.xml Makefile
+ xmltoman $< > $@
+endif
+
@@ -46,7 +46,7 @@
+if HAVE_BONJOUR
+EXTRA_DIST += \
-+ avahi-daemon.1.xml.in
++ avahi-daemon-bridge-dsd.1.xml.in
+endif
if HAVE_DBUS
@@ -59,21 +59,21 @@
$(LN_S) avahi-resolve.1 avahi-resolve-host-name.1 && \
$(LN_S) avahi-resolve.1 avahi-resolve-address.1 && \
$(LN_S) avahi-browse.1 avahi-browse-domains.1 && \
---- /dev/null 2006-09-11 13:07:11.000000000 +0100
-+++ avahi-0.6.13/man/avahi-daemon.1 2006-09-11 13:34:03.600015000 +0100
-@@ -0,0 +1,65 @@
-+.TH avahi-daemon 1 User Manuals
+--- /dev/null 2007-06-13 17:00:01.000000000 +0100
++++ avahi-0.6.19/man/avahi-daemon-bridge-dsd.1 2007-06-13 17:07:14.447743000 +0100
+@@ -0,0 +1,61 @@
++.TH avahi-daemon-bridge-dsd 1 User Manuals
+.SH NAME
-+avahi-daemon \- The Avahi daemon
++avahi-daemon-bridge-dsd \- The Avahi daemon bridge to dsd
+.SH SYNOPSIS
-+\fBavahi-daemon [\fIoptions\fB]
++\fBavahi-daemon-bridge-dsd [\fIoptions\fB]
+
-+avahi-daemon --kill\fB
++avahi-daemon-bridge-dsd --kill\fB
+
-+avahi-daemon --check\fB
++avahi-daemon-bridge-dsd --check\fB
+\f1
+.SH DESCRIPTION
-+The Avahi daemon implements a DBUS interface which provides a rich object oriented interface to DBUS enabled applications which browse for or register for services.
++The daemon implements a DBUS interface which provides a rich object oriented interface to DBUS enabled applications which browse for or register for services.
+
+Instead of implementing Apple's ZeroConf architecture (also known as "Rendezvous" or "Bonjour") it makes calls to the DNS Service Discovery API provided by Bonjour and so functions as a Bonjour client.
+.SH OPTIONS
@@ -97,13 +97,13 @@
+Don't change the process name while running. Unless this option is specified avahi will reflect it's current state and selected host name in the process title.
+.TP
+\fB-k | --kill\f1
-+Kill an already running avahi-daemon. (equivalent to sending a SIGTERM)
++Kill an already running avahi-daemon-bridge-dsd. (equivalent to sending a SIGTERM)
+.TP
+\fB-r | --reload\f1
-+Tell an already running avahi-daemon to reread the files from \fI/etc/avahi/services/\f1. (equivalent to sending a SIGHUP)
++Tell an already running avahi-daemon-bridge-dsd to reread the files from \fI/etc/avahi/services/\f1. (equivalent to sending a SIGHUP)
+.TP
+\fB-c | --check\f1
-+Return 0 as return code when avahi-daemon is already running.
++Return 0 as return code when avahi-daemon-bridge-dsd is already running.
+.TP
+\fB-h | --help\f1
+Show help
@@ -118,18 +118,14 @@
+.SH SIGNALS
+\fISIGINT, SIGTERM, SIGQUIT\f1: avahi-daemon will shutdown. This is issued by passing --kill to avahi-daemon.
+
-+\fISIGHUP\f1: avahi-daemon will reload and static service definitions from \fI/etc/avahi/services/\f1.
++\fISIGHUP\f1: avahi-daemon-bridge-dsd will reload and static service definitions from \fI/etc/avahi/services/\f1.
+
-+.SH AUTHORS
-+The avahi developers <avahi (at) lists (dot) freedesktop (dot) org>; avahi is available from \fBhttp://avahi.org/\f1
-+
-+Making the Avahi Daemon proxy to the Bonjour daemon instead of implementing Bonjour has been written by Sun Microsystems Inc. to support applications which use the Avahi Client API when run on a system with Bonjour.
+.SH SEE ALSO
+.SH COMMENTS
+This man page was written using \fBxml2man(1)\f1 by Padraig O'Briain.
---- /dev/null 2006-05-31 14:49:02.000000000 +0100
-+++ avahi-0.6.10/man/avahi-daemon.1.xml.in 2006-05-31 15:04:18.204316000 +0100
-@@ -0,0 +1,126 @@
+--- /dev/null 2007-06-13 17:00:01.000000000 +0100
++++ avahi-0.6.19/man/avahi-daemon-bridge-dsd.1.xml.in 2007-06-13 17:07:33.097758000 +0100
+@@ -0,0 +1,117 @@
+<?xml version="1.0"?><!--*-nxml-*-->
+<!DOCTYPE manpage SYSTEM "xmltoman.dtd">
+<?xml-stylesheet type="text/xsl" href="xmltoman.xsl" ?>
@@ -155,16 +151,16 @@
+ USA.
+-->
+
-+ <manpage name="avahi-daemon" section="1" desc="The Avahi daemon">
++ <manpage name="avahi-daemon-bridge-dsd" section="1" desc="The Avahi daemon">
+
+ <synopsis>
+ <cmd>avahi-daemon [<arg>options</arg>]</cmd>
+ <cmd>avahi-daemon <opt>--kill</opt></cmd>
+ <cmd>avahi-daemon <opt>--check</opt></cmd>
+ </synopsis>
-+
-+ <description>
-+ <p>The Avahi daemon implements a DBUS interface which provides a
++
++ <description>
++ <p>The daemon implements a DBUS interface which provides a
+ rich object oriented interface to DBUS enabled applications which
+ browse for or register for services.</p>
+
@@ -210,12 +206,12 @@
+
+ <option>
+ <p><opt>-k | --kill</opt></p>
-+ <optdesc><p>Kill an already running avahi-daemon. (equivalent to sending a SIGTERM)</p></optdesc>
++ <optdesc><p>Kill an already running avahi-daemon-bridge-dsd. (equivalent to sending a SIGTERM)</p></optdesc>
+ </option>
+
+ <option>
+ <p><opt>-c | --check</opt></p>
-+ <optdesc><p>Return 0 as return code when avahi-daemon is already running.</p></optdesc>
++ <optdesc><p>Return 0 as return code when avahi-daemon-bridge-dsd is already running.</p></optdesc>
+ </option>
+
+ <option>
@@ -235,18 +231,9 @@
+ </section>
+
+ <section name="Signals">
-+ <p><arg>SIGINT, SIGTERM, SIGQUIT</arg>: avahi-daemon will shutdown. This is issued by passing --kill to avahi-daemon.</p>
++ <p><arg>SIGINT, SIGTERM, SIGQUIT</arg>: avahi-daemon-bridge-dsd will shutdown. This is issued by passing --kill to avahi-daemon-bridge-dsd.</p>
+ </section>
+
-+ <section name="Authors">
-+ <p>The avahi developers <@PACKAGE_BUGREPORT@>; avahi is
-+ available from <url href="@PACKAGE_URL@"/></p>
-+ <p> Making the Avahi Daemon proxy to the Bonjour daemon instead of
-+ implementing Bonjour has been written by Sun Microsystems Inc. to
-+ support applications which use the Avahi Client API when run on a
-+ system with Bonjour.</p>
-+ </section>
-+
+ <section name="See also">
+ </section>
+
@@ -256,3 +243,118 @@
+ </section>
+
+ </manpage>
+--- /usr/tmp/clean/avahi-0.6.19/man/avahi-browse.1 Wed May 9 15:45:42 2007
++++ avahi-0.6.19/man/avahi-browse.1 Wed Jun 13 16:08:06 2007
+@@ -13,7 +13,7 @@
+ avahi-browse-domains [\fIoptions\fB]
+ \f1
+ .SH DESCRIPTION
+-Browse for mDNS/DNS-SD network services and browsing domains using the Avahi daemon.
++Browse for mDNS/DNS-SD network services and browsing domains using the Avahi daemon. The daemon is not the standard Avahi daemon but a proxy to a Bonjour daemon.
+ .SH OPTIONS
+ Specify a DNS-SD service type (e.g. _http._tcp) to browse for on the command line, or \fB-a\f1 to browse for all available service types. Items that appear on the network are prefixed with "+", items that disappear are prefixed with "-".
+ .TP
+@@ -55,9 +55,7 @@
+ .TP
+ \fB-V | --version\f1
+ Show version information.
+-.SH AUTHORS
+-The Avahi Developers <avahi (at) lists (dot) freedesktop (dot) org>; Avahi is available from \fBhttp://avahi.org/\f1
+ .SH SEE ALSO
+-\fBavahi-publish(1)\f1, \fBavahi-resolve(1)\f1, \fBavahi-daemon(8)\f1
++\fBavahi-publish(1)\f1, \fBavahi-resolve(1)\f1
+ .SH COMMENTS
+ This man page was written using \fBxml2man(1)\f1 by Oliver Kurth.
+--- /usr/tmp/clean/avahi-0.6.19/man/avahi-discover.1 Wed May 9 15:45:43 2007
++++ avahi-0.6.19/man/avahi-discover.1 Wed Jun 13 15:42:13 2007
+@@ -5,12 +5,10 @@
+ \fBavahi-discover
+ \f1
+ .SH DESCRIPTION
+-Show a real-time graphical browse list for mDNS/DNS-SD network services running on the local LAN using the Avahi daemon.
++Show a real-time graphical browse list for mDNS/DNS-SD network services running on the local LAN using the Avahi daemon. The daemon is not the standard Avahi daemon but a proxy to a Bonjour daemon.
+ .SH OPTIONS
+ avahi-discover takes no command line arguments at the moment.
+-.SH AUTHORS
+-The Avahi Developers <avahi (at) lists (dot) freedesktop (dot) org>; Avahi is available from \fBhttp://avahi.org/\f1
+ .SH SEE ALSO
+-\fBavahi-daemon(8)\f1, \fBavahi-browse(1)\f1
++\fBavahi-browse(1)\f1
+ .SH COMMENTS
+ This man page was written using \fBxml2man(1)\f1 by Oliver Kurth.
+--- /usr/tmp/clean/avahi-0.6.19/man/avahi-publish.1 Wed May 9 15:45:43 2007
++++ avahi-0.6.19/man/avahi-publish.1 Wed Jun 13 15:44:27 2007
+@@ -11,7 +11,7 @@
+ avahi-publish-address [\fIoptions\fB] \fIhost name\fB \fIaddress\fB
+ \f1
+ .SH DESCRIPTION
+-Register an mDNS/DNS-SD service or host name/address mapping using the Avahi daemon.
++Register an mDNS/DNS-SD service or host name/address mapping using the Avahi daemon. The daemon is not the standard Avahi daemon but a proxy to a Bonjour daemon.
+ .SH OPTIONS
+ When calling in service registration mode, specify a DNS-SD service name (e.g. "Lennart's Files"), a service type (e.g. _http._tcp) and an IP port number for the service, optionally followed by any number of TXT record strings on the command line. When calling in address/host name registration mode specify a fully qualified host name and an address (IPv4 or IPv6).
+ .TP
+@@ -41,9 +41,7 @@
+ .TP
+ \fB-V | --version\f1
+ Show version information.
+-.SH AUTHORS
+-The Avahi Developers <avahi (at) lists (dot) freedesktop (dot) org>; Avahi is available from \fBhttp://avahi.org/\f1
+ .SH SEE ALSO
+-\fBavahi-resolve(1)\f1, \fBavahi-browse(1)\f1, \fBavahi-daemon(8)\f1
++\fBavahi-resolve(1)\f1, \fBavahi-browse(1)\f1
+ .SH COMMENTS
+ This man page was written using \fBxml2man(1)\f1 by Oliver Kurth.
+--- /usr/tmp/clean/avahi-0.6.19/man/avahi-resolve.1 Wed May 9 15:45:42 2007
++++ avahi-0.6.19/man/avahi-resolve.1 Wed Jun 13 15:45:10 2007
+@@ -11,7 +11,7 @@
+ avahi-resolve-address \fIaddress ...\fB
+ \f1
+ .SH DESCRIPTION
+-Resolve one or more mDNS/DNS host name(s) to IP address(es) (and vice versa) using the Avahi daemon.
++Resolve one or more mDNS/DNS host name(s) to IP address(es) (and vice versa) using the Avahi daemon. The daemon is not the standard Avahi daemon but a proxy to a Bonjour daemon.
+ .SH OPTIONS
+ When passing -n, specify one or more fully qualified mDNS/DNS host name(s) (e.g. "foo.local") to resolve into IP addresses on the command line. When passing -a, specifiy one or more IP address to resolve into host names.
+
+@@ -39,9 +39,7 @@
+ .TP
+ \fB-V | --version\f1
+ Show version information.
+-.SH AUTHORS
+-The Avahi Developers <avahi (at) lists (dot) freedesktop (dot) org>; Avahi is available from \fBhttp://avahi.org/\f1
+ .SH SEE ALSO
+-\fBavahi-publish-address(1)\f1, \fBavahi-daemon(8)\f1
++\fBavahi-publish-address(1)\f1
+ .SH COMMENTS
+ This man page was written using \fBxml2man(1)\f1 by Oliver Kurth.
+--- /usr/tmp/clean/avahi-0.6.19/man/avahi-set-host-name.1 Wed May 9 15:45:43 2007
++++ avahi-0.6.19/man/avahi-set-host-name.1 Wed Jun 13 15:46:24 2007
+@@ -5,7 +5,7 @@
+ \fBavahi-set-host-name \fIhost-name\fB
+ \f1
+ .SH DESCRIPTION
+-Set the mDNS host name of a currently running Avahi daemon. The effect of this operation is not persistant across daemon restarts. This operation is usually priviliged.
++Set the mDNS host name of a currently running Avahi daemon. The effect of this operation is not persistant across daemon restarts. This operation is usually priviliged. The daemon is not the standard Avahi daemon but a proxy to a Bonjour daemon.
+ .SH OPTIONS
+ .TP
+ \fB-v | --verbose\f1
+@@ -16,9 +16,5 @@
+ .TP
+ \fB-V | --version\f1
+ Show version information.
+-.SH AUTHORS
+-The Avahi Developers <avahi (at) lists (dot) freedesktop (dot) org>; Avahi is available from \fBhttp://avahi.org/\f1
+-.SH SEE ALSO
+-\fBavahi-daemon(8)\f1
+ .SH COMMENTS
+ This man page was written using \fBxml2man(1)\f1 by Oliver Kurth.
+--- /usr/tmp/clean/avahi-0.6.19/man/bssh.1 Wed May 9 16:24:12 2007
++++ avahi-0.6.19/man/bssh.1 Wed Jun 13 16:06:01 2007
+@@ -10,8 +10,6 @@
+ bssh/bvnc browses for local SSH/VNC servers on the local network, shows them in a GUI for the user to select one and finally calls ssh/xvncviewer after a selection was made.
+ .SH OPTIONS
+ bssh/bvnc takes no command line arguments at the moment.
+-.SH AUTHORS
+-The Avahi Developers <avahi (at) lists (dot) freedesktop (dot) org>; Avahi is available from \fBhttp://avahi.org/\f1
+ .SH SEE ALSO
+ \fBavahi-browse(1)\f1, \fBssh(1)\f1, \fBxvncviewer(1)\f1
+ .SH COMMENTS