summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile.am2
-rw-r--r--avahi-autoipd/Makefile.am4
-rwxr-xr-xavahi-autoipd/avahi-autoipd.action.bsd2
-rwxr-xr-xavahi-autoipd/avahi-autoipd.action.linux2
-rwxr-xr-xavahi-autoipd/dhclient-enter-hook.in2
-rwxr-xr-xavahi-autoipd/dhclient-exit-hook.in6
-rw-r--r--avahi-autoipd/iface-linux.c2
-rw-r--r--avahi-autoipd/iface.h2
-rw-r--r--avahi-autoipd/main.c2
-rw-r--r--avahi-autoipd/main.h2
-rw-r--r--avahi-client/Makefile.am22
-rw-r--r--avahi-client/browser.c2
-rw-r--r--avahi-client/check-nss-test.c2
-rw-r--r--avahi-client/check-nss.c2
-rw-r--r--avahi-client/client-test.c2
-rw-r--r--avahi-client/client.c2
-rw-r--r--avahi-client/client.h2
-rw-r--r--avahi-client/entrygroup.c2
-rw-r--r--avahi-client/internal.h2
-rw-r--r--avahi-client/lookup.h2
-rw-r--r--avahi-client/publish.h2
-rw-r--r--avahi-client/resolver.c2
-rw-r--r--avahi-client/rr-test.c2
-rw-r--r--avahi-client/srv-test.c2
-rw-r--r--avahi-client/xdg-config-test.c2
-rw-r--r--avahi-client/xdg-config.c2
-rw-r--r--avahi-client/xdg-config.h2
-rw-r--r--avahi-common/Makefile.am2
-rw-r--r--avahi-common/address.c2
-rw-r--r--avahi-common/address.h2
-rw-r--r--avahi-common/alternative-test.c2
-rw-r--r--avahi-common/alternative.c2
-rw-r--r--avahi-common/alternative.h2
-rw-r--r--avahi-common/cdecl.h2
-rw-r--r--avahi-common/dbus-watch-glue.c2
-rw-r--r--avahi-common/dbus-watch-glue.h2
-rw-r--r--avahi-common/dbus.c2
-rw-r--r--avahi-common/dbus.h2
-rw-r--r--avahi-common/defs.h2
-rw-r--r--avahi-common/domain-test.c2
-rw-r--r--avahi-common/domain.c2
-rw-r--r--avahi-common/domain.h2
-rw-r--r--avahi-common/error.c2
-rw-r--r--avahi-common/error.h2
-rw-r--r--avahi-common/gccmacro.h2
-rw-r--r--avahi-common/i18n.c2
-rw-r--r--avahi-common/i18n.h2
-rw-r--r--avahi-common/llist.h2
-rw-r--r--avahi-common/malloc.c2
-rw-r--r--avahi-common/malloc.h2
-rw-r--r--avahi-common/rlist.c2
-rw-r--r--avahi-common/rlist.h2
-rw-r--r--avahi-common/simple-watch.c2
-rw-r--r--avahi-common/simple-watch.h2
-rw-r--r--avahi-common/strlst-test.c2
-rw-r--r--avahi-common/strlst.c2
-rw-r--r--avahi-common/strlst.h2
-rw-r--r--avahi-common/thread-watch.c2
-rw-r--r--avahi-common/thread-watch.h2
-rw-r--r--avahi-common/timeval-test.c2
-rw-r--r--avahi-common/timeval.c2
-rw-r--r--avahi-common/timeval.h2
-rw-r--r--avahi-common/utf8-test.c2
-rw-r--r--avahi-common/utf8.c2
-rw-r--r--avahi-common/utf8.h2
-rw-r--r--avahi-common/watch-test.c2
-rw-r--r--avahi-common/watch.h2
-rw-r--r--avahi-compat-howl/Makefile.am2
-rw-r--r--avahi-compat-howl/address-test.c2
-rw-r--r--avahi-compat-howl/address.c2
-rw-r--r--avahi-compat-howl/browse-domain-test.c2
-rw-r--r--avahi-compat-howl/compat.c2
-rw-r--r--avahi-compat-howl/funcs.txt2
-rw-r--r--avahi-compat-howl/samples/Makefile.am2
-rw-r--r--avahi-compat-howl/text-test.c2
-rw-r--r--avahi-compat-howl/text.c2
-rw-r--r--avahi-compat-howl/unsupported.c2
-rw-r--r--avahi-compat-howl/warn.c2
-rw-r--r--avahi-compat-howl/warn.h2
-rw-r--r--avahi-compat-libdns_sd/Makefile.am6
-rw-r--r--avahi-compat-libdns_sd/compat.c2
-rw-r--r--avahi-compat-libdns_sd/funcs.txt2
-rw-r--r--avahi-compat-libdns_sd/null-test.c2
-rw-r--r--avahi-compat-libdns_sd/txt-test.c2
-rw-r--r--avahi-compat-libdns_sd/txt.c2
-rw-r--r--avahi-compat-libdns_sd/unsupported.c2
-rw-r--r--avahi-compat-libdns_sd/warn.c2
-rw-r--r--avahi-compat-libdns_sd/warn.h2
-rw-r--r--avahi-core/Makefile.am2
-rw-r--r--avahi-core/addr-util.c2
-rw-r--r--avahi-core/addr-util.h2
-rw-r--r--avahi-core/announce.c2
-rw-r--r--avahi-core/announce.h2
-rw-r--r--avahi-core/avahi-reflector.c2
-rw-r--r--avahi-core/avahi-test.c2
-rw-r--r--avahi-core/browse-dns-server.c2
-rw-r--r--avahi-core/browse-domain.c2
-rw-r--r--avahi-core/browse-service-type.c2
-rw-r--r--avahi-core/browse-service.c2
-rw-r--r--avahi-core/browse.c2
-rw-r--r--avahi-core/browse.h2
-rw-r--r--avahi-core/cache.c2
-rw-r--r--avahi-core/cache.h2
-rw-r--r--avahi-core/conformance-test.c2
-rw-r--r--avahi-core/core.h2
-rw-r--r--avahi-core/dns-spin-test.c2
-rw-r--r--avahi-core/dns-srv-rr.h2
-rw-r--r--avahi-core/dns-test.c2
-rw-r--r--avahi-core/dns.c2
-rw-r--r--avahi-core/dns.h2
-rw-r--r--avahi-core/domain-util.c2
-rw-r--r--avahi-core/domain-util.h2
-rw-r--r--avahi-core/entry.c2
-rw-r--r--avahi-core/fdutil.c2
-rw-r--r--avahi-core/fdutil.h2
-rw-r--r--avahi-core/hashmap-test.c2
-rw-r--r--avahi-core/hashmap.c2
-rw-r--r--avahi-core/hashmap.h2
-rw-r--r--avahi-core/iface-linux.c2
-rw-r--r--avahi-core/iface-linux.h2
-rw-r--r--avahi-core/iface-pfroute.c2
-rw-r--r--avahi-core/iface-pfroute.h2
-rw-r--r--avahi-core/iface.c2
-rw-r--r--avahi-core/iface.h2
-rw-r--r--avahi-core/internal.h2
-rw-r--r--avahi-core/log.c2
-rw-r--r--avahi-core/log.h2
-rw-r--r--avahi-core/lookup.h2
-rw-r--r--avahi-core/multicast-lookup.c2
-rw-r--r--avahi-core/multicast-lookup.h2
-rw-r--r--avahi-core/netlink.c2
-rw-r--r--avahi-core/netlink.h2
-rw-r--r--avahi-core/prioq-test.c2
-rw-r--r--avahi-core/prioq.c2
-rw-r--r--avahi-core/prioq.h2
-rw-r--r--avahi-core/probe-sched.c2
-rw-r--r--avahi-core/probe-sched.h2
-rw-r--r--avahi-core/publish.h2
-rw-r--r--avahi-core/querier-test.c2
-rw-r--r--avahi-core/querier.c2
-rw-r--r--avahi-core/querier.h2
-rw-r--r--avahi-core/query-sched.c2
-rw-r--r--avahi-core/query-sched.h2
-rw-r--r--avahi-core/resolve-address.c2
-rw-r--r--avahi-core/resolve-host-name.c2
-rw-r--r--avahi-core/resolve-service.c2
-rw-r--r--avahi-core/response-sched.c2
-rw-r--r--avahi-core/response-sched.h2
-rw-r--r--avahi-core/rr-util.h2
-rw-r--r--avahi-core/rr.c2
-rw-r--r--avahi-core/rr.h2
-rw-r--r--avahi-core/rrlist.c2
-rw-r--r--avahi-core/rrlist.h2
-rw-r--r--avahi-core/server.c2
-rw-r--r--avahi-core/socket.c2
-rw-r--r--avahi-core/socket.h2
-rw-r--r--avahi-core/timeeventq-test.c2
-rw-r--r--avahi-core/timeeventq.c2
-rw-r--r--avahi-core/timeeventq.h2
-rw-r--r--avahi-core/update-test.c2
-rw-r--r--avahi-core/util.c2
-rw-r--r--avahi-core/util.h2
-rw-r--r--avahi-core/wide-area.c2
-rw-r--r--avahi-core/wide-area.h2
-rw-r--r--avahi-daemon/AddressResolver.introspect2
-rw-r--r--avahi-daemon/DomainBrowser.introspect2
-rw-r--r--avahi-daemon/EntryGroup.introspect2
-rw-r--r--avahi-daemon/HostNameResolver.introspect2
-rw-r--r--avahi-daemon/Makefile.am2
-rw-r--r--avahi-daemon/RecordBrowser.introspect2
-rw-r--r--avahi-daemon/Server.introspect2
-rw-r--r--avahi-daemon/ServiceBrowser.introspect10
-rw-r--r--avahi-daemon/ServiceResolver.introspect2
-rw-r--r--avahi-daemon/ServiceTypeBrowser.introspect2
-rw-r--r--avahi-daemon/avahi-daemon.conf2
-rw-r--r--avahi-daemon/avahi-service.dtd2
-rw-r--r--avahi-daemon/caps.c2
-rw-r--r--avahi-daemon/caps.h2
-rw-r--r--avahi-daemon/chroot.c2
-rw-r--r--avahi-daemon/chroot.h2
-rw-r--r--avahi-daemon/dbus-async-address-resolver.c2
-rw-r--r--avahi-daemon/dbus-async-host-name-resolver.c2
-rw-r--r--avahi-daemon/dbus-async-service-resolver.c2
-rw-r--r--avahi-daemon/dbus-domain-browser.c2
-rw-r--r--avahi-daemon/dbus-entry-group.c2
-rw-r--r--avahi-daemon/dbus-internal.h2
-rw-r--r--avahi-daemon/dbus-protocol.c2
-rw-r--r--avahi-daemon/dbus-protocol.h2
-rw-r--r--avahi-daemon/dbus-record-browser.c2
-rw-r--r--avahi-daemon/dbus-service-browser.c2
-rw-r--r--avahi-daemon/dbus-service-type-browser.c2
-rw-r--r--avahi-daemon/dbus-sync-address-resolver.c2
-rw-r--r--avahi-daemon/dbus-sync-host-name-resolver.c2
-rw-r--r--avahi-daemon/dbus-sync-service-resolver.c2
-rw-r--r--avahi-daemon/dbus-util.c2
-rw-r--r--avahi-daemon/dbus-util.h2
-rw-r--r--avahi-daemon/example.service2
-rw-r--r--avahi-daemon/hosts2
-rw-r--r--avahi-daemon/ini-file-parser-test.c2
-rw-r--r--avahi-daemon/ini-file-parser.c2
-rw-r--r--avahi-daemon/ini-file-parser.h2
-rw-r--r--avahi-daemon/introspect.xsl2
-rw-r--r--avahi-daemon/main.c2
-rw-r--r--avahi-daemon/main.h2
-rw-r--r--avahi-daemon/setproctitle.c2
-rw-r--r--avahi-daemon/setproctitle.h2
-rw-r--r--avahi-daemon/sftp-ssh.service4
-rw-r--r--avahi-daemon/simple-protocol.c2
-rw-r--r--avahi-daemon/simple-protocol.h2
-rw-r--r--avahi-daemon/ssh.service2
-rw-r--r--avahi-daemon/static-hosts.c2
-rw-r--r--avahi-daemon/static-hosts.h2
-rw-r--r--avahi-daemon/static-services.c2
-rw-r--r--avahi-daemon/static-services.h2
-rw-r--r--avahi-discover-standalone/Makefile.am6
-rw-r--r--avahi-discover-standalone/main.c2
-rw-r--r--avahi-dnsconfd/Makefile.am6
-rwxr-xr-xavahi-dnsconfd/avahi-dnsconfd.action2
-rw-r--r--avahi-dnsconfd/main.c2
-rw-r--r--avahi-glib/Makefile.am2
-rw-r--r--avahi-glib/glib-malloc.c2
-rw-r--r--avahi-glib/glib-malloc.h2
-rw-r--r--avahi-glib/glib-watch-test.c2
-rw-r--r--avahi-glib/glib-watch.c2
-rw-r--r--avahi-glib/glib-watch.h2
-rw-r--r--avahi-gobject/Makefile.am2
-rw-r--r--avahi-python/Makefile.am2
-rwxr-xr-xavahi-python/avahi-bookmarks.in2
-rw-r--r--avahi-python/avahi-discover/Makefile.am4
-rwxr-xr-xavahi-python/avahi-discover/__init__.py2
-rwxr-xr-xavahi-python/avahi-discover/avahi-discover.in2
-rw-r--r--avahi-python/avahi/Makefile.am2
-rw-r--r--avahi-python/avahi/ServiceTypeDatabase.py.in2
-rw-r--r--avahi-python/avahi/__init__.py2
-rw-r--r--avahi-qt/Makefile.am14
-rw-r--r--avahi-qt/qt-watch.cpp2
-rw-r--r--avahi-qt/qt-watch.h2
-rw-r--r--avahi-sharp/AddressResolver.cs10
-rw-r--r--avahi-sharp/AssemblyInfo.cs10
-rw-r--r--avahi-sharp/AvahiTest.cs14
-rw-r--r--avahi-sharp/BrowserBase.cs2
-rw-r--r--avahi-sharp/Client.cs22
-rw-r--r--avahi-sharp/ClientException.cs8
-rw-r--r--avahi-sharp/DomainBrowser.cs10
-rw-r--r--avahi-sharp/EntryGroup.cs22
-rw-r--r--avahi-sharp/HostNameResolver.cs6
-rw-r--r--avahi-sharp/Makefile.am2
-rw-r--r--avahi-sharp/RecordBrowser.cs14
-rw-r--r--avahi-sharp/ResolverBase.cs2
-rw-r--r--avahi-sharp/ServiceBrowser.cs16
-rw-r--r--avahi-sharp/ServiceResolver.cs8
-rw-r--r--avahi-sharp/ServiceTypeBrowser.cs10
-rw-r--r--avahi-sharp/Utility.cs8
-rw-r--r--avahi-ui-sharp/Makefile.am2
-rw-r--r--avahi-ui-sharp/ServiceDialog.cs14
-rw-r--r--avahi-ui-sharp/bssh.cs8
-rw-r--r--avahi-ui/Makefile.am2
-rw-r--r--avahi-ui/avahi-ui.c2
-rw-r--r--avahi-ui/avahi-ui.h2
-rw-r--r--avahi-ui/bssh.c2
-rw-r--r--avahi-utils/Makefile.am2
-rw-r--r--avahi-utils/avahi-browse.c2
-rw-r--r--avahi-utils/avahi-publish.c2
-rw-r--r--avahi-utils/avahi-resolve.c2
-rw-r--r--avahi-utils/avahi-set-host-name.c2
-rw-r--r--avahi-utils/sigint.c2
-rw-r--r--avahi-utils/sigint.h2
-rw-r--r--avahi-utils/stdb.c2
-rw-r--r--avahi-utils/stdb.h2
-rwxr-xr-xbootstrap.sh1
-rw-r--r--common/Makefile.am2
-rw-r--r--configure.ac2
-rw-r--r--docs/API-CHANGES-0.63
-rw-r--r--docs/COMPAT-LAYERS2
-rw-r--r--docs/DBUS-API2
-rw-r--r--docs/HACKING20
-rw-r--r--docs/INSTALL2
-rw-r--r--docs/MALLOC2
-rw-r--r--docs/NEWS2
-rw-r--r--examples/Makefile.am4
-rw-r--r--examples/client-browse-services.c2
-rw-r--r--examples/client-publish-service.c2
-rw-r--r--examples/core-browse-services.c2
-rw-r--r--examples/core-publish-service.c2
-rw-r--r--examples/glib-integration.c2
-rw-r--r--initscript/Makefile.am4
-rw-r--r--initscript/archlinux/Makefile.am2
-rw-r--r--initscript/archlinux/avahi-daemon.in2
-rwxr-xr-xinitscript/archlinux/avahi-dnsconfd.in2
-rw-r--r--initscript/darwin/Makefile.am2
-rw-r--r--initscript/debian/Makefile.am2
-rwxr-xr-xinitscript/debian/avahi-daemon.in2
-rwxr-xr-xinitscript/debian/avahi-dnsconfd.in2
-rw-r--r--initscript/fedora/Makefile.am2
-rw-r--r--initscript/freebsd/Makefile.am2
-rw-r--r--initscript/gentoo/Makefile.am4
-rw-r--r--initscript/gentoo/avahi-daemon.in1
-rw-r--r--initscript/gentoo/avahi-dnsconfd.in1
-rw-r--r--initscript/lfs/Makefile.am2
-rw-r--r--initscript/mandriva/Makefile.am2
-rw-r--r--initscript/slackware/Makefile.am2
-rw-r--r--initscript/slackware/avahi-daemon.in2
-rw-r--r--initscript/slackware/avahi-dnsconfd.in2
-rw-r--r--initscript/suse/Makefile.am2
-rw-r--r--man/Makefile.am2
-rw-r--r--man/avahi-autoipd.8.xml.in26
-rw-r--r--man/avahi-autoipd.action.8.xml.in20
-rw-r--r--man/avahi-bookmarks.1.xml.in26
-rw-r--r--man/avahi-browse.1.xml.in2
-rw-r--r--man/avahi-daemon.8.xml.in26
-rw-r--r--man/avahi-daemon.conf.5.xml.in2
-rw-r--r--man/avahi-discover.1.xml.in24
-rw-r--r--man/avahi-dnsconfd.8.xml.in24
-rw-r--r--man/avahi-dnsconfd.action.8.xml.in24
-rw-r--r--man/avahi-publish.1.xml.in24
-rw-r--r--man/avahi-resolve.1.xml.in24
-rw-r--r--man/avahi-set-host-name.1.xml.in22
-rw-r--r--man/avahi.hosts.5.xml.in18
-rw-r--r--man/avahi.service.5.xml.in22
-rw-r--r--man/bssh.1.xml.in2
-rw-r--r--man/xmltoman.css2
-rw-r--r--man/xmltoman.dtd6
-rw-r--r--man/xmltoman.xsl2
-rw-r--r--service-type-database/Makefile.am4
-rwxr-xr-xservice-type-database/build-db.in2
-rw-r--r--service-type-database/service-types2
-rw-r--r--tests/Makefile.am4
-rwxr-xr-xtests/c-plus-plus-test-gen.py14
-rw-r--r--tests/c-plus-plus-test.cc2
329 files changed, 252 insertions, 916 deletions
diff --git a/Makefile.am b/Makefile.am
index ed20c96..02e3a9c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,3 @@
-# $Id$
-
# This file is part of avahi.
#
# avahi is free software; you can redistribute it and/or modify it
diff --git a/avahi-autoipd/Makefile.am b/avahi-autoipd/Makefile.am
index 2f99592..1911a80 100644
--- a/avahi-autoipd/Makefile.am
+++ b/avahi-autoipd/Makefile.am
@@ -1,7 +1,5 @@
-# $Id$
-#
# This file is part of avahi.
-#
+#
# avahi is free software; you can redistribute it and/or modify it
# under the terms of the GNU Lesser General Public License as
# published by the Free Software Foundation; either version 2 of the
diff --git a/avahi-autoipd/avahi-autoipd.action.bsd b/avahi-autoipd/avahi-autoipd.action.bsd
index db39c4e..06084fb 100755
--- a/avahi-autoipd/avahi-autoipd.action.bsd
+++ b/avahi-autoipd/avahi-autoipd.action.bsd
@@ -1,7 +1,5 @@
#!/bin/sh
-# $Id$
-#
# This file is part of avahi.
#
# avahi is free software; you can redistribute it and/or modify it
diff --git a/avahi-autoipd/avahi-autoipd.action.linux b/avahi-autoipd/avahi-autoipd.action.linux
index 9b14600..cc9238c 100755
--- a/avahi-autoipd/avahi-autoipd.action.linux
+++ b/avahi-autoipd/avahi-autoipd.action.linux
@@ -1,7 +1,5 @@
#!/bin/sh
-# $Id$
-#
# This file is part of avahi.
#
# avahi is free software; you can redistribute it and/or modify it
diff --git a/avahi-autoipd/dhclient-enter-hook.in b/avahi-autoipd/dhclient-enter-hook.in
index 10449f1..a746856 100755
--- a/avahi-autoipd/dhclient-enter-hook.in
+++ b/avahi-autoipd/dhclient-enter-hook.in
@@ -1,7 +1,5 @@
#!/bin/sh
-# $Id$
-#
# This file is part of avahi.
#
# avahi is free software; you can redistribute it and/or modify it
diff --git a/avahi-autoipd/dhclient-exit-hook.in b/avahi-autoipd/dhclient-exit-hook.in
index 3dcb7df..379cb46 100755
--- a/avahi-autoipd/dhclient-exit-hook.in
+++ b/avahi-autoipd/dhclient-exit-hook.in
@@ -1,9 +1,7 @@
#!/bin/sh
-# $Id$
-#
# This file is part of avahi.
-#
+#
# avahi is free software; you can redistribute it and/or modify it
# under the terms of the GNU Lesser General Public License as
# published by the Free Software Foundation; either version 2 of the
@@ -26,7 +24,7 @@ case "$reason" in
PREINIT|BOUND|RENEW|REBIND|REBOOT|STOP|RELEASE)
# Stopping avahi-autoipd is left for the enter hook
;;
-
+
EXPIRE|FAIL|TIMEOUT)
@sbindir@/avahi-autoipd -wD $interface 2> /dev/null
;;
diff --git a/avahi-autoipd/iface-linux.c b/avahi-autoipd/iface-linux.c
index b4abd6f..fc27829 100644
--- a/avahi-autoipd/iface-linux.c
+++ b/avahi-autoipd/iface-linux.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-autoipd/iface.h b/avahi-autoipd/iface.h
index 7599b80..95c97fd 100644
--- a/avahi-autoipd/iface.h
+++ b/avahi-autoipd/iface.h
@@ -1,8 +1,6 @@
#ifndef fooavahiifacehfoo
#define fooavahiifacehfoo
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-autoipd/main.c b/avahi-autoipd/main.c
index eb71c3b..380ab94 100644
--- a/avahi-autoipd/main.c
+++ b/avahi-autoipd/main.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-autoipd/main.h b/avahi-autoipd/main.h
index 1e2f627..cc02df7 100644
--- a/avahi-autoipd/main.h
+++ b/avahi-autoipd/main.h
@@ -1,8 +1,6 @@
#ifndef fooavahimainhfoo
#define fooavahimainhfoo
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-client/Makefile.am b/avahi-client/Makefile.am
index cd62e32..f11b11d 100644
--- a/avahi-client/Makefile.am
+++ b/avahi-client/Makefile.am
@@ -1,7 +1,5 @@
-# $Id: Makefile.am 90 2005-05-23 16:15:12Z lennart $
-#
# This file is part of avahi.
-#
+#
# avahi is free software; you can redistribute it and/or modify it
# under the terms of the GNU Lesser General Public License as
# published by the Free Software Foundation; either version 2 of the
@@ -40,7 +38,7 @@ noinst_PROGRAMS = \
endif
-lib_LTLIBRARIES = libavahi-client.la
+lib_LTLIBRARIES = libavahi-client.la
libavahi_client_la_SOURCES = \
client.c client.h \
@@ -58,23 +56,23 @@ libavahi_client_la_LIBADD = $(AM_LDADD) $(DBUS_LIBS) ../avahi-common/libavahi-co
libavahi_client_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(LIBAVAHI_CLIENT_VERSION_INFO)
client_test_SOURCES = client-test.c
-client_test_CFLAGS = $(AM_CFLAGS)
-client_test_LDADD = $(AM_LDADD) libavahi-client.la ../avahi-common/libavahi-common.la
+client_test_CFLAGS = $(AM_CFLAGS)
+client_test_LDADD = $(AM_LDADD) libavahi-client.la ../avahi-common/libavahi-common.la
srv_test_SOURCES = srv-test.c
-srv_test_CFLAGS = $(AM_CFLAGS)
-srv_test_LDADD = $(AM_LDADD) libavahi-client.la ../avahi-common/libavahi-common.la
+srv_test_CFLAGS = $(AM_CFLAGS)
+srv_test_LDADD = $(AM_LDADD) libavahi-client.la ../avahi-common/libavahi-common.la
rr_test_SOURCES = rr-test.c
-rr_test_CFLAGS = $(AM_CFLAGS)
-rr_test_LDADD = $(AM_LDADD) libavahi-client.la ../avahi-common/libavahi-common.la
+rr_test_CFLAGS = $(AM_CFLAGS)
+rr_test_LDADD = $(AM_LDADD) libavahi-client.la ../avahi-common/libavahi-common.la
xdg_config_test_SOURCES = xdg-config-test.c xdg-config.c xdg-config.h
-xdg_config_test_CFLAGS = $(AM_CFLAGS)
+xdg_config_test_CFLAGS = $(AM_CFLAGS)
xdg_config_test_LDADD = $(AM_LDADD)
check_nss_test_SOURCES = check-nss.c check-nss-test.c client.h
-check_nss_test_CFLAGS = $(AM_CFLAGS)
+check_nss_test_CFLAGS = $(AM_CFLAGS)
check_nss_test_LDADD = $(AM_LDADD)
if HAVE_DLOPEN
diff --git a/avahi-client/browser.c b/avahi-client/browser.c
index 1889694..f92ed0d 100644
--- a/avahi-client/browser.c
+++ b/avahi-client/browser.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-client/check-nss-test.c b/avahi-client/check-nss-test.c
index 43d6a22..7c15500 100644
--- a/avahi-client/check-nss-test.c
+++ b/avahi-client/check-nss-test.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-client/check-nss.c b/avahi-client/check-nss.c
index 69eefa5..ea266c4 100644
--- a/avahi-client/check-nss.c
+++ b/avahi-client/check-nss.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-client/client-test.c b/avahi-client/client-test.c
index 11bac51..7d04a6a 100644
--- a/avahi-client/client-test.c
+++ b/avahi-client/client-test.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-client/client.c b/avahi-client/client.c
index bb8c20f..6435723 100644
--- a/avahi-client/client.c
+++ b/avahi-client/client.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-client/client.h b/avahi-client/client.h
index 986afb3..1039da5 100644
--- a/avahi-client/client.h
+++ b/avahi-client/client.h
@@ -1,8 +1,6 @@
#ifndef fooclienthfoo
#define fooclienthfoo
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-client/entrygroup.c b/avahi-client/entrygroup.c
index cbe1882..d809d60 100644
--- a/avahi-client/entrygroup.c
+++ b/avahi-client/entrygroup.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-client/internal.h b/avahi-client/internal.h
index f4ff938..e5f3beb 100644
--- a/avahi-client/internal.h
+++ b/avahi-client/internal.h
@@ -1,8 +1,6 @@
#ifndef foointernalhfoo
#define foointernalhfoo
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-client/lookup.h b/avahi-client/lookup.h
index bdd469c..52407f4 100644
--- a/avahi-client/lookup.h
+++ b/avahi-client/lookup.h
@@ -1,8 +1,6 @@
#ifndef fooclientlookuphfoo
#define fooclientlookuphfoo
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-client/publish.h b/avahi-client/publish.h
index 0884d3e..ea731f2 100644
--- a/avahi-client/publish.h
+++ b/avahi-client/publish.h
@@ -1,8 +1,6 @@
#ifndef fooclientpublishhfoo
#define fooclientpublishhfoo
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-client/resolver.c b/avahi-client/resolver.c
index c1ace37..6ee15e9 100644
--- a/avahi-client/resolver.c
+++ b/avahi-client/resolver.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-client/rr-test.c b/avahi-client/rr-test.c
index 2a5d64a..0402585 100644
--- a/avahi-client/rr-test.c
+++ b/avahi-client/rr-test.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-client/srv-test.c b/avahi-client/srv-test.c
index 5f5e1de..650bd77 100644
--- a/avahi-client/srv-test.c
+++ b/avahi-client/srv-test.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-client/xdg-config-test.c b/avahi-client/xdg-config-test.c
index 35ed25c..a7ee63e 100644
--- a/avahi-client/xdg-config-test.c
+++ b/avahi-client/xdg-config-test.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-client/xdg-config.c b/avahi-client/xdg-config.c
index e333f90..fc65016 100644
--- a/avahi-client/xdg-config.c
+++ b/avahi-client/xdg-config.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-client/xdg-config.h b/avahi-client/xdg-config.h
index 9948580..6c855ab 100644
--- a/avahi-client/xdg-config.h
+++ b/avahi-client/xdg-config.h
@@ -1,8 +1,6 @@
#ifndef fooxdgconfighfoo
#define fooxdgconfighfoo
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-common/Makefile.am b/avahi-common/Makefile.am
index b4bc917..24187ab 100644
--- a/avahi-common/Makefile.am
+++ b/avahi-common/Makefile.am
@@ -1,5 +1,3 @@
-# $Id: Makefile.am 90 2005-05-23 16:15:12Z lennart $
-#
# This file is part of avahi.
#
# avahi is free software; you can redistribute it and/or modify it
diff --git a/avahi-common/address.c b/avahi-common/address.c
index 270292c..e8f6148 100644
--- a/avahi-common/address.c
+++ b/avahi-common/address.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-common/address.h b/avahi-common/address.h
index 70d1521..a14104f 100644
--- a/avahi-common/address.h
+++ b/avahi-common/address.h
@@ -1,8 +1,6 @@
#ifndef fooaddresshfoo
#define fooaddresshfoo
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-common/alternative-test.c b/avahi-common/alternative-test.c
index f40ec8e..9255435 100644
--- a/avahi-common/alternative-test.c
+++ b/avahi-common/alternative-test.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-common/alternative.c b/avahi-common/alternative.c
index 1306a22..b3d39f0 100644
--- a/avahi-common/alternative.c
+++ b/avahi-common/alternative.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-common/alternative.h b/avahi-common/alternative.h
index 63c30ad..9b044de 100644
--- a/avahi-common/alternative.h
+++ b/avahi-common/alternative.h
@@ -1,8 +1,6 @@
#ifndef fooalternativehfoo
#define fooalternativehfoo
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-common/cdecl.h b/avahi-common/cdecl.h
index df77794..aef6aba 100644
--- a/avahi-common/cdecl.h
+++ b/avahi-common/cdecl.h
@@ -1,8 +1,6 @@
#ifndef foocdeclhfoo
#define foocdeclhfoo
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-common/dbus-watch-glue.c b/avahi-common/dbus-watch-glue.c
index eeecf23..b18f555 100644
--- a/avahi-common/dbus-watch-glue.c
+++ b/avahi-common/dbus-watch-glue.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-common/dbus-watch-glue.h b/avahi-common/dbus-watch-glue.h
index f78d350..138ea97 100644
--- a/avahi-common/dbus-watch-glue.h
+++ b/avahi-common/dbus-watch-glue.h
@@ -1,8 +1,6 @@
#ifndef foodbuswatchgluehfoo
#define foodbuswatchgluehfoo
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-common/dbus.c b/avahi-common/dbus.c
index 80b03c6..f19c77c 100644
--- a/avahi-common/dbus.c
+++ b/avahi-common/dbus.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-common/dbus.h b/avahi-common/dbus.h
index 5f1e37d..ea3e8a2 100644
--- a/avahi-common/dbus.h
+++ b/avahi-common/dbus.h
@@ -1,8 +1,6 @@
#ifndef foodbushfoo
#define foodbushfoo
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-common/defs.h b/avahi-common/defs.h
index ddeaf9e..f228f82 100644
--- a/avahi-common/defs.h
+++ b/avahi-common/defs.h
@@ -1,8 +1,6 @@
#ifndef foodefshfoo
#define foodefshfoo
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-common/domain-test.c b/avahi-common/domain-test.c
index cf26c77..cf763ec 100644
--- a/avahi-common/domain-test.c
+++ b/avahi-common/domain-test.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-common/domain.c b/avahi-common/domain.c
index b4a6fc1..3b1ab68 100644
--- a/avahi-common/domain.c
+++ b/avahi-common/domain.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-common/domain.h b/avahi-common/domain.h
index 1ed6fce..a0dcd0f 100644
--- a/avahi-common/domain.h
+++ b/avahi-common/domain.h
@@ -1,8 +1,6 @@
#ifndef foodomainhfoo
#define foodomainhfoo
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-common/error.c b/avahi-common/error.c
index fb9bd38..b0b66ea 100644
--- a/avahi-common/error.c
+++ b/avahi-common/error.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-common/error.h b/avahi-common/error.h
index ede5b2a..392aaf5 100644
--- a/avahi-common/error.h
+++ b/avahi-common/error.h
@@ -1,8 +1,6 @@
#ifndef fooerrorhfoo
#define fooerrorhfoo
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-common/gccmacro.h b/avahi-common/gccmacro.h
index 81b34cd..4c97111 100644
--- a/avahi-common/gccmacro.h
+++ b/avahi-common/gccmacro.h
@@ -1,8 +1,6 @@
#ifndef foogccmacrohfoo
#define foogccmacrohfoo
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-common/i18n.c b/avahi-common/i18n.c
index 20f3b3a..51c93e4 100644
--- a/avahi-common/i18n.c
+++ b/avahi-common/i18n.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-common/i18n.h b/avahi-common/i18n.h
index e246736..2a613e5 100644
--- a/avahi-common/i18n.h
+++ b/avahi-common/i18n.h
@@ -1,8 +1,6 @@
#ifndef fooi18nhfoo
#define fooi18nhfoo
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-common/llist.h b/avahi-common/llist.h
index 217e895..e37056d 100644
--- a/avahi-common/llist.h
+++ b/avahi-common/llist.h
@@ -1,8 +1,6 @@
#ifndef foollistfoo
#define foollistfoo
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-common/malloc.c b/avahi-common/malloc.c
index 8c25474..23b13a9 100644
--- a/avahi-common/malloc.c
+++ b/avahi-common/malloc.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-common/malloc.h b/avahi-common/malloc.h
index ec74679..ffaac3f 100644
--- a/avahi-common/malloc.h
+++ b/avahi-common/malloc.h
@@ -1,8 +1,6 @@
#ifndef foomallochfoo
#define foomallochfoo
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-common/rlist.c b/avahi-common/rlist.c
index 0451590..17dcb24 100644
--- a/avahi-common/rlist.c
+++ b/avahi-common/rlist.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-common/rlist.h b/avahi-common/rlist.h
index 62e6dc4..9bcc1d5 100644
--- a/avahi-common/rlist.h
+++ b/avahi-common/rlist.h
@@ -1,8 +1,6 @@
#ifndef foorlistfoo
#define foorlistfoo
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-common/simple-watch.c b/avahi-common/simple-watch.c
index aab71f6..56c2ccb 100644
--- a/avahi-common/simple-watch.c
+++ b/avahi-common/simple-watch.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-common/simple-watch.h b/avahi-common/simple-watch.h
index 20e8f79..72c1905 100644
--- a/avahi-common/simple-watch.h
+++ b/avahi-common/simple-watch.h
@@ -1,8 +1,6 @@
#ifndef foosimplewatchhfoo
#define foosimplewatchhfoo
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-common/strlst-test.c b/avahi-common/strlst-test.c
index b9a7baa..0945b37 100644
--- a/avahi-common/strlst-test.c
+++ b/avahi-common/strlst-test.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-common/strlst.c b/avahi-common/strlst.c
index d179cc0..b861cf8 100644
--- a/avahi-common/strlst.c
+++ b/avahi-common/strlst.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-common/strlst.h b/avahi-common/strlst.h
index 8bf5981..94adcea 100644
--- a/avahi-common/strlst.h
+++ b/avahi-common/strlst.h
@@ -1,8 +1,6 @@
#ifndef footxtlisthfoo
#define footxtlisthfoo
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-common/thread-watch.c b/avahi-common/thread-watch.c
index 4f23608..c0cadeb 100644
--- a/avahi-common/thread-watch.c
+++ b/avahi-common/thread-watch.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-common/thread-watch.h b/avahi-common/thread-watch.h
index 98da293..dec0cf3 100644
--- a/avahi-common/thread-watch.h
+++ b/avahi-common/thread-watch.h
@@ -1,8 +1,6 @@
#ifndef foothreadedwatchhfoo
#define foothreadedwatchhfoo
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-common/timeval-test.c b/avahi-common/timeval-test.c
index 553c37e..387c180 100644
--- a/avahi-common/timeval-test.c
+++ b/avahi-common/timeval-test.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-common/timeval.c b/avahi-common/timeval.c
index 0cfb136..cdb0f09 100644
--- a/avahi-common/timeval.c
+++ b/avahi-common/timeval.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-common/timeval.h b/avahi-common/timeval.h
index 01819be..6470f01 100644
--- a/avahi-common/timeval.h
+++ b/avahi-common/timeval.h
@@ -1,8 +1,6 @@
#ifndef footimevalhfoo
#define footimevalhfoo
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-common/utf8-test.c b/avahi-common/utf8-test.c
index 4fbc50a..d12ed58 100644
--- a/avahi-common/utf8-test.c
+++ b/avahi-common/utf8-test.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-common/utf8.c b/avahi-common/utf8.c
index 0fe42d0..fa6a318 100644
--- a/avahi-common/utf8.c
+++ b/avahi-common/utf8.c
@@ -1,5 +1,3 @@
-/* $Id */
-
/* This file is based on the GLIB utf8 validation functions. The
* original license text follows. */
diff --git a/avahi-common/utf8.h b/avahi-common/utf8.h
index aa2b17a..dc1ce4b 100644
--- a/avahi-common/utf8.h
+++ b/avahi-common/utf8.h
@@ -1,8 +1,6 @@
#ifndef fooutf8hfoo
#define fooutf8hfoo
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-common/watch-test.c b/avahi-common/watch-test.c
index da8e033..6c178ba 100644
--- a/avahi-common/watch-test.c
+++ b/avahi-common/watch-test.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-common/watch.h b/avahi-common/watch.h
index 9b855d1..86e63d3 100644
--- a/avahi-common/watch.h
+++ b/avahi-common/watch.h
@@ -1,8 +1,6 @@
#ifndef foowatchhfoo
#define foowatchhfoo
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-compat-howl/Makefile.am b/avahi-compat-howl/Makefile.am
index e5bc395..bc67142 100644
--- a/avahi-compat-howl/Makefile.am
+++ b/avahi-compat-howl/Makefile.am
@@ -1,5 +1,3 @@
-# $Id$
-
# This file is part of avahi.
#
# avahi is free software; you can redistribute it and/or modify it
diff --git a/avahi-compat-howl/address-test.c b/avahi-compat-howl/address-test.c
index cdb6a6e..d9e152f 100644
--- a/avahi-compat-howl/address-test.c
+++ b/avahi-compat-howl/address-test.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-compat-howl/address.c b/avahi-compat-howl/address.c
index 3805a61..81b6e6b 100644
--- a/avahi-compat-howl/address.c
+++ b/avahi-compat-howl/address.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-compat-howl/browse-domain-test.c b/avahi-compat-howl/browse-domain-test.c
index 6dac23c..b5a4a01 100644
--- a/avahi-compat-howl/browse-domain-test.c
+++ b/avahi-compat-howl/browse-domain-test.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-compat-howl/compat.c b/avahi-compat-howl/compat.c
index 12a82fa..9b8b18c 100644
--- a/avahi-compat-howl/compat.c
+++ b/avahi-compat-howl/compat.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-compat-howl/funcs.txt b/avahi-compat-howl/funcs.txt
index 42fbb71..fad8ebf 100644
--- a/avahi-compat-howl/funcs.txt
+++ b/avahi-compat-howl/funcs.txt
@@ -180,5 +180,3 @@ sw_corby_object_set_channel
sw_text_record_string_iterator_init
sw_text_record_string_iterator_fina
sw_text_record_string_iterator_next
-
-$Id$
diff --git a/avahi-compat-howl/samples/Makefile.am b/avahi-compat-howl/samples/Makefile.am
index bda07b1..5efa19e 100644
--- a/avahi-compat-howl/samples/Makefile.am
+++ b/avahi-compat-howl/samples/Makefile.am
@@ -1,5 +1,3 @@
-# $Id$
-
# This file is part of avahi.
#
# avahi is free software; you can redistribute it and/or modify it
diff --git a/avahi-compat-howl/text-test.c b/avahi-compat-howl/text-test.c
index f1e81e7..66ff58b 100644
--- a/avahi-compat-howl/text-test.c
+++ b/avahi-compat-howl/text-test.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-compat-howl/text.c b/avahi-compat-howl/text.c
index 178ca73..7ef4df3 100644
--- a/avahi-compat-howl/text.c
+++ b/avahi-compat-howl/text.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-compat-howl/unsupported.c b/avahi-compat-howl/unsupported.c
index ba9fc3b..ff440af 100644
--- a/avahi-compat-howl/unsupported.c
+++ b/avahi-compat-howl/unsupported.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-compat-howl/warn.c b/avahi-compat-howl/warn.c
index 6e1715f..235bb59 100644
--- a/avahi-compat-howl/warn.c
+++ b/avahi-compat-howl/warn.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-compat-howl/warn.h b/avahi-compat-howl/warn.h
index 2e30eaf..04bd0ed 100644
--- a/avahi-compat-howl/warn.h
+++ b/avahi-compat-howl/warn.h
@@ -1,8 +1,6 @@
#ifndef foowarnhhowlfoo
#define foowarnhhowlfoo
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-compat-libdns_sd/Makefile.am b/avahi-compat-libdns_sd/Makefile.am
index 1938171..9a66bc0 100644
--- a/avahi-compat-libdns_sd/Makefile.am
+++ b/avahi-compat-libdns_sd/Makefile.am
@@ -1,5 +1,3 @@
-# $Id$
-
# This file is part of avahi.
#
# avahi is free software; you can redistribute it and/or modify it
@@ -66,8 +64,8 @@ null_test_LDADD = $(AM_LDADD) $(PTHREAD_LIBS) $(PTHREAD_CFLAGS) ../avahi-common/
# licensing restrictions.
libdns_sd-test: libdns_sd-test.c libdns_sd.la
- $(LIBTOOL) --mode=compile $(CC) $(AM_CFLAGS) $(PTHREAD_CFLAGS) -o libdns_sd-test.o -c libdns_sd-test.c
- $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(PTHREAD_CFLAGS) -o libdns_sd-test libdns_sd-test.o $(PTHREAD_LIBS) ../avahi-common/libavahi-common.la libdns_sd.la
+ $(LIBTOOL) --mode=compile $(CC) $(AM_CFLAGS) $(PTHREAD_CFLAGS) -o libdns_sd-test.o -c libdns_sd-test.c
+ $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(PTHREAD_CFLAGS) -o libdns_sd-test libdns_sd-test.o $(PTHREAD_LIBS) ../avahi-common/libavahi-common.la libdns_sd.la
CLEANFILES = libdns_sd-test.o libdns_sd-test
diff --git a/avahi-compat-libdns_sd/compat.c b/avahi-compat-libdns_sd/compat.c
index 819b770..360abd7 100644
--- a/avahi-compat-libdns_sd/compat.c
+++ b/avahi-compat-libdns_sd/compat.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-compat-libdns_sd/funcs.txt b/avahi-compat-libdns_sd/funcs.txt
index a584b4e..bf96aa5 100644
--- a/avahi-compat-libdns_sd/funcs.txt
+++ b/avahi-compat-libdns_sd/funcs.txt
@@ -33,5 +33,3 @@ DNSServiceRemoveRecord
-- Unsupported and Irrelevant --
DNSServiceSetDefaultDomainForUser
-
-$Id$
diff --git a/avahi-compat-libdns_sd/null-test.c b/avahi-compat-libdns_sd/null-test.c
index 8accc13..8cfb98f 100644
--- a/avahi-compat-libdns_sd/null-test.c
+++ b/avahi-compat-libdns_sd/null-test.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-compat-libdns_sd/txt-test.c b/avahi-compat-libdns_sd/txt-test.c
index cc220f3..9bf29b4 100644
--- a/avahi-compat-libdns_sd/txt-test.c
+++ b/avahi-compat-libdns_sd/txt-test.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-compat-libdns_sd/txt.c b/avahi-compat-libdns_sd/txt.c
index 74f8a5f..9d6c116 100644
--- a/avahi-compat-libdns_sd/txt.c
+++ b/avahi-compat-libdns_sd/txt.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-compat-libdns_sd/unsupported.c b/avahi-compat-libdns_sd/unsupported.c
index 2a23aed..fe39eb7 100644
--- a/avahi-compat-libdns_sd/unsupported.c
+++ b/avahi-compat-libdns_sd/unsupported.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-compat-libdns_sd/warn.c b/avahi-compat-libdns_sd/warn.c
index 94aa535..b311736 100644
--- a/avahi-compat-libdns_sd/warn.c
+++ b/avahi-compat-libdns_sd/warn.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-compat-libdns_sd/warn.h b/avahi-compat-libdns_sd/warn.h
index 6bd8478..0a8c2ba 100644
--- a/avahi-compat-libdns_sd/warn.h
+++ b/avahi-compat-libdns_sd/warn.h
@@ -1,8 +1,6 @@
#ifndef foowarnhfoo
#define foowarnhfoo
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-core/Makefile.am b/avahi-core/Makefile.am
index 3062cc6..2f09596 100644
--- a/avahi-core/Makefile.am
+++ b/avahi-core/Makefile.am
@@ -1,5 +1,3 @@
-# $Id$
-#
# This file is part of avahi.
#
# avahi is free software; you can redistribute it and/or modify it
diff --git a/avahi-core/addr-util.c b/avahi-core/addr-util.c
index 22a2714..979b1b7 100644
--- a/avahi-core/addr-util.c
+++ b/avahi-core/addr-util.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-core/addr-util.h b/avahi-core/addr-util.h
index b4785d7..66a9422 100644
--- a/avahi-core/addr-util.h
+++ b/avahi-core/addr-util.h
@@ -1,8 +1,6 @@
#ifndef fooaddrutilhfoo
#define fooaddrutilhfoo
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-core/announce.c b/avahi-core/announce.c
index 5a35045..ccdbf15 100644
--- a/avahi-core/announce.c
+++ b/avahi-core/announce.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-core/announce.h b/avahi-core/announce.h
index d50ca63..fd23d8b 100644
--- a/avahi-core/announce.h
+++ b/avahi-core/announce.h
@@ -1,8 +1,6 @@
#ifndef fooannouncehfoo
#define fooannouncehfoo
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-core/avahi-reflector.c b/avahi-core/avahi-reflector.c
index fa178f0..dee1e93 100644
--- a/avahi-core/avahi-reflector.c
+++ b/avahi-core/avahi-reflector.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-core/avahi-test.c b/avahi-core/avahi-test.c
index 8d2d61b..07d7a8d 100644
--- a/avahi-core/avahi-test.c
+++ b/avahi-core/avahi-test.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-core/browse-dns-server.c b/avahi-core/browse-dns-server.c
index 49bb5e5..a51c38f 100644
--- a/avahi-core/browse-dns-server.c
+++ b/avahi-core/browse-dns-server.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-core/browse-domain.c b/avahi-core/browse-domain.c
index 465f85f..9705b2a 100644
--- a/avahi-core/browse-domain.c
+++ b/avahi-core/browse-domain.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-core/browse-service-type.c b/avahi-core/browse-service-type.c
index 408d0b7..6fff071 100644
--- a/avahi-core/browse-service-type.c
+++ b/avahi-core/browse-service-type.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-core/browse-service.c b/avahi-core/browse-service.c
index 87d2690..dde36bc 100644
--- a/avahi-core/browse-service.c
+++ b/avahi-core/browse-service.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-core/browse.c b/avahi-core/browse.c
index f56203f..eabd7ea 100644
--- a/avahi-core/browse.c
+++ b/avahi-core/browse.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-core/browse.h b/avahi-core/browse.h
index 771e593..a0dc207 100644
--- a/avahi-core/browse.h
+++ b/avahi-core/browse.h
@@ -1,8 +1,6 @@
#ifndef foobrowsehfoo
#define foobrowsehfoo
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-core/cache.c b/avahi-core/cache.c
index 3042ff6..c074579 100644
--- a/avahi-core/cache.c
+++ b/avahi-core/cache.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-core/cache.h b/avahi-core/cache.h
index 7477a5b..49ba9b9 100644
--- a/avahi-core/cache.h
+++ b/avahi-core/cache.h
@@ -1,8 +1,6 @@
#ifndef foocachehfoo
#define foocachehfoo
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-core/conformance-test.c b/avahi-core/conformance-test.c
index 30e299d..632f66b 100644
--- a/avahi-core/conformance-test.c
+++ b/avahi-core/conformance-test.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-core/core.h b/avahi-core/core.h
index f3aea9d..28de917 100644
--- a/avahi-core/core.h
+++ b/avahi-core/core.h
@@ -1,8 +1,6 @@
#ifndef foocorehfoo
#define foocorehfoo
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-core/dns-spin-test.c b/avahi-core/dns-spin-test.c
index 8621f9f..f50e691 100644
--- a/avahi-core/dns-spin-test.c
+++ b/avahi-core/dns-spin-test.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-core/dns-srv-rr.h b/avahi-core/dns-srv-rr.h
index b936195..fdd9010 100644
--- a/avahi-core/dns-srv-rr.h
+++ b/avahi-core/dns-srv-rr.h
@@ -1,8 +1,6 @@
#ifndef foodnssrvhfoo
#define foodnssrvhfoo
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-core/dns-test.c b/avahi-core/dns-test.c
index 4c47c3e..ebe2305 100644
--- a/avahi-core/dns-test.c
+++ b/avahi-core/dns-test.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-core/dns.c b/avahi-core/dns.c
index 0228fcb..2fcd91f 100644
--- a/avahi-core/dns.c
+++ b/avahi-core/dns.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-core/dns.h b/avahi-core/dns.h
index 39fb291..52e8d88 100644
--- a/avahi-core/dns.h
+++ b/avahi-core/dns.h
@@ -1,8 +1,6 @@
#ifndef foodnshfoo
#define foodnshfoo
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-core/domain-util.c b/avahi-core/domain-util.c
index 36d68bb..6eed27f 100644
--- a/avahi-core/domain-util.c
+++ b/avahi-core/domain-util.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-core/domain-util.h b/avahi-core/domain-util.h
index 213bb71..082fde6 100644
--- a/avahi-core/domain-util.h
+++ b/avahi-core/domain-util.h
@@ -1,8 +1,6 @@
#ifndef foodomainutilhfoo
#define foodomainutilhfoo
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-core/entry.c b/avahi-core/entry.c
index 6287033..b02964c 100644
--- a/avahi-core/entry.c
+++ b/avahi-core/entry.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-core/fdutil.c b/avahi-core/fdutil.c
index 4beb03d..c294754 100644
--- a/avahi-core/fdutil.c
+++ b/avahi-core/fdutil.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-core/fdutil.h b/avahi-core/fdutil.h
index ea1471d..68607f8 100644
--- a/avahi-core/fdutil.h
+++ b/avahi-core/fdutil.h
@@ -1,8 +1,6 @@
#ifndef foofdutilhfoo
#define foofdutilhfoo
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-core/hashmap-test.c b/avahi-core/hashmap-test.c
index 2d731ee..209d0e5 100644
--- a/avahi-core/hashmap-test.c
+++ b/avahi-core/hashmap-test.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-core/hashmap.c b/avahi-core/hashmap.c
index 32c9c4a..9b55bd3 100644
--- a/avahi-core/hashmap.c
+++ b/avahi-core/hashmap.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-core/hashmap.h b/avahi-core/hashmap.h
index 95efa56..9d7e81f 100644
--- a/avahi-core/hashmap.h
+++ b/avahi-core/hashmap.h
@@ -1,8 +1,6 @@
#ifndef foohashmaphfoo
#define foohashmaphfoo
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-core/iface-linux.c b/avahi-core/iface-linux.c
index 98fdea5..2782697 100644
--- a/avahi-core/iface-linux.c
+++ b/avahi-core/iface-linux.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-core/iface-linux.h b/avahi-core/iface-linux.h
index 5878089..677f86d 100644
--- a/avahi-core/iface-linux.h
+++ b/avahi-core/iface-linux.h
@@ -1,8 +1,6 @@
#ifndef fooifacelinuxhfoo
#define fooifacelinuxhfoo
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-core/iface-pfroute.c b/avahi-core/iface-pfroute.c
index bd91e92..9a2e953 100644
--- a/avahi-core/iface-pfroute.c
+++ b/avahi-core/iface-pfroute.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-core/iface-pfroute.h b/avahi-core/iface-pfroute.h
index e5dab53..3766cb0 100644
--- a/avahi-core/iface-pfroute.h
+++ b/avahi-core/iface-pfroute.h
@@ -1,8 +1,6 @@
#ifndef fooifacepfroutehfoo
#define fooifacepfroutehfoo
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-core/iface.c b/avahi-core/iface.c
index 5fbfc19..0736df4 100644
--- a/avahi-core/iface.c
+++ b/avahi-core/iface.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-core/iface.h b/avahi-core/iface.h
index 9e5dc62..466c16a 100644
--- a/avahi-core/iface.h
+++ b/avahi-core/iface.h
@@ -1,8 +1,6 @@
#ifndef fooifacehfoo
#define fooifacehfoo
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-core/internal.h b/avahi-core/internal.h
index 958890f..a4b10ed 100644
--- a/avahi-core/internal.h
+++ b/avahi-core/internal.h
@@ -1,8 +1,6 @@
#ifndef foointernalhfoo
#define foointernalhfoo
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-core/log.c b/avahi-core/log.c
index 63ed5b5..d110765 100644
--- a/avahi-core/log.c
+++ b/avahi-core/log.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-core/log.h b/avahi-core/log.h
index 3a1711a..878f07a 100644
--- a/avahi-core/log.h
+++ b/avahi-core/log.h
@@ -1,8 +1,6 @@
#ifndef foologhfoo
#define foologhfoo
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-core/lookup.h b/avahi-core/lookup.h
index 435d554..06dec6e 100644
--- a/avahi-core/lookup.h
+++ b/avahi-core/lookup.h
@@ -1,8 +1,6 @@
#ifndef foolookuphfoo
#define foolookuphfoo
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-core/multicast-lookup.c b/avahi-core/multicast-lookup.c
index 75e01f1..75988bf 100644
--- a/avahi-core/multicast-lookup.c
+++ b/avahi-core/multicast-lookup.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-core/multicast-lookup.h b/avahi-core/multicast-lookup.h
index e3e6a85..2707666 100644
--- a/avahi-core/multicast-lookup.h
+++ b/avahi-core/multicast-lookup.h
@@ -1,8 +1,6 @@
#ifndef foomulticastlookuphfoo
#define foomulticastlookuphfoo
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-core/netlink.c b/avahi-core/netlink.c
index d109358..4ded5ec 100644
--- a/avahi-core/netlink.c
+++ b/avahi-core/netlink.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-core/netlink.h b/avahi-core/netlink.h
index 0d0b8a2..9c6eb28 100644
--- a/avahi-core/netlink.h
+++ b/avahi-core/netlink.h
@@ -1,8 +1,6 @@
#ifndef foonetlinkhfoo
#define foonetlinkhfoo
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-core/prioq-test.c b/avahi-core/prioq-test.c
index 38f55fb..6d0fd62 100644
--- a/avahi-core/prioq-test.c
+++ b/avahi-core/prioq-test.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-core/prioq.c b/avahi-core/prioq.c
index 243a410..28b5018 100644
--- a/avahi-core/prioq.c
+++ b/avahi-core/prioq.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-core/prioq.h b/avahi-core/prioq.h
index bf122fb..b3d31eb 100644
--- a/avahi-core/prioq.h
+++ b/avahi-core/prioq.h
@@ -1,8 +1,6 @@
#ifndef fooprioqhfoo
#define fooprioqhfoo
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-core/probe-sched.c b/avahi-core/probe-sched.c
index 15bc6a6..1e63411 100644
--- a/avahi-core/probe-sched.c
+++ b/avahi-core/probe-sched.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-core/probe-sched.h b/avahi-core/probe-sched.h
index bb43399..e47de41 100644
--- a/avahi-core/probe-sched.h
+++ b/avahi-core/probe-sched.h
@@ -1,8 +1,6 @@
#ifndef fooprobeschedhfoo
#define fooprobeschedhfoo
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-core/publish.h b/avahi-core/publish.h
index fde8653..90797de 100644
--- a/avahi-core/publish.h
+++ b/avahi-core/publish.h
@@ -1,8 +1,6 @@
#ifndef foopublishhfoo
#define foopublishhfoo
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-core/querier-test.c b/avahi-core/querier-test.c
index 21fb9ed..e1ce913 100644
--- a/avahi-core/querier-test.c
+++ b/avahi-core/querier-test.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-core/querier.c b/avahi-core/querier.c
index 90eca37..2b1c919 100644
--- a/avahi-core/querier.c
+++ b/avahi-core/querier.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-core/querier.h b/avahi-core/querier.h
index c942aef..6a32a3b 100644
--- a/avahi-core/querier.h
+++ b/avahi-core/querier.h
@@ -1,8 +1,6 @@
#ifndef fooquerierhfoo
#define fooquerierhfoo
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-core/query-sched.c b/avahi-core/query-sched.c
index 5cad11b..ff833f9 100644
--- a/avahi-core/query-sched.c
+++ b/avahi-core/query-sched.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-core/query-sched.h b/avahi-core/query-sched.h
index 1accc05..b45520c 100644
--- a/avahi-core/query-sched.h
+++ b/avahi-core/query-sched.h
@@ -1,8 +1,6 @@
#ifndef fooqueryschedhfoo
#define fooqueryschedhfoo
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-core/resolve-address.c b/avahi-core/resolve-address.c
index 140fc3c..dd4adbc 100644
--- a/avahi-core/resolve-address.c
+++ b/avahi-core/resolve-address.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-core/resolve-host-name.c b/avahi-core/resolve-host-name.c
index 30857c8..08f209b 100644
--- a/avahi-core/resolve-host-name.c
+++ b/avahi-core/resolve-host-name.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-core/resolve-service.c b/avahi-core/resolve-service.c
index 48a6012..3377a50 100644
--- a/avahi-core/resolve-service.c
+++ b/avahi-core/resolve-service.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-core/response-sched.c b/avahi-core/response-sched.c
index 74bb7b0..abac0a1 100644
--- a/avahi-core/response-sched.c
+++ b/avahi-core/response-sched.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-core/response-sched.h b/avahi-core/response-sched.h
index 0fe6acc..548839e 100644
--- a/avahi-core/response-sched.h
+++ b/avahi-core/response-sched.h
@@ -1,8 +1,6 @@
#ifndef fooresponseschedhfoo
#define fooresponseschedhfoo
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-core/rr-util.h b/avahi-core/rr-util.h
index 0fbcf98..0eebc00 100644
--- a/avahi-core/rr-util.h
+++ b/avahi-core/rr-util.h
@@ -1,8 +1,6 @@
#ifndef foorrutilhfoo
#define foorrutilhfoo
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-core/rr.c b/avahi-core/rr.c
index e815a2f..7fa0bee 100644
--- a/avahi-core/rr.c
+++ b/avahi-core/rr.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-core/rr.h b/avahi-core/rr.h
index 94126a6..794b83f 100644
--- a/avahi-core/rr.h
+++ b/avahi-core/rr.h
@@ -1,8 +1,6 @@
#ifndef foorrhfoo
#define foorrhfoo
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-core/rrlist.c b/avahi-core/rrlist.c
index 308ecd1..0a794ab 100644
--- a/avahi-core/rrlist.c
+++ b/avahi-core/rrlist.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-core/rrlist.h b/avahi-core/rrlist.h
index 89bd138..c7b5aba 100644
--- a/avahi-core/rrlist.h
+++ b/avahi-core/rrlist.h
@@ -1,8 +1,6 @@
#ifndef foorrlisthfoo
#define foorrlisthfoo
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-core/server.c b/avahi-core/server.c
index 8955af9..876984c 100644
--- a/avahi-core/server.c
+++ b/avahi-core/server.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-core/socket.c b/avahi-core/socket.c
index f9b90a2..54e492c 100644
--- a/avahi-core/socket.c
+++ b/avahi-core/socket.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-core/socket.h b/avahi-core/socket.h
index 596ab50..92f12d7 100644
--- a/avahi-core/socket.h
+++ b/avahi-core/socket.h
@@ -1,8 +1,6 @@
#ifndef foosockethfoo
#define foosockethfoo
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-core/timeeventq-test.c b/avahi-core/timeeventq-test.c
index 822ef85..d7b2e39 100644
--- a/avahi-core/timeeventq-test.c
+++ b/avahi-core/timeeventq-test.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-core/timeeventq.c b/avahi-core/timeeventq.c
index 6502a59..2799bf2 100644
--- a/avahi-core/timeeventq.c
+++ b/avahi-core/timeeventq.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-core/timeeventq.h b/avahi-core/timeeventq.h
index 05cfe8b..a695b6a 100644
--- a/avahi-core/timeeventq.h
+++ b/avahi-core/timeeventq.h
@@ -1,8 +1,6 @@
#ifndef footimeeventqhfoo
#define footimeeventqhfoo
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-core/update-test.c b/avahi-core/update-test.c
index e623967..feb884a 100644
--- a/avahi-core/update-test.c
+++ b/avahi-core/update-test.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-core/util.c b/avahi-core/util.c
index 09f35f2..21ef94c 100644
--- a/avahi-core/util.c
+++ b/avahi-core/util.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-core/util.h b/avahi-core/util.h
index 8e8ad44..e13c334 100644
--- a/avahi-core/util.h
+++ b/avahi-core/util.h
@@ -1,8 +1,6 @@
#ifndef fooutilhfoo
#define fooutilhfoo
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-core/wide-area.c b/avahi-core/wide-area.c
index 5997d84..d5e64e5 100644
--- a/avahi-core/wide-area.c
+++ b/avahi-core/wide-area.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-core/wide-area.h b/avahi-core/wide-area.h
index 84fa851..b1dc570 100644
--- a/avahi-core/wide-area.h
+++ b/avahi-core/wide-area.h
@@ -1,8 +1,6 @@
#ifndef foowideareahfoo
#define foowideareahfoo
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-daemon/AddressResolver.introspect b/avahi-daemon/AddressResolver.introspect
index 3550ecd..b4250ec 100644
--- a/avahi-daemon/AddressResolver.introspect
+++ b/avahi-daemon/AddressResolver.introspect
@@ -2,8 +2,6 @@
<?xml-stylesheet type="text/xsl" href="introspect.xsl"?>
<!DOCTYPE node SYSTEM "introspect.dtd">
-<!-- $Id$ -->
-
<!--
This file is part of avahi.
diff --git a/avahi-daemon/DomainBrowser.introspect b/avahi-daemon/DomainBrowser.introspect
index 5840060..7338e69 100644
--- a/avahi-daemon/DomainBrowser.introspect
+++ b/avahi-daemon/DomainBrowser.introspect
@@ -2,8 +2,6 @@
<?xml-stylesheet type="text/xsl" href="introspect.xsl"?>
<!DOCTYPE node SYSTEM "introspect.dtd">
-<!-- $Id$ -->
-
<!--
This file is part of avahi.
diff --git a/avahi-daemon/EntryGroup.introspect b/avahi-daemon/EntryGroup.introspect
index e49bbe6..cb56772 100644
--- a/avahi-daemon/EntryGroup.introspect
+++ b/avahi-daemon/EntryGroup.introspect
@@ -1,8 +1,6 @@
<?xml version="1.0" standalone='no'?><!--*-nxml-*-->
<?xml-stylesheet type="text/xsl" href="introspect.xsl"?>
<!DOCTYPE node SYSTEM "introspect.dtd">
-
-<!-- $Id$ -->
<!--
This file is part of avahi.
diff --git a/avahi-daemon/HostNameResolver.introspect b/avahi-daemon/HostNameResolver.introspect
index 9ac2e36..0b43752 100644
--- a/avahi-daemon/HostNameResolver.introspect
+++ b/avahi-daemon/HostNameResolver.introspect
@@ -2,8 +2,6 @@
<?xml-stylesheet type="text/xsl" href="introspect.xsl"?>
<!DOCTYPE node SYSTEM "introspect.dtd">
-<!-- $Id$ -->
-
<!--
This file is part of avahi.
diff --git a/avahi-daemon/Makefile.am b/avahi-daemon/Makefile.am
index c406a62..c21e30f 100644
--- a/avahi-daemon/Makefile.am
+++ b/avahi-daemon/Makefile.am
@@ -1,5 +1,3 @@
-# $Id$
-#
# This file is part of avahi.
#
# avahi is free software; you can redistribute it and/or modify it
diff --git a/avahi-daemon/RecordBrowser.introspect b/avahi-daemon/RecordBrowser.introspect
index 57c1e66..f1755d9 100644
--- a/avahi-daemon/RecordBrowser.introspect
+++ b/avahi-daemon/RecordBrowser.introspect
@@ -2,8 +2,6 @@
<?xml-stylesheet type="text/xsl" href="introspect.xsl"?>
<!DOCTYPE node SYSTEM "introspect.dtd">
-<!-- $Id$ -->
-
<!--
This file is part of avahi.
diff --git a/avahi-daemon/Server.introspect b/avahi-daemon/Server.introspect
index 9d743ba..923e05f 100644
--- a/avahi-daemon/Server.introspect
+++ b/avahi-daemon/Server.introspect
@@ -2,8 +2,6 @@
<?xml-stylesheet type="text/xsl" href="introspect.xsl"?>
<!DOCTYPE node SYSTEM "introspect.dtd">
-<!-- $Id$ -->
-
<!--
This file is part of avahi.
diff --git a/avahi-daemon/ServiceBrowser.introspect b/avahi-daemon/ServiceBrowser.introspect
index 4a7b430..d80298d 100644
--- a/avahi-daemon/ServiceBrowser.introspect
+++ b/avahi-daemon/ServiceBrowser.introspect
@@ -2,11 +2,9 @@
<?xml-stylesheet type="text/xsl" href="introspect.xsl"?>
<!DOCTYPE node SYSTEM "introspect.dtd">
-<!-- $Id$ -->
-
<!--
This file is part of avahi.
-
+
avahi is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as
published by the Free Software Foundation; either version 2 of the
@@ -24,7 +22,7 @@
-->
<node>
-
+
<interface name="org.freedesktop.DBus.Introspectable">
<method name="Introspect">
<arg name="data" type="s" direction="out" />
@@ -34,7 +32,7 @@
<interface name="org.freedesktop.Avahi.ServiceBrowser">
<method name="Free"/>
-
+
<signal name="ItemNew">
<arg name="interface" type="i"/>
<arg name="protocol" type="i"/>
@@ -61,5 +59,5 @@
<signal name="CacheExhausted"/>
- </interface>
+ </interface>
</node>
diff --git a/avahi-daemon/ServiceResolver.introspect b/avahi-daemon/ServiceResolver.introspect
index 2be9347..1b906ba 100644
--- a/avahi-daemon/ServiceResolver.introspect
+++ b/avahi-daemon/ServiceResolver.introspect
@@ -2,8 +2,6 @@
<?xml-stylesheet type="text/xsl" href="introspect.xsl"?>
<!DOCTYPE node SYSTEM "introspect.dtd">
-<!-- $Id$ -->
-
<!--
This file is part of avahi.
diff --git a/avahi-daemon/ServiceTypeBrowser.introspect b/avahi-daemon/ServiceTypeBrowser.introspect
index cb07f24..57c418b 100644
--- a/avahi-daemon/ServiceTypeBrowser.introspect
+++ b/avahi-daemon/ServiceTypeBrowser.introspect
@@ -2,8 +2,6 @@
<?xml-stylesheet type="text/xsl" href="introspect.xsl"?>
<!DOCTYPE node SYSTEM "introspect.dtd">
-<!-- $Id$ -->
-
<!--
This file is part of avahi.
diff --git a/avahi-daemon/avahi-daemon.conf b/avahi-daemon/avahi-daemon.conf
index ad69c73..38f1d49 100644
--- a/avahi-daemon/avahi-daemon.conf
+++ b/avahi-daemon/avahi-daemon.conf
@@ -1,5 +1,3 @@
-# $Id$
-#
# This file is part of avahi.
#
# avahi is free software; you can redistribute it and/or modify it
diff --git a/avahi-daemon/avahi-service.dtd b/avahi-daemon/avahi-service.dtd
index c3c25e2..daf9637 100644
--- a/avahi-daemon/avahi-service.dtd
+++ b/avahi-daemon/avahi-service.dtd
@@ -1,5 +1,3 @@
-<!-- $Id$ -->
-
<!ELEMENT service-group (name,service+)>
<!ATTLIST service-group>
<!ELEMENT name (#PCDATA)>
diff --git a/avahi-daemon/caps.c b/avahi-daemon/caps.c
index c629bc7..0e21acf 100644
--- a/avahi-daemon/caps.c
+++ b/avahi-daemon/caps.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-daemon/caps.h b/avahi-daemon/caps.h
index 660b91c..5119bd0 100644
--- a/avahi-daemon/caps.h
+++ b/avahi-daemon/caps.h
@@ -1,8 +1,6 @@
#ifndef foocapshfoo
#define foocapshfoo
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-daemon/chroot.c b/avahi-daemon/chroot.c
index b796648..4420c41 100644
--- a/avahi-daemon/chroot.c
+++ b/avahi-daemon/chroot.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-daemon/chroot.h b/avahi-daemon/chroot.h
index 0a8c2b6..2828d54 100644
--- a/avahi-daemon/chroot.h
+++ b/avahi-daemon/chroot.h
@@ -1,8 +1,6 @@
#ifndef foochroothelperhfoo
#define foochroothelperhfoo
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-daemon/dbus-async-address-resolver.c b/avahi-daemon/dbus-async-address-resolver.c
index 1e71443..1959841 100644
--- a/avahi-daemon/dbus-async-address-resolver.c
+++ b/avahi-daemon/dbus-async-address-resolver.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-daemon/dbus-async-host-name-resolver.c b/avahi-daemon/dbus-async-host-name-resolver.c
index 4bc9d59..7f8adb6 100644
--- a/avahi-daemon/dbus-async-host-name-resolver.c
+++ b/avahi-daemon/dbus-async-host-name-resolver.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-daemon/dbus-async-service-resolver.c b/avahi-daemon/dbus-async-service-resolver.c
index efb5202..462f9b3 100644
--- a/avahi-daemon/dbus-async-service-resolver.c
+++ b/avahi-daemon/dbus-async-service-resolver.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-daemon/dbus-domain-browser.c b/avahi-daemon/dbus-domain-browser.c
index a42c63e..8c698b0 100644
--- a/avahi-daemon/dbus-domain-browser.c
+++ b/avahi-daemon/dbus-domain-browser.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-daemon/dbus-entry-group.c b/avahi-daemon/dbus-entry-group.c
index 6311a95..b2fb165 100644
--- a/avahi-daemon/dbus-entry-group.c
+++ b/avahi-daemon/dbus-entry-group.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-daemon/dbus-internal.h b/avahi-daemon/dbus-internal.h
index 0727b2f..d721d38 100644
--- a/avahi-daemon/dbus-internal.h
+++ b/avahi-daemon/dbus-internal.h
@@ -1,8 +1,6 @@
#ifndef foodbusinternalhfoo
#define foodbusinternalhfoo
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-daemon/dbus-protocol.c b/avahi-daemon/dbus-protocol.c
index d0cb4ad..283c27b 100644
--- a/avahi-daemon/dbus-protocol.c
+++ b/avahi-daemon/dbus-protocol.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-daemon/dbus-protocol.h b/avahi-daemon/dbus-protocol.h
index 9934d4a..66b2f74 100644
--- a/avahi-daemon/dbus-protocol.h
+++ b/avahi-daemon/dbus-protocol.h
@@ -1,8 +1,6 @@
#ifndef foodbusprotocolhfoo
#define foodbusprotocolhfoo
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-daemon/dbus-record-browser.c b/avahi-daemon/dbus-record-browser.c
index 6c2652a..752510b 100644
--- a/avahi-daemon/dbus-record-browser.c
+++ b/avahi-daemon/dbus-record-browser.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-daemon/dbus-service-browser.c b/avahi-daemon/dbus-service-browser.c
index d59d8f9..39251f5 100644
--- a/avahi-daemon/dbus-service-browser.c
+++ b/avahi-daemon/dbus-service-browser.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-daemon/dbus-service-type-browser.c b/avahi-daemon/dbus-service-type-browser.c
index d2572eb..db7a038 100644
--- a/avahi-daemon/dbus-service-type-browser.c
+++ b/avahi-daemon/dbus-service-type-browser.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-daemon/dbus-sync-address-resolver.c b/avahi-daemon/dbus-sync-address-resolver.c
index fe4a131..c35711b 100644
--- a/avahi-daemon/dbus-sync-address-resolver.c
+++ b/avahi-daemon/dbus-sync-address-resolver.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-daemon/dbus-sync-host-name-resolver.c b/avahi-daemon/dbus-sync-host-name-resolver.c
index 307eebf..16b6451 100644
--- a/avahi-daemon/dbus-sync-host-name-resolver.c
+++ b/avahi-daemon/dbus-sync-host-name-resolver.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-daemon/dbus-sync-service-resolver.c b/avahi-daemon/dbus-sync-service-resolver.c
index df17203..719cbaa 100644
--- a/avahi-daemon/dbus-sync-service-resolver.c
+++ b/avahi-daemon/dbus-sync-service-resolver.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-daemon/dbus-util.c b/avahi-daemon/dbus-util.c
index 9375fed..dc28303 100644
--- a/avahi-daemon/dbus-util.c
+++ b/avahi-daemon/dbus-util.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-daemon/dbus-util.h b/avahi-daemon/dbus-util.h
index cc0fb9b..a513367 100644
--- a/avahi-daemon/dbus-util.h
+++ b/avahi-daemon/dbus-util.h
@@ -1,8 +1,6 @@
#ifndef foodbusutilhfoo
#define foodbusutilhfoo
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-daemon/example.service b/avahi-daemon/example.service
index 7d6c6b8..46db2ae 100644
--- a/avahi-daemon/example.service
+++ b/avahi-daemon/example.service
@@ -1,8 +1,6 @@
<?xml version="1.0" standalone='no'?><!--*-nxml-*-->
<!DOCTYPE service-group SYSTEM "avahi-service.dtd">
-<!-- $Id$ -->
-
<!--
This file is part of avahi.
diff --git a/avahi-daemon/hosts b/avahi-daemon/hosts
index 495daa7..4483340 100644
--- a/avahi-daemon/hosts
+++ b/avahi-daemon/hosts
@@ -1,5 +1,3 @@
-# $Id$
-#
# This file is part of avahi.
#
# avahi is free software; you can redistribute it and/or modify it
diff --git a/avahi-daemon/ini-file-parser-test.c b/avahi-daemon/ini-file-parser-test.c
index b37f496..6ca6641 100644
--- a/avahi-daemon/ini-file-parser-test.c
+++ b/avahi-daemon/ini-file-parser-test.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-daemon/ini-file-parser.c b/avahi-daemon/ini-file-parser.c
index 6746a9b..0a99ce3 100644
--- a/avahi-daemon/ini-file-parser.c
+++ b/avahi-daemon/ini-file-parser.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-daemon/ini-file-parser.h b/avahi-daemon/ini-file-parser.h
index 10108db..dd3aace 100644
--- a/avahi-daemon/ini-file-parser.h
+++ b/avahi-daemon/ini-file-parser.h
@@ -1,8 +1,6 @@
#ifndef fooinifileparserhfoo
#define fooinifileparserhfoo
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-daemon/introspect.xsl b/avahi-daemon/introspect.xsl
index 32a371c..5d68560 100644
--- a/avahi-daemon/introspect.xsl
+++ b/avahi-daemon/introspect.xsl
@@ -19,8 +19,6 @@
Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
-->
-<!-- $Id$ -->
-
<xsl:output method="xml" version="1.0" encoding="iso-8859-15" doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN" doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd" indent="yes"/>
<xsl:template match="/">
diff --git a/avahi-daemon/main.c b/avahi-daemon/main.c
index a32c706..c4983e5 100644
--- a/avahi-daemon/main.c
+++ b/avahi-daemon/main.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-daemon/main.h b/avahi-daemon/main.h
index dff37c1..ef04c2d 100644
--- a/avahi-daemon/main.h
+++ b/avahi-daemon/main.h
@@ -1,8 +1,6 @@
#ifndef foomainhfoo
#define foomainhfoo
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-daemon/setproctitle.c b/avahi-daemon/setproctitle.c
index b9afc0f..aef3555 100644
--- a/avahi-daemon/setproctitle.c
+++ b/avahi-daemon/setproctitle.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-daemon/setproctitle.h b/avahi-daemon/setproctitle.h
index 80c1ef5..3499e2e 100644
--- a/avahi-daemon/setproctitle.h
+++ b/avahi-daemon/setproctitle.h
@@ -1,8 +1,6 @@
#ifndef foosetproctitlehfoo
#define foosetproctitlehfoo
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-daemon/sftp-ssh.service b/avahi-daemon/sftp-ssh.service
index c65535a..f33a3da 100644
--- a/avahi-daemon/sftp-ssh.service
+++ b/avahi-daemon/sftp-ssh.service
@@ -1,11 +1,9 @@
<?xml version="1.0" standalone='no'?><!--*-nxml-*-->
<!DOCTYPE service-group SYSTEM "avahi-service.dtd">
-<!-- $Id$ -->
-
<!--
This file is part of avahi.
-
+
avahi is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as
published by the Free Software Foundation; either version 2 of the
diff --git a/avahi-daemon/simple-protocol.c b/avahi-daemon/simple-protocol.c
index ffe079f..7f75562 100644
--- a/avahi-daemon/simple-protocol.c
+++ b/avahi-daemon/simple-protocol.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-daemon/simple-protocol.h b/avahi-daemon/simple-protocol.h
index 95a8fcd..bcbffc3 100644
--- a/avahi-daemon/simple-protocol.h
+++ b/avahi-daemon/simple-protocol.h
@@ -1,8 +1,6 @@
#ifndef foosimpleprotocolhfoo
#define foosimpleprotocolhfoo
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-daemon/ssh.service b/avahi-daemon/ssh.service
index a493444..c66e0c1 100644
--- a/avahi-daemon/ssh.service
+++ b/avahi-daemon/ssh.service
@@ -1,8 +1,6 @@
<?xml version="1.0" standalone='no'?><!--*-nxml-*-->
<!DOCTYPE service-group SYSTEM "avahi-service.dtd">
-<!-- $Id$ -->
-
<!--
This file is part of avahi.
diff --git a/avahi-daemon/static-hosts.c b/avahi-daemon/static-hosts.c
index 6509840..34f531f 100644
--- a/avahi-daemon/static-hosts.c
+++ b/avahi-daemon/static-hosts.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-daemon/static-hosts.h b/avahi-daemon/static-hosts.h
index 6ac9378..5d63995 100644
--- a/avahi-daemon/static-hosts.h
+++ b/avahi-daemon/static-hosts.h
@@ -1,8 +1,6 @@
#ifndef foostatichostshfoo
#define foostatichostshfoo
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-daemon/static-services.c b/avahi-daemon/static-services.c
index 0c160f2..588ff8a 100644
--- a/avahi-daemon/static-services.c
+++ b/avahi-daemon/static-services.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-daemon/static-services.h b/avahi-daemon/static-services.h
index 2c066d2..62edc36 100644
--- a/avahi-daemon/static-services.h
+++ b/avahi-daemon/static-services.h
@@ -1,8 +1,6 @@
#ifndef foostaticserviceshfoo
#define foostaticserviceshfoo
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-discover-standalone/Makefile.am b/avahi-discover-standalone/Makefile.am
index 133ff4d..1163575 100644
--- a/avahi-discover-standalone/Makefile.am
+++ b/avahi-discover-standalone/Makefile.am
@@ -1,7 +1,5 @@
-# $Id$
-#
# This file is part of avahi.
-#
+#
# avahi is free software; you can redistribute it and/or modify it
# under the terms of the GNU Lesser General Public License as
# published by the Free Software Foundation; either version 2 of the
@@ -48,7 +46,7 @@ avahi_discover_standalone_LDADD = \
interfaces_DATA = $(interfaces)
endif # HAVE_GLIB
-else
+else
if HAVE_PYTHON_DBUS
diff --git a/avahi-discover-standalone/main.c b/avahi-discover-standalone/main.c
index 57e307d..2f000a4 100644
--- a/avahi-discover-standalone/main.c
+++ b/avahi-discover-standalone/main.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-dnsconfd/Makefile.am b/avahi-dnsconfd/Makefile.am
index d358734..dddf99e 100644
--- a/avahi-dnsconfd/Makefile.am
+++ b/avahi-dnsconfd/Makefile.am
@@ -1,7 +1,5 @@
-# $Id$
-#
# This file is part of avahi.
-#
+#
# avahi is free software; you can redistribute it and/or modify it
# under the terms of the GNU Lesser General Public License as
# published by the Free Software Foundation; either version 2 of the
@@ -33,7 +31,7 @@ AM_CFLAGS+='-DDEBUG_TRAP=__asm__("int $$3")'
sbin_PROGRAMS = avahi-dnsconfd
-avahi_dnsconfd_SOURCES = main.c
+avahi_dnsconfd_SOURCES = main.c
avahi_dnsconfd_CFLAGS = $(AM_CFLAGS) $(LIBDAEMON_CFLAGS)
avahi_dnsconfd_LDADD = $(AM_LDADD) ../avahi-common/libavahi-common.la $(LIBDAEMON_LIBS)
diff --git a/avahi-dnsconfd/avahi-dnsconfd.action b/avahi-dnsconfd/avahi-dnsconfd.action
index f7d3aa4..f0ace51 100755
--- a/avahi-dnsconfd/avahi-dnsconfd.action
+++ b/avahi-dnsconfd/avahi-dnsconfd.action
@@ -1,7 +1,5 @@
#!/bin/sh
-# $Id$
-#
# This file is part of avahi.
#
# avahi is free software; you can redistribute it and/or modify it
diff --git a/avahi-dnsconfd/main.c b/avahi-dnsconfd/main.c
index 4002193..6ae6c3a 100644
--- a/avahi-dnsconfd/main.c
+++ b/avahi-dnsconfd/main.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-glib/Makefile.am b/avahi-glib/Makefile.am
index 12aa6f9..b5d5fba 100644
--- a/avahi-glib/Makefile.am
+++ b/avahi-glib/Makefile.am
@@ -1,5 +1,3 @@
-# $Id$
-#
# This file is part of avahi.
#
# avahi is free software; you can redistribute it and/or modify it
diff --git a/avahi-glib/glib-malloc.c b/avahi-glib/glib-malloc.c
index 5c6a02e..20ac1d1 100644
--- a/avahi-glib/glib-malloc.c
+++ b/avahi-glib/glib-malloc.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-glib/glib-malloc.h b/avahi-glib/glib-malloc.h
index 391d274..8b189d2 100644
--- a/avahi-glib/glib-malloc.h
+++ b/avahi-glib/glib-malloc.h
@@ -1,8 +1,6 @@
#ifndef fooglibmallochfoo
#define fooglibmallochfoo
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-glib/glib-watch-test.c b/avahi-glib/glib-watch-test.c
index bd7d9ac..53c6683 100644
--- a/avahi-glib/glib-watch-test.c
+++ b/avahi-glib/glib-watch-test.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-glib/glib-watch.c b/avahi-glib/glib-watch.c
index 72a778b..5b60bbc 100644
--- a/avahi-glib/glib-watch.c
+++ b/avahi-glib/glib-watch.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-glib/glib-watch.h b/avahi-glib/glib-watch.h
index cd8cbaa..ffc3aac 100644
--- a/avahi-glib/glib-watch.h
+++ b/avahi-glib/glib-watch.h
@@ -1,8 +1,6 @@
#ifndef fooglibwatchhfoo
#define fooglibwatchhfoo
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-gobject/Makefile.am b/avahi-gobject/Makefile.am
index 93ca2f3..bfb3393 100644
--- a/avahi-gobject/Makefile.am
+++ b/avahi-gobject/Makefile.am
@@ -1,5 +1,3 @@
-# $Id$
-#
# This file is part of avahi.
#
# avahi is free software; you can redistribute it and/or modify it
diff --git a/avahi-python/Makefile.am b/avahi-python/Makefile.am
index d7febd6..7381a48 100644
--- a/avahi-python/Makefile.am
+++ b/avahi-python/Makefile.am
@@ -1,5 +1,3 @@
-# $Id$
-
# This file is part of avahi.
#
# avahi is free software; you can redistribute it and/or modify it
diff --git a/avahi-python/avahi-bookmarks.in b/avahi-python/avahi-bookmarks.in
index 172abb3..dea7bef 100755
--- a/avahi-python/avahi-bookmarks.in
+++ b/avahi-python/avahi-bookmarks.in
@@ -1,7 +1,5 @@
#!@PYTHON@
# -*-python-*-
-# $Id$
-
# This file is part of avahi.
#
# avahi is free software; you can redistribute it and/or modify it
diff --git a/avahi-python/avahi-discover/Makefile.am b/avahi-python/avahi-discover/Makefile.am
index a493a25..454fd57 100644
--- a/avahi-python/avahi-discover/Makefile.am
+++ b/avahi-python/avahi-discover/Makefile.am
@@ -1,5 +1,3 @@
-# $Id$
-
# This file is part of avahi.
#
# avahi is free software; you can redistribute it and/or modify it
@@ -31,7 +29,7 @@ if HAVE_PYGTK
pythonscripts =
desktopdir = $(datadir)/applications
-desktop_DATA =
+desktop_DATA =
avahi_discoverdir = $(pythondir)/avahi_discover
avahi_discover_PYTHON =
diff --git a/avahi-python/avahi-discover/__init__.py b/avahi-python/avahi-discover/__init__.py
index b2cd7d8..6f3ec7f 100755
--- a/avahi-python/avahi-discover/__init__.py
+++ b/avahi-python/avahi-discover/__init__.py
@@ -1,7 +1,5 @@
#!@PYTHON@
# -*-python-*-
-# $Id$
-
# This file is part of avahi.
#
# avahi is free software; you can redistribute it and/or modify it
diff --git a/avahi-python/avahi-discover/avahi-discover.in b/avahi-python/avahi-discover/avahi-discover.in
index 6c22f45..98e1b41 100755
--- a/avahi-python/avahi-discover/avahi-discover.in
+++ b/avahi-python/avahi-discover/avahi-discover.in
@@ -1,7 +1,5 @@
#!@PYTHON@
# -*-python-*-
-# $Id$
-
# This file is part of avahi.
#
# avahi is free software; you can redistribute it and/or modify it
diff --git a/avahi-python/avahi/Makefile.am b/avahi-python/avahi/Makefile.am
index b168682..907c5eb 100644
--- a/avahi-python/avahi/Makefile.am
+++ b/avahi-python/avahi/Makefile.am
@@ -1,5 +1,3 @@
-# $Id$
-
# This file is part of avahi.
#
# avahi is free software; you can redistribute it and/or modify it
diff --git a/avahi-python/avahi/ServiceTypeDatabase.py.in b/avahi-python/avahi/ServiceTypeDatabase.py.in
index d134510..8a77a31 100644
--- a/avahi-python/avahi/ServiceTypeDatabase.py.in
+++ b/avahi-python/avahi/ServiceTypeDatabase.py.in
@@ -1,7 +1,5 @@
#!@PYTHON@
# -*-python-*-
-# $Id$
-
# This file is part of avahi.
#
# avahi is free software; you can redistribute it and/or modify it
diff --git a/avahi-python/avahi/__init__.py b/avahi-python/avahi/__init__.py
index 81e2754..7b45029 100644
--- a/avahi-python/avahi/__init__.py
+++ b/avahi-python/avahi/__init__.py
@@ -1,5 +1,3 @@
-# $Id$
-
# This file is part of avahi.
#
# avahi is free software; you can redistribute it and/or modify it
diff --git a/avahi-qt/Makefile.am b/avahi-qt/Makefile.am
index 004e2d3..64356a5 100644
--- a/avahi-qt/Makefile.am
+++ b/avahi-qt/Makefile.am
@@ -1,5 +1,3 @@
-# $Id$
-
# This file is part of avahi.
#
# avahi is free software; you can redistribute it and/or modify it
@@ -19,15 +17,15 @@
AM_CFLAGS=-I$(top_srcdir)
-lib_LTLIBRARIES =
-BUILT_SOURCES =
+lib_LTLIBRARIES =
+BUILT_SOURCES =
if HAVE_QT3
avahiqt3includedir=$(includedir)/avahi-qt3
avahiqt3include_HEADERS = \
- qt-watch.h
+ qt-watch.h
lib_LTLIBRARIES += \
libavahi-qt3.la
@@ -35,7 +33,7 @@ lib_LTLIBRARIES += \
BUILT_SOURCES += qt-watch.moc3
libavahi_qt3_la_SOURCES = \
- qt-watch.cpp
+ qt-watch.cpp
qt-watch.moc3: qt-watch.cpp
$(AM_V_GEN)$(MOC_QT3) $^ > $@
@@ -49,7 +47,7 @@ if HAVE_QT4
avahiqt4includedir=$(includedir)/avahi-qt4
avahiqt4include_HEADERS = \
- qt-watch.h
+ qt-watch.h
lib_LTLIBRARIES += \
libavahi-qt4.la
@@ -57,7 +55,7 @@ lib_LTLIBRARIES += \
BUILT_SOURCES += qt-watch.moc4
libavahi_qt4_la_SOURCES = \
- qt-watch.cpp
+ qt-watch.cpp
qt-watch.moc4: qt-watch.cpp
$(AM_V_GEN)$(MOC_QT4) $^ > $@
diff --git a/avahi-qt/qt-watch.cpp b/avahi-qt/qt-watch.cpp
index f29b517..dac9dcc 100644
--- a/avahi-qt/qt-watch.cpp
+++ b/avahi-qt/qt-watch.cpp
@@ -1,5 +1,3 @@
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-qt/qt-watch.h b/avahi-qt/qt-watch.h
index 6de2c0d..cd7130d 100644
--- a/avahi-qt/qt-watch.h
+++ b/avahi-qt/qt-watch.h
@@ -1,8 +1,6 @@
#ifndef QAVAHI_H
#define QAVAHI_H
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-sharp/AddressResolver.cs b/avahi-sharp/AddressResolver.cs
index 3025102..c11e97d 100644
--- a/avahi-sharp/AddressResolver.cs
+++ b/avahi-sharp/AddressResolver.cs
@@ -1,5 +1,3 @@
-/* $Id$ */
-
/***
This file is part of avahi.
@@ -55,7 +53,7 @@ namespace Avahi
this.address = address;
}
}
-
+
public class AddressResolver : ResolverBase, IDisposable
{
private IntPtr handle;
@@ -71,7 +69,7 @@ namespace Avahi
private ArrayList foundListeners = new ArrayList ();
private ArrayList timeoutListeners = new ArrayList ();
-
+
[DllImport ("avahi-client")]
private static extern IntPtr avahi_address_resolver_new (IntPtr client, int iface, Protocol proto,
IntPtr address, LookupFlags flags,
@@ -92,7 +90,7 @@ namespace Avahi
Stop (false);
}
}
-
+
public event EventHandler Timeout
{
add {
@@ -155,7 +153,7 @@ namespace Avahi
if (handle == IntPtr.Zero)
client.ThrowError ();
}
-
+
Utility.Free (addrPtr);
}
diff --git a/avahi-sharp/AssemblyInfo.cs b/avahi-sharp/AssemblyInfo.cs
index f8dd4ed..aff09d9 100644
--- a/avahi-sharp/AssemblyInfo.cs
+++ b/avahi-sharp/AssemblyInfo.cs
@@ -1,5 +1,3 @@
-/* $Id$ */
-
/***
This file is part of avahi.
@@ -23,7 +21,7 @@ using System.Reflection;
using System.Runtime.CompilerServices;
//
-// General Information about an assembly is controlled through the following
+// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
//
@@ -34,17 +32,17 @@ using System.Runtime.CompilerServices;
[assembly: AssemblyProduct("")]
[assembly: AssemblyCopyright("(C) 2005 James Willcox <snorp@snorp.net>")]
[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
+[assembly: AssemblyCulture("")]
//
// Version information for an assembly consists of the following four values:
//
// Major Version
-// Minor Version
+// Minor Version
// Build Number
// Revision
//
-// You can specify all the values or you can default the Revision and Build Numbers
+// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
[assembly: AssemblyVersion("1.0.0")]
diff --git a/avahi-sharp/AvahiTest.cs b/avahi-sharp/AvahiTest.cs
index ba4d59b..6ccfd57 100644
--- a/avahi-sharp/AvahiTest.cs
+++ b/avahi-sharp/AvahiTest.cs
@@ -1,5 +1,3 @@
-/* $Id$ */
-
/***
This file is part of avahi.
@@ -51,7 +49,7 @@ public class AvahiTest {
if (args.State == EntryGroupState.Established) {
DomainBrowser browser = new DomainBrowser (client);
objects.Add (browser);
-
+
browser.DomainAdded += OnDomainAdded;
}
}
@@ -66,7 +64,7 @@ public class AvahiTest {
{
ServiceTypeBrowser stb = new ServiceTypeBrowser (client, domain);
objects.Add (stb);
-
+
stb.CacheExhausted += OnCacheExhausted;
stb.ServiceTypeAdded += OnServiceTypeAdded;
}
@@ -81,7 +79,7 @@ public class AvahiTest {
Console.WriteLine ("Got service type: " + args.ServiceType.ServiceType);
ServiceBrowser sb = new ServiceBrowser (client, args.ServiceType.ServiceType, args.ServiceType.Domain);
objects.Add (sb);
-
+
sb.ServiceAdded += OnServiceAdded;
}
@@ -96,7 +94,7 @@ public class AvahiTest {
private static void OnServiceResolved (object o, ServiceInfoArgs args)
{
objects.Remove (o);
-
+
Console.WriteLine ("Service '{0}' at {1}:{2}", args.Service.Name, args.Service.HostName, args.Service.Port);
foreach (byte[] bytes in args.Service.Text) {
Console.WriteLine ("Text: " + Encoding.UTF8.GetString (bytes));
@@ -117,11 +115,11 @@ public class AvahiTest {
private static void OnAddressResolved (object o, HostAddressArgs args)
{
objects.Remove (o);
-
+
Console.WriteLine ("Resolved {0} to {1}", args.Address, args.Host);
HostNameResolver hr = new HostNameResolver (client, args.Host);
objects.Add (hr);
-
+
hr.Found += OnHostNameResolved;
}
diff --git a/avahi-sharp/BrowserBase.cs b/avahi-sharp/BrowserBase.cs
index 0a1e3a7..3af0086 100644
--- a/avahi-sharp/BrowserBase.cs
+++ b/avahi-sharp/BrowserBase.cs
@@ -1,5 +1,3 @@
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-sharp/Client.cs b/avahi-sharp/Client.cs
index 02763d4..b3815b3 100644
--- a/avahi-sharp/Client.cs
+++ b/avahi-sharp/Client.cs
@@ -1,5 +1,3 @@
-/* $Id$ */
-
/***
This file is part of avahi.
@@ -35,7 +33,7 @@ namespace Avahi
Found,
Failure
}
-
+
internal enum BrowserEvent {
Added,
Removed,
@@ -70,7 +68,7 @@ namespace Avahi
this.error = error;
}
}
-
+
public enum Protocol {
Unspecified = -1,
IPv4 = 0,
@@ -83,7 +81,7 @@ namespace Avahi
Running,
Collision
}
-
+
public enum ClientState {
Registering = ServerState.Registering,
Running = ServerState.Running,
@@ -117,7 +115,7 @@ namespace Avahi
IgnoreUserConfig = 1,
NoFail = 2
}
-
+
public class Client : IDisposable
{
private IntPtr handle;
@@ -151,7 +149,7 @@ namespace Avahi
[DllImport ("avahi-client")]
private static extern int avahi_client_errno (IntPtr handle);
-
+
[DllImport ("avahi-common")]
private static extern IntPtr avahi_simple_poll_new ();
@@ -192,7 +190,7 @@ namespace Avahi
{
get { return handle; }
}
-
+
public string Version
{
get {
@@ -292,7 +290,7 @@ namespace Avahi
avahi_simple_poll_quit (spoll);
Monitor.Wait (this);
-
+
avahi_simple_poll_free (spoll);
}
}
@@ -326,7 +324,7 @@ namespace Avahi
IntPtr namePtr = Stdlib.malloc ((ulong) len);
IntPtr typePtr = Stdlib.malloc ((ulong) len);
IntPtr domainPtr = Stdlib.malloc ((ulong) len);
-
+
int ret = avahi_service_name_split (Utility.StringToBytes (service), namePtr, len, typePtr, len,
domainPtr, len);
@@ -334,7 +332,7 @@ namespace Avahi
Utility.Free (namePtr);
Utility.Free (typePtr);
Utility.Free (domainPtr);
-
+
name = null;
type = null;
domain = null;
@@ -357,7 +355,7 @@ namespace Avahi
if (error != ErrorCode.Ok)
throw new ClientException (error);
}
-
+
private void OnClientCallback (IntPtr client, ClientState state, IntPtr userData)
{
if (StateChanged != null)
diff --git a/avahi-sharp/ClientException.cs b/avahi-sharp/ClientException.cs
index fadcce9..0f511ac 100644
--- a/avahi-sharp/ClientException.cs
+++ b/avahi-sharp/ClientException.cs
@@ -1,5 +1,3 @@
-/* $Id$ */
-
/***
This file is part of avahi.
@@ -95,14 +93,14 @@ namespace Avahi
this.code = code;
}
}
-
+
public class ClientException : ApplicationException
{
private ErrorCode code;
[DllImport ("avahi-common")]
private static extern IntPtr avahi_strerror (ErrorCode code);
-
+
public ErrorCode ErrorCode
{
get { return code; }
@@ -110,7 +108,7 @@ namespace Avahi
internal ClientException (int code) : this ((ErrorCode) code) {
}
-
+
internal ClientException (ErrorCode code) : base (GetErrorString (code))
{
this.code = code;
diff --git a/avahi-sharp/DomainBrowser.cs b/avahi-sharp/DomainBrowser.cs
index 50da54e..a1165dc 100644
--- a/avahi-sharp/DomainBrowser.cs
+++ b/avahi-sharp/DomainBrowser.cs
@@ -1,5 +1,3 @@
-/* $Id$ */
-
/***
This file is part of avahi.
@@ -61,7 +59,7 @@ namespace Avahi
}
public delegate void DomainInfoHandler (object o, DomainInfoArgs args);
-
+
public class DomainBrowser : BrowserBase, IDisposable
{
private IntPtr handle;
@@ -76,7 +74,7 @@ namespace Avahi
private ArrayList addListeners = new ArrayList ();
private ArrayList removeListeners = new ArrayList ();
-
+
[DllImport ("avahi-client")]
private static extern IntPtr avahi_domain_browser_new (IntPtr client, int iface, int proto,
byte[] domain, int btype, LookupFlags flags,
@@ -97,7 +95,7 @@ namespace Avahi
Stop (false);
}
}
-
+
public event DomainInfoHandler DomainRemoved
{
add {
@@ -118,7 +116,7 @@ namespace Avahi
public DomainBrowser (Client client) : this (client, -1, Protocol.Unspecified, client.DomainName,
DomainBrowserType.Browse, LookupFlags.None) {
}
-
+
public DomainBrowser (Client client, int iface, Protocol proto, string domain,
DomainBrowserType btype, LookupFlags flags)
{
diff --git a/avahi-sharp/EntryGroup.cs b/avahi-sharp/EntryGroup.cs
index 02be643..24abae4 100644
--- a/avahi-sharp/EntryGroup.cs
+++ b/avahi-sharp/EntryGroup.cs
@@ -1,5 +1,3 @@
-/* $Id$ */
-
/***
This file is part of avahi.
@@ -41,7 +39,7 @@ namespace Avahi
UseWideArea = 128,
UseMulticast = 256
}
-
+
public enum EntryGroupState {
Uncommited,
Registering,
@@ -58,7 +56,7 @@ namespace Avahi
{
get { return state; }
}
-
+
public EntryGroupStateArgs (EntryGroupState state)
{
this.state = state;
@@ -67,13 +65,13 @@ namespace Avahi
internal delegate void EntryGroupCallback (IntPtr group, EntryGroupState state, IntPtr userdata);
public delegate void EntryGroupStateHandler (object o, EntryGroupStateArgs args);
-
+
public class EntryGroup : IDisposable
{
private Client client;
private IntPtr handle;
private EntryGroupCallback cb;
-
+
[DllImport ("avahi-client")]
private static extern IntPtr avahi_entry_group_new (IntPtr client, EntryGroupCallback cb, IntPtr userdata);
@@ -114,7 +112,7 @@ namespace Avahi
private static extern int avahi_entry_group_add_record (IntPtr group, int iface, Protocol proto,
PublishFlags flags, byte[] name, RecordClass clazz,
RecordType type, uint ttl, byte[] rdata, int size);
-
+
[DllImport ("avahi-client")]
private static extern void avahi_entry_group_free (IntPtr group);
@@ -131,7 +129,7 @@ namespace Avahi
private static extern IntPtr avahi_alternative_service_name (byte[] name);
public event EntryGroupStateHandler StateChanged;
-
+
public EntryGroupState State
{
get {
@@ -149,7 +147,7 @@ namespace Avahi
}
}
}
-
+
public EntryGroup (Client client)
{
this.client = client;
@@ -245,9 +243,9 @@ namespace Avahi
Utility.StringToBytes (domain),
Utility.StringToBytes (host), port, list);
}
-
+
avahi_string_list_free (list);
-
+
if (ret < 0) {
client.ThrowError ();
}
@@ -285,7 +283,7 @@ namespace Avahi
UpdateService (iface, proto, flags, name, type, domain, list);
}
-
+
private void UpdateService (int iface, Protocol proto, PublishFlags flags, string name, string type,
string domain, IntPtr list)
{
diff --git a/avahi-sharp/HostNameResolver.cs b/avahi-sharp/HostNameResolver.cs
index 81305fd..b9fe7f4 100644
--- a/avahi-sharp/HostNameResolver.cs
+++ b/avahi-sharp/HostNameResolver.cs
@@ -1,5 +1,3 @@
-/* $Id$ */
-
/***
This file is part of avahi.
@@ -49,7 +47,7 @@ namespace Avahi
private ArrayList foundListeners = new ArrayList ();
private ArrayList timeoutListeners = new ArrayList ();
-
+
[DllImport ("avahi-client")]
private static extern IntPtr avahi_host_name_resolver_new (IntPtr client, int iface, Protocol proto,
byte[] hostname, Protocol aproto, LookupFlags flags,
@@ -69,7 +67,7 @@ namespace Avahi
Stop (false);
}
}
-
+
public event EventHandler Timeout
{
add {
diff --git a/avahi-sharp/Makefile.am b/avahi-sharp/Makefile.am
index d8f1fab..3fa10ab 100644
--- a/avahi-sharp/Makefile.am
+++ b/avahi-sharp/Makefile.am
@@ -1,5 +1,3 @@
-# $Id$
-
# This file is part of avahi.
#
# avahi is free software; you can redistribute it and/or modify it
diff --git a/avahi-sharp/RecordBrowser.cs b/avahi-sharp/RecordBrowser.cs
index f65f8ac..ba5a983 100644
--- a/avahi-sharp/RecordBrowser.cs
+++ b/avahi-sharp/RecordBrowser.cs
@@ -1,5 +1,3 @@
-/* $Id: ServiceBrowser.cs 635 2005-09-26 03:57:30Z snorp $ */
-
/***
This file is part of avahi.
@@ -29,7 +27,7 @@ namespace Avahi
{
public delegate void RecordInfoHandler (object o, RecordInfoArgs args);
-
+
internal delegate void RecordBrowserCallback (IntPtr browser, int iface, Protocol proto, BrowserEvent bevent,
IntPtr name, ushort clazz, ushort type, IntPtr rdata, int size,
LookupResultFlags flags, IntPtr userdata);
@@ -50,7 +48,7 @@ namespace Avahi
Aaa = 28,
Srv = 33
}
-
+
public struct RecordInfo
{
public int NetworkInterface;
@@ -91,7 +89,7 @@ namespace Avahi
private ArrayList addListeners = new ArrayList ();
private ArrayList removeListeners = new ArrayList ();
-
+
[DllImport ("avahi-client")]
private static extern IntPtr avahi_record_browser_new (IntPtr client, int iface, Protocol proto,
byte[] name, ushort clazz, ushort type,
@@ -113,7 +111,7 @@ namespace Avahi
Stop (false);
}
}
-
+
public event RecordInfoHandler RecordRemoved
{
add {
@@ -135,7 +133,7 @@ namespace Avahi
this (client, -1, Protocol.Unspecified, name, RecordClass.In, type, LookupFlags.None)
{
}
-
+
public RecordBrowser (Client client, int iface, Protocol proto, string name, RecordClass clazz,
RecordType type, LookupFlags flags)
{
@@ -178,7 +176,7 @@ namespace Avahi
{
if (client.Handle != IntPtr.Zero && handle != IntPtr.Zero &&
(force || (addListeners.Count == 0 && removeListeners.Count == 0))) {
-
+
lock (client) {
avahi_record_browser_free (handle);
handle = IntPtr.Zero;
diff --git a/avahi-sharp/ResolverBase.cs b/avahi-sharp/ResolverBase.cs
index 0a5a2a8..d546aba 100644
--- a/avahi-sharp/ResolverBase.cs
+++ b/avahi-sharp/ResolverBase.cs
@@ -1,5 +1,3 @@
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-sharp/ServiceBrowser.cs b/avahi-sharp/ServiceBrowser.cs
index 520e339..5c39ad4 100644
--- a/avahi-sharp/ServiceBrowser.cs
+++ b/avahi-sharp/ServiceBrowser.cs
@@ -1,5 +1,3 @@
-/* $Id$ */
-
/***
This file is part of avahi.
@@ -30,7 +28,7 @@ namespace Avahi
internal delegate void ServiceBrowserCallback (IntPtr browser, int iface, Protocol proto, BrowserEvent bevent,
IntPtr name, IntPtr type, IntPtr domain, LookupResultFlags flags,
IntPtr userdata);
-
+
public struct ServiceInfo
{
public int NetworkInterface;
@@ -63,7 +61,7 @@ namespace Avahi
}
public delegate void ServiceInfoHandler (object o, ServiceInfoArgs args);
-
+
public class ServiceBrowser : BrowserBase, IDisposable
{
private IntPtr handle;
@@ -78,7 +76,7 @@ namespace Avahi
private ArrayList addListeners = new ArrayList ();
private ArrayList removeListeners = new ArrayList ();
-
+
[DllImport ("avahi-client")]
private static extern IntPtr avahi_service_browser_new (IntPtr client, int iface, int proto, byte[] type,
byte[] domain, LookupFlags flags,
@@ -99,7 +97,7 @@ namespace Avahi
Stop (false);
}
}
-
+
public event ServiceInfoHandler ServiceRemoved
{
add {
@@ -120,12 +118,12 @@ namespace Avahi
public ServiceBrowser (Client client, string type) : this (client, type, client.DomainName)
{
}
-
+
public ServiceBrowser (Client client, string type, string domain) : this (client, -1, Protocol.Unspecified,
type, domain, LookupFlags.None)
{
}
-
+
public ServiceBrowser (Client client, int iface, Protocol proto, string type, string domain, LookupFlags flags)
{
this.client = client;
@@ -167,7 +165,7 @@ namespace Avahi
{
if (client.Handle != IntPtr.Zero && handle != IntPtr.Zero &&
(force || (addListeners.Count == 0 && removeListeners.Count == 0))) {
-
+
lock (client) {
avahi_service_browser_free (handle);
handle = IntPtr.Zero;
diff --git a/avahi-sharp/ServiceResolver.cs b/avahi-sharp/ServiceResolver.cs
index a32efca..7f8901a 100644
--- a/avahi-sharp/ServiceResolver.cs
+++ b/avahi-sharp/ServiceResolver.cs
@@ -1,5 +1,3 @@
-/* $Id$ */
-
/***
This file is part of avahi.
@@ -51,7 +49,7 @@ namespace Avahi
private ArrayList foundListeners = new ArrayList ();
private ArrayList timeoutListeners = new ArrayList ();
-
+
[DllImport ("avahi-client")]
private static extern IntPtr avahi_service_resolver_new (IntPtr client, int iface, Protocol proto,
byte[] name, byte[] type, byte[] domain,
@@ -82,7 +80,7 @@ namespace Avahi
Stop (false);
}
}
-
+
public event EventHandler Timeout
{
add {
@@ -115,7 +113,7 @@ namespace Avahi
GetLookupFlags (service.Flags))
{
}
-
+
public ServiceResolver (Client client, int iface, Protocol proto, string name,
string type, string domain, Protocol aproto, LookupFlags flags)
{
diff --git a/avahi-sharp/ServiceTypeBrowser.cs b/avahi-sharp/ServiceTypeBrowser.cs
index 3796d60..e1356d0 100644
--- a/avahi-sharp/ServiceTypeBrowser.cs
+++ b/avahi-sharp/ServiceTypeBrowser.cs
@@ -1,5 +1,3 @@
-/* $Id$ */
-
/***
This file is part of avahi.
@@ -29,7 +27,7 @@ namespace Avahi
internal delegate void ServiceTypeBrowserCallback (IntPtr browser, int iface, Protocol proto, BrowserEvent bevent,
IntPtr type, IntPtr domain, LookupResultFlags flags,
IntPtr userdata);
-
+
public struct ServiceTypeInfo
{
public int NetworkInterface;
@@ -55,7 +53,7 @@ namespace Avahi
}
public delegate void ServiceTypeInfoHandler (object o, ServiceTypeInfoArgs args);
-
+
public class ServiceTypeBrowser : BrowserBase, IDisposable
{
private IntPtr handle;
@@ -69,7 +67,7 @@ namespace Avahi
private ArrayList addListeners = new ArrayList ();
private ArrayList removeListeners = new ArrayList ();
-
+
[DllImport ("avahi-client")]
private static extern IntPtr avahi_service_type_browser_new (IntPtr client, int iface, int proto,
byte[] domain, LookupFlags flags,
@@ -90,7 +88,7 @@ namespace Avahi
Stop (false);
}
}
-
+
public event ServiceTypeInfoHandler ServiceTypeRemoved
{
add {
diff --git a/avahi-sharp/Utility.cs b/avahi-sharp/Utility.cs
index 9081b01..a1d0a66 100644
--- a/avahi-sharp/Utility.cs
+++ b/avahi-sharp/Utility.cs
@@ -1,5 +1,3 @@
-/* $Id$ */
-
/***
This file is part of avahi.
@@ -45,7 +43,7 @@ namespace Avahi
{
if (ptr == IntPtr.Zero)
return null;
-
+
int len = strlen (ptr);
byte[] bytes = new byte[len];
Marshal.Copy (ptr, bytes, 0, len);
@@ -56,7 +54,7 @@ namespace Avahi
{
if (ptr == IntPtr.Zero)
return null;
-
+
string ret = PtrToString (ptr);
Free (ptr);
return ret;
@@ -100,7 +98,7 @@ namespace Avahi
public static IPAddress PtrToAddress (IntPtr ptr)
{
IPAddress address = null;
-
+
if (ptr != IntPtr.Zero) {
IntPtr buf = Stdlib.malloc (256);
IntPtr addrPtr = avahi_address_snprint (buf, 256, ptr);
diff --git a/avahi-ui-sharp/Makefile.am b/avahi-ui-sharp/Makefile.am
index e8cf23f..28ea64f 100644
--- a/avahi-ui-sharp/Makefile.am
+++ b/avahi-ui-sharp/Makefile.am
@@ -1,5 +1,3 @@
-# $Id: Makefile.am 1251 2006-08-21 23:31:59Z lennart $
-
# This file is part of avahi.
#
# avahi is free software; you can redistribute it and/or modify it
diff --git a/avahi-ui-sharp/ServiceDialog.cs b/avahi-ui-sharp/ServiceDialog.cs
index e0306e1..31f7479 100644
--- a/avahi-ui-sharp/ServiceDialog.cs
+++ b/avahi-ui-sharp/ServiceDialog.cs
@@ -27,13 +27,13 @@ namespace Avahi.UI
[DllImport ("avahi-ui")]
private static extern IntPtr aui_service_dialog_get_service_type (IntPtr dialog);
-
+
[DllImport ("avahi-ui")]
private static extern void aui_service_dialog_set_service_type (IntPtr dialog, IntPtr type);
[DllImport ("avahi-ui")]
private static extern IntPtr aui_service_dialog_get_service_name (IntPtr dialog);
-
+
[DllImport ("avahi-ui")]
private static extern void aui_service_dialog_set_service_name (IntPtr dialog, IntPtr type);
@@ -114,7 +114,7 @@ namespace Avahi.UI
for (int i = 0;;i++) {
if (types[i] != IntPtr.Zero)
break;
-
+
GLib.Marshaller.Free (types[i]);
}
}
@@ -172,11 +172,11 @@ namespace Avahi.UI
get {
ArrayList txtlist = new ArrayList ();
IntPtr txt = aui_service_dialog_get_txt_data (Raw);
-
+
for (IntPtr l = txt; l != IntPtr.Zero; l = avahi_string_list_get_next (l)) {
IntPtr buf = avahi_string_list_get_text (l);
int len = avahi_string_list_get_size (l);
-
+
byte[] txtbuf = new byte[len];
Marshal.Copy (buf, txtbuf, 0, len);
txtlist.Add (txtbuf);
@@ -209,7 +209,7 @@ namespace Avahi.UI
aui_service_dialog_set_address_family (Raw, value);
}
}
-
+
public ServiceDialog (string title, Window parent, params object[] buttonData)
{
Raw = aui_service_dialog_new (title, parent == null ? IntPtr.Zero : parent.Handle,
@@ -223,7 +223,7 @@ namespace Avahi.UI
private static IPAddress PtrToAddress (IntPtr ptr)
{
IPAddress address = null;
-
+
if (ptr != IntPtr.Zero) {
IntPtr buf = Stdlib.malloc (256);
IntPtr addrPtr = avahi_address_snprint (buf, 256, ptr);
diff --git a/avahi-ui-sharp/bssh.cs b/avahi-ui-sharp/bssh.cs
index 003a3a6..fa3d4d4 100644
--- a/avahi-ui-sharp/bssh.cs
+++ b/avahi-ui-sharp/bssh.cs
@@ -5,8 +5,8 @@ using Avahi.UI;
public class EntryPoint {
public static void Main () {
- Application.Init ();
-
+ Application.Init ();
+
ServiceDialog dialog = new ServiceDialog ("Choose SSH Server", null,
Stock.Cancel, ResponseType.Cancel,
Stock.Connect, ResponseType.Accept);
@@ -17,11 +17,11 @@ public class EntryPoint {
Console.WriteLine ("Connecting to {0}:{1}", dialog.Address, dialog.Port);
string user = Environment.UserName;
-
+
foreach (byte[] txtBytes in dialog.TxtData) {
string txt = System.Text.Encoding.UTF8.GetString (txtBytes);
string[] splitTxt = txt.Split(new char[] { '=' }, 2);
-
+
if (splitTxt.Length != 2)
continue;
diff --git a/avahi-ui/Makefile.am b/avahi-ui/Makefile.am
index 8b37333..9d5a07a 100644
--- a/avahi-ui/Makefile.am
+++ b/avahi-ui/Makefile.am
@@ -1,5 +1,3 @@
-# $Id$
-#
# This file is part of avahi.
#
# avahi is free software; you can redistribute it and/or modify it
diff --git a/avahi-ui/avahi-ui.c b/avahi-ui/avahi-ui.c
index 51f6b22..6f2fcbe 100644
--- a/avahi-ui/avahi-ui.c
+++ b/avahi-ui/avahi-ui.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-ui/avahi-ui.h b/avahi-ui/avahi-ui.h
index d780f83..aae61dc 100644
--- a/avahi-ui/avahi-ui.h
+++ b/avahi-ui/avahi-ui.h
@@ -1,8 +1,6 @@
#ifndef fooavahiuihfoo
#define fooavahiuihfoo
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-ui/bssh.c b/avahi-ui/bssh.c
index 9712ee8..491380f 100644
--- a/avahi-ui/bssh.c
+++ b/avahi-ui/bssh.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-utils/Makefile.am b/avahi-utils/Makefile.am
index 21993c3..1b0443c 100644
--- a/avahi-utils/Makefile.am
+++ b/avahi-utils/Makefile.am
@@ -1,5 +1,3 @@
-# $Id$
-
# This file is part of avahi.
#
# avahi is free software; you can redistribute it and/or modify it
diff --git a/avahi-utils/avahi-browse.c b/avahi-utils/avahi-browse.c
index 8cbd6d5..6e808a4 100644
--- a/avahi-utils/avahi-browse.c
+++ b/avahi-utils/avahi-browse.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-utils/avahi-publish.c b/avahi-utils/avahi-publish.c
index c9c6bc3..485de3a 100644
--- a/avahi-utils/avahi-publish.c
+++ b/avahi-utils/avahi-publish.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-utils/avahi-resolve.c b/avahi-utils/avahi-resolve.c
index 0077248..bf1730b 100644
--- a/avahi-utils/avahi-resolve.c
+++ b/avahi-utils/avahi-resolve.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-utils/avahi-set-host-name.c b/avahi-utils/avahi-set-host-name.c
index 737ca3b..34fbbeb 100644
--- a/avahi-utils/avahi-set-host-name.c
+++ b/avahi-utils/avahi-set-host-name.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-utils/sigint.c b/avahi-utils/sigint.c
index 448a069..b726654 100644
--- a/avahi-utils/sigint.c
+++ b/avahi-utils/sigint.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-utils/sigint.h b/avahi-utils/sigint.h
index 4aef74f..ae66fd4 100644
--- a/avahi-utils/sigint.h
+++ b/avahi-utils/sigint.h
@@ -1,8 +1,6 @@
#ifndef foosigchfoo
#define foosigchfoo
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-utils/stdb.c b/avahi-utils/stdb.c
index 759ecbd..6602c97 100644
--- a/avahi-utils/stdb.c
+++ b/avahi-utils/stdb.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-utils/stdb.h b/avahi-utils/stdb.h
index 7fab765..d1e1a91 100644
--- a/avahi-utils/stdb.h
+++ b/avahi-utils/stdb.h
@@ -1,8 +1,6 @@
#ifndef foostdbhfoo
#define foostdbhfoo
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/bootstrap.sh b/bootstrap.sh
index 16f221e..105bdbf 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -1,5 +1,4 @@
#!/bin/sh
-# $Id$
# This file is part of avahi.
#
diff --git a/common/Makefile.am b/common/Makefile.am
index 3f88c28..7379965 100644
--- a/common/Makefile.am
+++ b/common/Makefile.am
@@ -1,5 +1,3 @@
-# $Id$
-
# This file is part of avahi.
#
# avahi is free software; you can redistribute it and/or modify it
diff --git a/configure.ac b/configure.ac
index e22ce73..18ae214 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,8 +1,6 @@
# -*- Autoconf -*-
# Process this file with autoconf to produce a configure script.
-# $Id$
-
# This file is part of avahi.
#
# avahi is free software; you can redistribute it and/or modify it
diff --git a/docs/API-CHANGES-0.6 b/docs/API-CHANGES-0.6
index c29dd56..7c08446 100644
--- a/docs/API-CHANGES-0.6
+++ b/docs/API-CHANGES-0.6
@@ -1,6 +1,5 @@
-*-text-*-
-
A terse (and incomplete) list of API changes between 0.5.2 and 0.6:
* Most browsing and registration functions and their callbacks gained
@@ -73,5 +72,3 @@ A terse (and incomplete) list of API changes between 0.5.2 and 0.6:
* There's now a client side AvahiRecordBrowser, and
avahi_entry_group_add_record().
-
-$Id$
diff --git a/docs/COMPAT-LAYERS b/docs/COMPAT-LAYERS
index 050c988..01b01f2 100644
--- a/docs/COMPAT-LAYERS
+++ b/docs/COMPAT-LAYERS
@@ -14,5 +14,3 @@ ABI/API compatibility should:
$(includedir)/dns_sd.h
-- Lennart
-
-$Id$
diff --git a/docs/DBUS-API b/docs/DBUS-API
index 99e16da..7a57aaa 100644
--- a/docs/DBUS-API
+++ b/docs/DBUS-API
@@ -1,5 +1,3 @@
-$Id$
-
* NOTE *
This file used to contain an overview of the DBUS API for Avahi, however
since it was no longer up to date you should now read the XML-formatted DBUS
diff --git a/docs/HACKING b/docs/HACKING
index eec7eb7..94a8366 100644
--- a/docs/HACKING
+++ b/docs/HACKING
@@ -1,19 +1,14 @@
Please comply with the following rules when hacking on Avahi:
- * When you add a new textual file to the repository please enable SVN
- keyword expansion for it:
-
- svn ps svn:keywords Id foo.c
+ * Before commiting check with "git st" that all built files are ignored
+ by git. To change the list of ignored files use
- * Before commiting check with "svn st" that all built files are ignored
- by svn. To change the list of ignored files use
-
- svn pe svn:ignore .
+ $VISUAL .gitignore
This is similar to the ".cvsignore" file in CVS times.
* Don't forget to add the autoconf config.h inclusion to all C source files:
-
+
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
@@ -42,8 +37,6 @@ Please comply with the following rules when hacking on Avahi:
For Makefile.am, python and shell code:
<snip>
-# $Id$
-
# This file is part of avahi.
#
# avahi is free software; you can redistribute it and/or modify it
@@ -65,8 +58,6 @@ Please comply with the following rules when hacking on Avahi:
For C source code:
<snip>
-/* $Id$ */
-
/***
This file is part of avahi.
@@ -86,6 +77,3 @@ Please comply with the following rules when hacking on Avahi:
USA.
***/
</snip>
-
-
-$Id$
diff --git a/docs/INSTALL b/docs/INSTALL
index 8feac51..419ac3e 100644
--- a/docs/INSTALL
+++ b/docs/INSTALL
@@ -51,5 +51,3 @@ To start the two daemons at boot time on Debian based distributions:
If you plan to use avahi-autoipd you have to create the user/group
"avahi-autoipd" much the same way as "avahi".
-
-$Id$
diff --git a/docs/MALLOC b/docs/MALLOC
index 5c7db9e..7c452af 100644
--- a/docs/MALLOC
+++ b/docs/MALLOC
@@ -6,5 +6,3 @@ situations. Therefore we recommend the usage of memory allocators that
abort() in case of OOM. The default allocator used by Avahi does this.
Eventually we will improve Avahi to deal with these things better.
-
-$Id$
diff --git a/docs/NEWS b/docs/NEWS
index 8adc667..fd22ced 100644
--- a/docs/NEWS
+++ b/docs/NEWS
@@ -744,5 +744,3 @@ contribution to Avahi 0.1.
Cheers,
The Avahi Team
-
-$Id$
diff --git a/examples/Makefile.am b/examples/Makefile.am
index e6e66f5..dbb7f00 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -1,7 +1,5 @@
-# $Id$
-#
# This file is part of avahi.
-#
+#
# avahi is free software; you can redistribute it and/or modify it
# under the terms of the GNU Lesser General Public License as
# published by the Free Software Foundation; either version 2 of the
diff --git a/examples/client-browse-services.c b/examples/client-browse-services.c
index b932e0a..f7ded2a 100644
--- a/examples/client-browse-services.c
+++ b/examples/client-browse-services.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/examples/client-publish-service.c b/examples/client-publish-service.c
index 73ee01b..facc965 100644
--- a/examples/client-publish-service.c
+++ b/examples/client-publish-service.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/examples/core-browse-services.c b/examples/core-browse-services.c
index 65c59fa..e062e3e 100644
--- a/examples/core-browse-services.c
+++ b/examples/core-browse-services.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
/* PLEASE NOTE *
* This file demonstrates how to use Avahi's core API, this is
* the embeddable mDNS stack for embedded applications.
diff --git a/examples/core-publish-service.c b/examples/core-publish-service.c
index d7d7395..a78a464 100644
--- a/examples/core-publish-service.c
+++ b/examples/core-publish-service.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/examples/glib-integration.c b/examples/glib-integration.c
index 4213d74..d2a2457 100644
--- a/examples/glib-integration.c
+++ b/examples/glib-integration.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/initscript/Makefile.am b/initscript/Makefile.am
index d5fadda..e5e1928 100644
--- a/initscript/Makefile.am
+++ b/initscript/Makefile.am
@@ -1,5 +1,3 @@
-# $Id$
-
# This file is part of avahi.
#
# avahi is free software; you can redistribute it and/or modify it
@@ -17,7 +15,7 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
# USA.
-SUBDIRS =
+SUBDIRS =
if TARGET_LFS
SUBDIRS += lfs
diff --git a/initscript/archlinux/Makefile.am b/initscript/archlinux/Makefile.am
index 22096b4..2070975 100644
--- a/initscript/archlinux/Makefile.am
+++ b/initscript/archlinux/Makefile.am
@@ -1,5 +1,3 @@
-# $Id: Makefile.am 267 2005-08-08 10:19:22Z lennart $
-
# This file is part of avahi.
#
# avahi is free software; you can redistribute it and/or modify it
diff --git a/initscript/archlinux/avahi-daemon.in b/initscript/archlinux/avahi-daemon.in
index 1050cb0..6ae252d 100644
--- a/initscript/archlinux/avahi-daemon.in
+++ b/initscript/archlinux/avahi-daemon.in
@@ -1,7 +1,5 @@
#!/bin/bash
-# $Id$
-
# This file is part of avahi.
#
# avahi is free software; you can redistribute it and/or modify it
diff --git a/initscript/archlinux/avahi-dnsconfd.in b/initscript/archlinux/avahi-dnsconfd.in
index 667a0f6..c57260e 100755
--- a/initscript/archlinux/avahi-dnsconfd.in
+++ b/initscript/archlinux/avahi-dnsconfd.in
@@ -1,7 +1,5 @@
#!/bin/bash
-# $Id$
-
# This file is part of avahi.
#
# avahi is free software; you can redistribute it and/or modify it
diff --git a/initscript/darwin/Makefile.am b/initscript/darwin/Makefile.am
index 3c5cecc..5e2b6dc 100644
--- a/initscript/darwin/Makefile.am
+++ b/initscript/darwin/Makefile.am
@@ -1,5 +1,3 @@
-# $Id$
-
# This file is part of avahi.
#
# avahi is free software; you can redistribute it and/or modify it
diff --git a/initscript/debian/Makefile.am b/initscript/debian/Makefile.am
index 7991ea6..314983d 100644
--- a/initscript/debian/Makefile.am
+++ b/initscript/debian/Makefile.am
@@ -1,5 +1,3 @@
-# $Id$
-
# This file is part of avahi.
#
# avahi is free software; you can redistribute it and/or modify it
diff --git a/initscript/debian/avahi-daemon.in b/initscript/debian/avahi-daemon.in
index 30a2c2f..97fa157 100755
--- a/initscript/debian/avahi-daemon.in
+++ b/initscript/debian/avahi-daemon.in
@@ -1,7 +1,5 @@
#!/bin/sh
-# $Id$
-
# This file is part of avahi.
#
# avahi is free software; you can redistribute it and/or modify it
diff --git a/initscript/debian/avahi-dnsconfd.in b/initscript/debian/avahi-dnsconfd.in
index ac34804..67c2873 100755
--- a/initscript/debian/avahi-dnsconfd.in
+++ b/initscript/debian/avahi-dnsconfd.in
@@ -1,7 +1,5 @@
#!/bin/sh
-# $Id$
-
# This file is part of avahi.
#
# avahi is free software; you can redistribute it and/or modify it
diff --git a/initscript/fedora/Makefile.am b/initscript/fedora/Makefile.am
index db27763..2aceb36 100644
--- a/initscript/fedora/Makefile.am
+++ b/initscript/fedora/Makefile.am
@@ -1,5 +1,3 @@
-# $Id$
-
# This file is part of avahi.
#
# avahi is free software; you can redistribute it and/or modify it
diff --git a/initscript/freebsd/Makefile.am b/initscript/freebsd/Makefile.am
index 0ee75d5..c32830e 100644
--- a/initscript/freebsd/Makefile.am
+++ b/initscript/freebsd/Makefile.am
@@ -1,5 +1,3 @@
-# $Id$
-
# This file is part of avahi.
#
# avahi is free software; you can redistribute it and/or modify it
diff --git a/initscript/gentoo/Makefile.am b/initscript/gentoo/Makefile.am
index 398e345..0d20ca6 100644
--- a/initscript/gentoo/Makefile.am
+++ b/initscript/gentoo/Makefile.am
@@ -1,5 +1,3 @@
-# $Id$
-
# This file is part of avahi.
#
# avahi is free software; you can redistribute it and/or modify it
@@ -36,7 +34,7 @@ CLEANFILES = \
avahi-dnsconfd
avahi-daemon: avahi-daemon.in
-
+
sed -e 's,@sbindir\@,$(sbindir),g; $(NO_DBUS_DEPENDENCY)' $< > $@
chmod +x $@
diff --git a/initscript/gentoo/avahi-daemon.in b/initscript/gentoo/avahi-daemon.in
index 25edb2a..02eefe6 100644
--- a/initscript/gentoo/avahi-daemon.in
+++ b/initscript/gentoo/avahi-daemon.in
@@ -1,5 +1,4 @@
#!/sbin/runscript
-# $Id$
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
diff --git a/initscript/gentoo/avahi-dnsconfd.in b/initscript/gentoo/avahi-dnsconfd.in
index 18efc05..376067e 100644
--- a/initscript/gentoo/avahi-dnsconfd.in
+++ b/initscript/gentoo/avahi-dnsconfd.in
@@ -1,5 +1,4 @@
#!/sbin/runscript
-# $Id$
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
diff --git a/initscript/lfs/Makefile.am b/initscript/lfs/Makefile.am
index d5e33f8..e8386e8 100644
--- a/initscript/lfs/Makefile.am
+++ b/initscript/lfs/Makefile.am
@@ -1,5 +1,3 @@
-# $Id$
-
# This file is part of avahi.
#
# avahi is free software; you can redistribute it and/or modify it
diff --git a/initscript/mandriva/Makefile.am b/initscript/mandriva/Makefile.am
index 10fd4cf..480426b 100644
--- a/initscript/mandriva/Makefile.am
+++ b/initscript/mandriva/Makefile.am
@@ -1,5 +1,3 @@
-# $Id: Makefile.am 838 2005-10-22 21:23:02Z lennart $
-
# This file is part of avahi.
#
# avahi is free software; you can redistribute it and/or modify it
diff --git a/initscript/slackware/Makefile.am b/initscript/slackware/Makefile.am
index 3175a15..d415387 100644
--- a/initscript/slackware/Makefile.am
+++ b/initscript/slackware/Makefile.am
@@ -1,5 +1,3 @@
-# $Id$
-
# This file is part of avahi.
#
# avahi is free software; you can redistribute it and/or modify it
diff --git a/initscript/slackware/avahi-daemon.in b/initscript/slackware/avahi-daemon.in
index acd377d..76bf2f2 100644
--- a/initscript/slackware/avahi-daemon.in
+++ b/initscript/slackware/avahi-daemon.in
@@ -1,7 +1,5 @@
#!/bin/bash
-# $Id$
-
# This file is part of avahi.
#
# avahi is free software; you can redistribute it and/or modify it
diff --git a/initscript/slackware/avahi-dnsconfd.in b/initscript/slackware/avahi-dnsconfd.in
index 4da14fa..ea1554d 100644
--- a/initscript/slackware/avahi-dnsconfd.in
+++ b/initscript/slackware/avahi-dnsconfd.in
@@ -1,7 +1,5 @@
#!/bin/bash
-# $Id$
-
# This file is part of avahi.
#
# avahi is free software; you can redistribute it and/or modify it
diff --git a/initscript/suse/Makefile.am b/initscript/suse/Makefile.am
index e18f0f6..5624bdc 100644
--- a/initscript/suse/Makefile.am
+++ b/initscript/suse/Makefile.am
@@ -1,5 +1,3 @@
-# $Id$
-
# This file is part of avahi.
#
# avahi is free software; you can redistribute it and/or modify it
diff --git a/man/Makefile.am b/man/Makefile.am
index 5b089ed..d38267c 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -1,5 +1,3 @@
-# $Id$
-
# This file is part of avahi.
#
# avahi is free software; you can redistribute it and/or modify it
diff --git a/man/avahi-autoipd.8.xml.in b/man/avahi-autoipd.8.xml.in
index 2e7bb67..43177a5 100644
--- a/man/avahi-autoipd.8.xml.in
+++ b/man/avahi-autoipd.8.xml.in
@@ -2,21 +2,19 @@
<!DOCTYPE manpage SYSTEM "xmltoman.dtd">
<?xml-stylesheet type="text/xsl" href="xmltoman.xsl" ?>
-<!-- $Id$ -->
-
-<!--
+<!--
This file is part of avahi.
-
+
avahi is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as
published by the Free Software Foundation; either version 2.1 of the
License, or (at your option) any later version.
-
+
avahi is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General
Public License for more details.
-
+
You should have received a copy of the GNU Lesser General Public
License along with avahi; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -31,7 +29,7 @@
<cmd>avahi-autoipd <opt>--refresh</opt> <arg>interface</arg></cmd>
<cmd>avahi-autoipd <opt>--check</opt> <arg>interface</arg></cmd>
</synopsis>
-
+
<description>
<p>avahi-autoipd implements IPv4LL, "Dynamic Configuration of
IPv4 Link-Local Addresses" (IETF RFC3927), a protocol for
@@ -56,7 +54,7 @@
<p>See http://developer.apple.com/qa/qa2004/qa1357.html for more information.</p>
</description>
-
+
<options>
<option>
@@ -108,7 +106,7 @@
<p><opt>-w | --wait</opt></p>
<optdesc><p>Wait until a IP address has been sucessfully acquired before detaching. Only valid in combination with <opt>--daemonize</opt>.</p></optdesc>
</option>
-
+
<option>
<p><opt>--force-bind</opt></p>
<optdesc><p>Acquire an IPv4LL address, even if a routable address has been configured on the interface.</p></optdesc>
@@ -135,9 +133,9 @@
</options>
<section name="Files">
-
+
<p><file>@pkgsysconfdir@/avahi-autoipd.action</file>: the script to run when an IP address as been acquired or is lost.</p>
-
+
</section>
<section name="Signals">
@@ -149,7 +147,7 @@
<p>The Avahi Developers &lt;@PACKAGE_BUGREPORT@&gt;; Avahi is
available from <url href="@PACKAGE_URL@"/></p>
</section>
-
+
<section name="See also">
<p>
<manref name="autoipd.action" section="8"/>, <manref name="dhclient" section="8"/>
@@ -157,10 +155,10 @@
<p>http://avahi.org/wiki/AvahiAutoipd documents how avahi-autoipd is best packaged and integrated into distributions.</p>
</section>
-
+
<section name="Comments">
<p>This man page was written using <manref name="xml2man" section="1"
href="http://masqmail.cx/xml2man/"/> by Oliver Kurth.</p>
</section>
-
+
</manpage>
diff --git a/man/avahi-autoipd.action.8.xml.in b/man/avahi-autoipd.action.8.xml.in
index 1eb6750..9dea446 100644
--- a/man/avahi-autoipd.action.8.xml.in
+++ b/man/avahi-autoipd.action.8.xml.in
@@ -2,21 +2,19 @@
<!DOCTYPE manpage SYSTEM "xmltoman.dtd">
<?xml-stylesheet type="text/xsl" href="xmltoman.xsl" ?>
-<!-- $Id: avahi-autoipd.action.8.xml.in 263 2005-08-07 19:53:39Z lennart $ -->
-
-<!--
+<!--
This file is part of avahi.
-
+
avahi is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as
published by the Free Software Foundation; either version 2.1 of the
License, or (at your option) any later version.
-
+
avahi is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General
Public License for more details.
-
+
You should have received a copy of the GNU Lesser General Public
License along with avahi; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -28,7 +26,7 @@
<synopsis>
<cmd>@pkgsysconfdir@/avahi-autoipd.action</cmd>
</synopsis>
-
+
<description>
<p><file>avahi-autoipd.action</file> is the action script that
is called whenever an IP address has been acquired by
@@ -36,7 +34,7 @@
script should add or remove the specified address from the
specified network interface.</p>
</description>
-
+
<section name="Parameters">
<option>
@@ -70,16 +68,16 @@
<p>The Avahi Developers &lt;@PACKAGE_BUGREPORT@&gt;; Avahi is
available from <url href="@PACKAGE_URL@"/></p>
</section>
-
+
<section name="See also">
<p>
<manref name="avahi-autoipd" section="8"/>, <manref name="dhclient-script" section="8"/>, <manref name="ip" section="8"/>, <manref name="ifconfig" section="8"/>
</p>
</section>
-
+
<section name="Comments">
<p>This man page was written using <manref name="xml2man" section="1"
href="http://masqmail.cx/xml2man/"/> by Oliver Kurth.</p>
</section>
-
+
</manpage>
diff --git a/man/avahi-bookmarks.1.xml.in b/man/avahi-bookmarks.1.xml.in
index 9bebd76..d863e2b 100644
--- a/man/avahi-bookmarks.1.xml.in
+++ b/man/avahi-bookmarks.1.xml.in
@@ -2,21 +2,19 @@
<!DOCTYPE manpage SYSTEM "xmltoman.dtd">
<?xml-stylesheet type="text/xsl" href="xmltoman.xsl" ?>
-<!-- $Id$ -->
-
-<!--
+<!--
This file is part of avahi.
-
+
avahi is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as
published by the Free Software Foundation; either version 2.1 of the
License, or (at your option) any later version.
-
+
avahi is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General
Public License for more details.
-
+
You should have received a copy of the GNU Lesser General Public
License along with avahi; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -28,7 +26,7 @@
<synopsis>
<cmd>avahi-bookmarks</cmd>
</synopsis>
-
+
<description>
<p>A web service for listing HTTP services that are announced
via mDNS/DNS-SD using the Avahi daemon. avahi-bookmarks opens a
@@ -36,9 +34,9 @@
returning a dynamic web site containing links to all services of
type _http._tcp on the LAN. Point your browser to
http://localhost:8080/ to make use of avahi-bookmarks.</p>
-
+
</description>
-
+
<options>
<option>
<p><opt>-p | --port=</opt> <arg>PORT</arg></p>
@@ -69,11 +67,11 @@
locally. This option conflicts with -H.</p></optdesc>
</option>
-
+
<option>
<p><opt>-d | --domain</opt>=<arg>DOMAIN</arg></p>
<optdesc><p>The domain to browse for services in.</p></optdesc>
- </option>
+ </option>
<option>
<p><opt>-h | --help</opt></p>
@@ -86,16 +84,16 @@
<p>The Avahi Developers &lt;@PACKAGE_BUGREPORT@&gt;; Avahi is
available from <url href="@PACKAGE_URL@"/></p>
</section>
-
+
<section name="See also">
<p>
<manref name="avahi-browse" section="1"/>, <manref name="avahi-daemon" section="8"/>
</p>
</section>
-
+
<section name="Comments">
<p>This man page was written using <manref name="xml2man" section="1"
href="http://masqmail.cx/xml2man/"/> by Oliver Kurth.</p>
</section>
-
+
</manpage>
diff --git a/man/avahi-browse.1.xml.in b/man/avahi-browse.1.xml.in
index df4924b..b13d4fc 100644
--- a/man/avahi-browse.1.xml.in
+++ b/man/avahi-browse.1.xml.in
@@ -2,8 +2,6 @@
<!DOCTYPE manpage SYSTEM "xmltoman.dtd">
<?xml-stylesheet type="text/xsl" href="xmltoman.xsl" ?>
-<!-- $Id$ -->
-
<!--
This file is part of avahi.
diff --git a/man/avahi-daemon.8.xml.in b/man/avahi-daemon.8.xml.in
index b45e8c1..7e8e2d9 100644
--- a/man/avahi-daemon.8.xml.in
+++ b/man/avahi-daemon.8.xml.in
@@ -2,21 +2,19 @@
<!DOCTYPE manpage SYSTEM "xmltoman.dtd">
<?xml-stylesheet type="text/xsl" href="xmltoman.xsl" ?>
-<!-- $Id$ -->
-
-<!--
+<!--
This file is part of avahi.
-
+
avahi is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as
published by the Free Software Foundation; either version 2.1 of the
License, or (at your option) any later version.
-
+
avahi is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General
Public License for more details.
-
+
You should have received a copy of the GNU Lesser General Public
License along with avahi; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -31,7 +29,7 @@
<cmd>avahi-daemon <opt>--reload</opt></cmd>
<cmd>avahi-daemon <opt>--check</opt></cmd>
</synopsis>
-
+
<description>
<p>The Avahi mDNS/DNS-SD daemon implements Apple's Zeroconf
architecture (also known as "Rendezvous" or "Bonjour"). The daemon
@@ -44,7 +42,7 @@
(a libc NSS plugin, providing name resolution via mDNS). Finally
there is the D-Bus interface which provides a rich object
oriented interface to D-Bus enabled applications.</p>
-
+
<p>Upon startup avahi-daemon interprets its configuration file
<file>@pkgsysconfdir@/avahi-daemon.conf</file> and reads XML
fragments from <file>@servicedir@/*.service</file> which may
@@ -53,7 +51,7 @@
<file>avahi-daemon.conf</file> the file
<file>/etc/resolv.conf</file> will be read, too.</p>
</description>
-
+
<options>
<option>
@@ -134,13 +132,13 @@
</options>
<section name="Files">
-
+
<p><file>@pkgsysconfdir@/avahi-daemon.conf</file>: the default configuration file for avahi-daemon, <manref name="avahi-daemon.conf" section="5"/> for more information.</p>
<p><file>@pkgsysconfdir@/hosts</file>: additional static hostname mappings to publish in mDNS, see <manref name="avahi.hosts" section="5"/> for more information.</p>
<p><file>@servicedir@/*.service</file>: static service definitions, see <manref name="avahi.service" section="5"/> for more information.</p>
-
+
</section>
<section name="Signals">
@@ -155,7 +153,7 @@
<p>The Avahi Developers &lt;@PACKAGE_BUGREPORT@&gt;; Avahi is
available from <url href="@PACKAGE_URL@"/></p>
</section>
-
+
<section name="See also">
<p>
<manref name="avahi-daemon.conf" section="5"/>, <manref name="avahi.hosts" section="5"/>, <manref name="avahi.service" section="5"/>, <manref name="avahi-dnsconfd" section="8"/>, <manref name="avahi-set-host-name" section="1"/>
@@ -163,10 +161,10 @@
<p>http://avahi.org/wiki/AvahiAndUnicastDotLocal documents the problems when using Avahi in a unicast DNS zone .local.</p>
</section>
-
+
<section name="Comments">
<p>This man page was written using <manref name="xml2man" section="1"
href="http://masqmail.cx/xml2man/"/> by Oliver Kurth.</p>
</section>
-
+
</manpage>
diff --git a/man/avahi-daemon.conf.5.xml.in b/man/avahi-daemon.conf.5.xml.in
index baa9a21..7e44690 100644
--- a/man/avahi-daemon.conf.5.xml.in
+++ b/man/avahi-daemon.conf.5.xml.in
@@ -2,8 +2,6 @@
<!DOCTYPE manpage SYSTEM "xmltoman.dtd">
<?xml-stylesheet type="text/xsl" href="xmltoman.xsl" ?>
-<!-- $Id$ -->
-
<!--
This file is part of avahi.
diff --git a/man/avahi-discover.1.xml.in b/man/avahi-discover.1.xml.in
index 5d4f878..e311f1f 100644
--- a/man/avahi-discover.1.xml.in
+++ b/man/avahi-discover.1.xml.in
@@ -2,21 +2,19 @@
<!DOCTYPE manpage SYSTEM "xmltoman.dtd">
<?xml-stylesheet type="text/xsl" href="xmltoman.xsl" ?>
-<!-- $Id$ -->
-
-<!--
+<!--
This file is part of avahi.
-
+
avahi is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as
published by the Free Software Foundation; either version 2.1 of the
License, or (at your option) any later version.
-
+
avahi is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General
Public License for more details.
-
+
You should have received a copy of the GNU Lesser General Public
License along with avahi; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -28,34 +26,34 @@
<synopsis>
<cmd>avahi-discover</cmd>
</synopsis>
-
+
<description>
<p>Show a real-time graphical browse list for mDNS/DNS-SD
network services running on the local LAN using the Avahi
daemon.</p>
-
+
</description>
-
+
<options>
<p>avahi-discover takes no command line arguments at the moment.</p>
</options>
-
+
<section name="Authors">
<p>The Avahi Developers &lt;@PACKAGE_BUGREPORT@&gt;; Avahi is
available from <url href="@PACKAGE_URL@"/></p>
</section>
-
+
<section name="See also">
<p>
<manref name="avahi-daemon" section="8"/>, <manref name="avahi-browse" section="1"/>
</p>
</section>
-
+
<section name="Comments">
<p>This man page was written using <manref name="xml2man" section="1"
href="http://masqmail.cx/xml2man/"/> by Oliver Kurth.</p>
</section>
-
+
</manpage>
diff --git a/man/avahi-dnsconfd.8.xml.in b/man/avahi-dnsconfd.8.xml.in
index c74e1ba..b40c676 100644
--- a/man/avahi-dnsconfd.8.xml.in
+++ b/man/avahi-dnsconfd.8.xml.in
@@ -2,21 +2,19 @@
<!DOCTYPE manpage SYSTEM "xmltoman.dtd">
<?xml-stylesheet type="text/xsl" href="xmltoman.xsl" ?>
-<!-- $Id$ -->
-
-<!--
+<!--
This file is part of avahi.
-
+
avahi is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as
published by the Free Software Foundation; either version 2.1 of the
License, or (at your option) any later version.
-
+
avahi is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General
Public License for more details.
-
+
You should have received a copy of the GNU Lesser General Public
License along with avahi; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -31,7 +29,7 @@
<cmd>avahi-dnsconfd <opt>--refresh</opt></cmd>
<cmd>avahi-dnsconfd <opt>--check</opt></cmd>
</synopsis>
-
+
<description>
<p>avahi-dnsconfd connects to a running avahi-daemon and runs
the script <file>@pkgsysconfdir@/dnsconfd.action</file> for each unicast DNS
@@ -39,7 +37,7 @@
configuring unicast DNS servers in a DHCP-like fashion with
mDNS.</p>
</description>
-
+
<options>
<option>
@@ -75,9 +73,9 @@
</options>
<section name="Files">
-
+
<p><file>@pkgsysconfdir@/avahi-dnsconfd.action</file>: the script to run when a DNS server is found or removed.</p>
-
+
</section>
<section name="Signals">
@@ -89,16 +87,16 @@
<p>The Avahi Developers &lt;@PACKAGE_BUGREPORT@&gt;; Avahi is
available from <url href="@PACKAGE_URL@"/></p>
</section>
-
+
<section name="See also">
<p>
<manref name="avahi-daemon" section="8"/>, <manref name="avahi-dnsconfd.action" section="8"/>
</p>
</section>
-
+
<section name="Comments">
<p>This man page was written using <manref name="xml2man" section="1"
href="http://masqmail.cx/xml2man/"/> by Oliver Kurth.</p>
</section>
-
+
</manpage>
diff --git a/man/avahi-dnsconfd.action.8.xml.in b/man/avahi-dnsconfd.action.8.xml.in
index 6811422..f4ae37e 100644
--- a/man/avahi-dnsconfd.action.8.xml.in
+++ b/man/avahi-dnsconfd.action.8.xml.in
@@ -2,21 +2,19 @@
<!DOCTYPE manpage SYSTEM "xmltoman.dtd">
<?xml-stylesheet type="text/xsl" href="xmltoman.xsl" ?>
-<!-- $Id$ -->
-
-<!--
+<!--
This file is part of avahi.
-
+
avahi is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as
published by the Free Software Foundation; either version 2.1 of the
License, or (at your option) any later version.
-
+
avahi is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General
Public License for more details.
-
+
You should have received a copy of the GNU Lesser General Public
License along with avahi; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -28,7 +26,7 @@
<synopsis>
<cmd>@pkgsysconfdir@/avahi-dnsconfd.action</cmd>
</synopsis>
-
+
<description>
<p><file>avahi-dnsconfd.action</file> is the action script that
is called whenever a new unicast DNS server is found or
@@ -36,7 +34,7 @@
with avahi patches <file>/etc/resolv.conf</file> to reflect the
changed unicast DNS server configuration.</p>
</description>
-
+
<section name="Parameters">
<option>
@@ -61,7 +59,7 @@
<option>
<p><opt>AVAHI_INTERFACE</opt> Contains the textual interface name the corresponds with argv[3]. (e.g. "eth0")</p>
</option>
-
+
<option><p><opt>AVAHI_INTERFACE_DNS_SERVERS</opt> Contains a
list of all DNS servers that avahi-dnsconfd found on the
interface <opt>$AVAHI_INTERFACE</opt>, separated by
@@ -71,22 +69,22 @@
DNS server that avahi-dnsconfd found on all interfaces,
separated by spaces.</p></option>
- </section>
+ </section>
<section name="Authors">
<p>The Avahi Developers &lt;@PACKAGE_BUGREPORT@&gt;; Avahi is
available from <url href="@PACKAGE_URL@"/></p>
</section>
-
+
<section name="See also">
<p>
<manref name="avahi-dnsconfd" section="8"/>, <manref name="avahi-daemon" section="8"/>
</p>
</section>
-
+
<section name="Comments">
<p>This man page was written using <manref name="xml2man" section="1"
href="http://masqmail.cx/xml2man/"/> by Oliver Kurth.</p>
</section>
-
+
</manpage>
diff --git a/man/avahi-publish.1.xml.in b/man/avahi-publish.1.xml.in
index 5ab476a..bb8dbda 100644
--- a/man/avahi-publish.1.xml.in
+++ b/man/avahi-publish.1.xml.in
@@ -2,21 +2,19 @@
<!DOCTYPE manpage SYSTEM "xmltoman.dtd">
<?xml-stylesheet type="text/xsl" href="xmltoman.xsl" ?>
-<!-- $Id$ -->
-
-<!--
+<!--
This file is part of avahi.
-
+
avahi is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as
published by the Free Software Foundation; either version 2.1 of the
License, or (at your option) any later version.
-
+
avahi is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General
Public License for more details.
-
+
You should have received a copy of the GNU Lesser General Public
License along with avahi; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -31,11 +29,11 @@
<cmd>avahi-publish -a [<arg>options</arg>] <arg>host name</arg> <arg>address</arg></cmd>
<cmd>avahi-publish-address [<arg>options</arg>] <arg>host name</arg> <arg>address</arg></cmd>
</synopsis>
-
+
<description>
<p>Register an mDNS/DNS-SD service or host name/address mapping using the Avahi daemon.</p>
</description>
-
+
<options>
<p>When calling in service registration mode, specify a DNS-SD
@@ -45,7 +43,7 @@
command line. When calling in address/host name registration
mode specify a fully qualified host name and an address (IPv4 or
IPv6).</p>
-
+
<option>
<p><opt>-s | --service</opt></p>
<optdesc><p>Register a service. avahi-publish-service is equivalent to avahi-publish -s.</p></optdesc>
@@ -102,12 +100,12 @@
</option>
</options>
-
+
<section name="Authors">
<p>The Avahi Developers &lt;@PACKAGE_BUGREPORT@&gt;; Avahi is
available from <url href="@PACKAGE_URL@"/></p>
</section>
-
+
<section name="See also">
<p>
<manref name="avahi-resolve" section="1"/>, <manref
@@ -115,10 +113,10 @@
name="avahi-daemon" section="8"/>
</p>
</section>
-
+
<section name="Comments">
<p>This man page was written using <manref name="xml2man" section="1"
href="http://masqmail.cx/xml2man/"/> by Oliver Kurth.</p>
</section>
-
+
</manpage>
diff --git a/man/avahi-resolve.1.xml.in b/man/avahi-resolve.1.xml.in
index 3f9bbc6..e444cb9 100644
--- a/man/avahi-resolve.1.xml.in
+++ b/man/avahi-resolve.1.xml.in
@@ -2,21 +2,19 @@
<!DOCTYPE manpage SYSTEM "xmltoman.dtd">
<?xml-stylesheet type="text/xsl" href="xmltoman.xsl" ?>
-<!-- $Id$ -->
-
-<!--
+<!--
This file is part of avahi.
-
+
avahi is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as
published by the Free Software Foundation; either version 2.1 of the
License, or (at your option) any later version.
-
+
avahi is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General
Public License for more details.
-
+
You should have received a copy of the GNU Lesser General Public
License along with avahi; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -31,13 +29,13 @@
<cmd>avahi-resolve --address <arg>address ...</arg></cmd>
<cmd>avahi-resolve-address <arg>address ...</arg></cmd>
</synopsis>
-
+
<description>
<p>Resolve one or more mDNS/DNS host name(s) to IP address(es) (and vice versa) using the Avahi daemon.</p>
</description>
-
+
<options>
-
+
<p>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, specify one or more IP address
@@ -90,18 +88,18 @@
<p>The Avahi Developers &lt;@PACKAGE_BUGREPORT@&gt;; Avahi is
available from <url href="@PACKAGE_URL@"/></p>
</section>
-
+
<section name="See also">
<p>
- <manref name="avahi-publish-address" section="1"/>,
+ <manref name="avahi-publish-address" section="1"/>,
<manref
name="avahi-daemon" section="8"/>
</p>
</section>
-
+
<section name="Comments">
<p>This man page was written using <manref name="xml2man" section="1"
href="http://masqmail.cx/xml2man/"/> by Oliver Kurth.</p>
</section>
-
+
</manpage>
diff --git a/man/avahi-set-host-name.1.xml.in b/man/avahi-set-host-name.1.xml.in
index a49db10..407bbe7 100644
--- a/man/avahi-set-host-name.1.xml.in
+++ b/man/avahi-set-host-name.1.xml.in
@@ -2,21 +2,19 @@
<!DOCTYPE manpage SYSTEM "xmltoman.dtd">
<?xml-stylesheet type="text/xsl" href="xmltoman.xsl" ?>
-<!-- $Id$ -->
-
-<!--
+<!--
This file is part of avahi.
-
+
avahi is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as
published by the Free Software Foundation; either version 2.1 of the
License, or (at your option) any later version.
-
+
avahi is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General
Public License for more details.
-
+
You should have received a copy of the GNU Lesser General Public
License along with avahi; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -28,15 +26,15 @@
<synopsis>
<cmd>avahi-set-host-name <arg>host-name</arg></cmd>
</synopsis>
-
+
<description>
<p>Set the mDNS host name of a currently running Avahi
daemon. The effect of this operation is not persistent across
daemon restarts. This operation is usually privileged.</p>
</description>
-
+
<options>
-
+
<option>
<p><opt>-v | --verbose</opt></p>
<optdesc><p>Enable verbose mode.</p></optdesc>
@@ -60,16 +58,16 @@
<p>The Avahi Developers &lt;@PACKAGE_BUGREPORT@&gt;; Avahi is
available from <url href="@PACKAGE_URL@"/></p>
</section>
-
+
<section name="See also">
<p>
<manref name="avahi-daemon" section="8"/>
</p>
</section>
-
+
<section name="Comments">
<p>This man page was written using <manref name="xml2man" section="1"
href="http://masqmail.cx/xml2man/"/> by Oliver Kurth.</p>
</section>
-
+
</manpage>
diff --git a/man/avahi.hosts.5.xml.in b/man/avahi.hosts.5.xml.in
index 5a92547..eff2848 100644
--- a/man/avahi.hosts.5.xml.in
+++ b/man/avahi.hosts.5.xml.in
@@ -2,21 +2,19 @@
<!DOCTYPE manpage SYSTEM "xmltoman.dtd">
<?xml-stylesheet type="text/xsl" href="xmltoman.xsl" ?>
-<!-- $Id$ -->
-
-<!--
+<!--
This file is part of avahi.
-
+
avahi is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as
published by the Free Software Foundation; either version 2.1 of the
License, or (at your option) any later version.
-
+
avahi is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General
Public License for more details.
-
+
You should have received a copy of the GNU Lesser General Public
License along with avahi; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -28,7 +26,7 @@
<synopsis>
<cmd>@pkgsysconfdir@/hosts</cmd>
</synopsis>
-
+
<description>
<p><file>@pkgsysconfdir@/hosts</file> is a file which may be used
to define static host name to IP address mappings for multicast
@@ -46,17 +44,17 @@
<p>The Avahi Developers &lt;@PACKAGE_BUGREPORT@&gt;; Avahi is
available from <url href="@PACKAGE_URL@"/></p>
</section>
-
+
<section name="See also">
<p>
<manref name="avahi-daemon" section="8"/>, <manref name="avahi.service" section="5"/>
</p>
</section>
-
+
<section name="Comments">
<p>This man page was written using <manref name="xml2man"
section="1" href="http://masqmail.cx/xml2man/"/> by Oliver
Kurth.</p>
</section>
-
+
</manpage>
diff --git a/man/avahi.service.5.xml.in b/man/avahi.service.5.xml.in
index 0005903..6598617 100644
--- a/man/avahi.service.5.xml.in
+++ b/man/avahi.service.5.xml.in
@@ -2,21 +2,19 @@
<!DOCTYPE manpage SYSTEM "xmltoman.dtd">
<?xml-stylesheet type="text/xsl" href="xmltoman.xsl" ?>
-<!-- $Id$ -->
-
-<!--
+<!--
This file is part of avahi.
-
+
avahi is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as
published by the Free Software Foundation; either version 2.1 of the
License, or (at your option) any later version.
-
+
avahi is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General
Public License for more details.
-
+
You should have received a copy of the GNU Lesser General Public
License along with avahi; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -28,16 +26,16 @@
<synopsis>
<cmd>@servicedir@/*.service</cmd>
</synopsis>
-
+
<description> <p><file>@servicedir@/*.service</file> are XML
fragments containing static DNS-SD service data. Every service
file can contain multiple service definitions which share the
same name. This is useful for publishing service data for
services which implement multiple protocols. (i.e. a printer
implementing _ipp._tcp and _printer._tcp)</p> </description>
-
+
<section name="XML Tags">
-
+
<option>
<p><opt>&lt;service-group&gt;</opt> The document tag of avahi
service files. Should contain one <opt>&lt;name&gt;</opt> and one or more
@@ -108,17 +106,17 @@
<p>The Avahi Developers &lt;@PACKAGE_BUGREPORT@&gt;; Avahi is
available from <url href="@PACKAGE_URL@"/></p>
</section>
-
+
<section name="See also">
<p>
<manref name="avahi-daemon" section="8"/>, <manref name="avahi.hosts" section="5"/>
</p>
</section>
-
+
<section name="Comments">
<p>This man page was written using <manref name="xml2man"
section="1" href="http://masqmail.cx/xml2man/"/> by Oliver
Kurth.</p>
</section>
-
+
</manpage>
diff --git a/man/bssh.1.xml.in b/man/bssh.1.xml.in
index 2a3fdcf..6df640d 100644
--- a/man/bssh.1.xml.in
+++ b/man/bssh.1.xml.in
@@ -2,8 +2,6 @@
<!DOCTYPE manpage SYSTEM "xmltoman.dtd">
<?xml-stylesheet type="text/xsl" href="xmltoman.xsl" ?>
-<!-- $Id$ -->
-
<!--
This file is part of avahi.
diff --git a/man/xmltoman.css b/man/xmltoman.css
index 4c80847..6b3235b 100644
--- a/man/xmltoman.css
+++ b/man/xmltoman.css
@@ -1,5 +1,3 @@
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/man/xmltoman.dtd b/man/xmltoman.dtd
index 50158dc..968dd5f 100644
--- a/man/xmltoman.dtd
+++ b/man/xmltoman.dtd
@@ -1,6 +1,4 @@
-<!-- $Id$ -->
-
-<!--
+<!--
This file is part of avahi.
avahi is free software; you can redistribute it and/or modify it under
@@ -15,7 +13,7 @@
You should have received a copy of the GNU General Public License
along with avahi; if not, write to the Free Software Foundation,
- Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+ Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
-->
<!ELEMENT manpage (synopsis | description | section | options | seealso)*>
diff --git a/man/xmltoman.xsl b/man/xmltoman.xsl
index 96c9d81..1a344c2 100644
--- a/man/xmltoman.xsl
+++ b/man/xmltoman.xsl
@@ -19,8 +19,6 @@
Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
-->
-<!-- $Id$ -->
-
<xsl:output method="xml" version="1.0" encoding="iso-8859-15" doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN" doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd" indent="yes"/>
<xsl:template match="/manpage">
diff --git a/service-type-database/Makefile.am b/service-type-database/Makefile.am
index 60fda45..6419ba7 100644
--- a/service-type-database/Makefile.am
+++ b/service-type-database/Makefile.am
@@ -1,7 +1,5 @@
-# $Id$
-#
# This file is part of avahi.
-#
+#
# avahi is free software; you can redistribute it and/or modify it
# under the terms of the GNU Lesser General Public License as
# published by the Free Software Foundation; either version 2 of the
diff --git a/service-type-database/build-db.in b/service-type-database/build-db.in
index 44f6068..4cda425 100755
--- a/service-type-database/build-db.in
+++ b/service-type-database/build-db.in
@@ -1,7 +1,5 @@
#!@PYTHON@
# -*-python-*-
-# $Id$
-
# This file is part of avahi.
#
# avahi is free software; you can redistribute it and/or modify it
diff --git a/service-type-database/service-types b/service-type-database/service-types
index 97e6858..934c968 100644
--- a/service-type-database/service-types
+++ b/service-type-database/service-types
@@ -1,5 +1,3 @@
-# $Id$
-
# This file is part of avahi.
#
# avahi is free software; you can redistribute it and/or modify it
diff --git a/tests/Makefile.am b/tests/Makefile.am
index c91cea4..e28b0b7 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,7 +1,5 @@
-# $Id$
-#
# This file is part of avahi.
-#
+#
# avahi is free software; you can redistribute it and/or modify it
# under the terms of the GNU Lesser General Public License as
# published by the Free Software Foundation; either version 2 of the
diff --git a/tests/c-plus-plus-test-gen.py b/tests/c-plus-plus-test-gen.py
index 46d6762..a2836f0 100755
--- a/tests/c-plus-plus-test-gen.py
+++ b/tests/c-plus-plus-test-gen.py
@@ -1,9 +1,7 @@
#!/usr/bin/python
-# $Id$
-#
# This file is part of avahi.
-#
+#
# avahi is free software; you can redistribute it and/or modify it
# under the terms of the GNU Lesser General Public License as
# published by the Free Software Foundation; either version 2 of the
@@ -31,21 +29,19 @@ def print_includes(dir):
print "#include <%s/%s>" % (dir, f)
-print """/* $Id$ */
-
-/***
+print """/***
This file is part of avahi.
-
+
avahi is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as
published by the Free Software Foundation; either version 2.1 of the
License, or (at your option) any later version.
-
+
avahi is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General
Public License for more details.
-
+
You should have received a copy of the GNU Lesser General Public
License along with avahi; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
diff --git a/tests/c-plus-plus-test.cc b/tests/c-plus-plus-test.cc
index 947aa44..ad7a529 100644
--- a/tests/c-plus-plus-test.cc
+++ b/tests/c-plus-plus-test.cc
@@ -1,5 +1,3 @@
-/* $Id$ */
-
/***
This file is part of avahi.