refreshing branch to latest release.

git-svn-id: file:///home/lennart/svn/public/avahi/branches/federico@1455 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe

3 files changed, 121 insertions, 33 deletions

diff --git a/service-type-database/Makefile.am b/service-type-database/Makefile.am
index 3250e94..c41dc70 100644
--- a/service-type-database/Makefile.am
+++ b/service-type-database/Makefile.am
@@ -28,13 +28,36 @@ noinst_SCRIPTS=build-db
 pkgdata_DATA+=service-types.db
 
 build-db: build-db.in
-	sed -e 's,@PYTHON\@,$(PYTHON),g' $< > $@
+	sed -e 's,@PYTHON\@,$(PYTHON),g' \
+	    -e 's,@DBM\@,gdbm,g' $< > $@
 	chmod +x $@
 
 service-types.db: service-types build-db
-	$(PYTHON) build-db $(srcdir)/$< $@
+	$(PYTHON) build-db $< $@.coming
+	mv $@.coming $@
 
 CLEANFILES = service-types.db build-db
 
 endif
+if HAVE_DBM
+
+noinst_SCRIPTS=build-db
+pkgdata_DATA+=service-types.db.pag service-types.db.dir
+
+build-db: build-db.in
+	sed -e 's,@PYTHON\@,$(PYTHON),g' \
+	    -e 's,@DBM\@,dbm,g' $< > $@
+	chmod +x $@
+
+service-types.db.pag: service-types.db
+	mv service-types.db.coming.pag service-types.db.pag
+service-types.db.dir: service-types.db
+	mv service-types.db.coming.dir service-types.db.dir
+service-types.db: service-types build-db
+	$(PYTHON) build-db $< $@.coming
+	if test -f "$@.coming"; then mv $@.coming $@; fi
+
+CLEANFILES = service-types.db* build-db
+
+endif
 endif
diff --git a/service-type-database/build-db.in b/service-type-database/build-db.in
index 21d057d..44f6068 100755
--- a/service-type-database/build-db.in
+++ b/service-type-database/build-db.in
@@ -19,7 +19,7 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 # USA.
 
-import gdbm, sys
+import @DBM@, sys
 
 if len(sys.argv) > 1:
     infn = sys.argv[1]
@@ -31,7 +31,7 @@ if len(sys.argv) > 2:
 else:
     outfn = infn + ".db"
 
-db = gdbm.open(outfn, "n")
+db = @DBM@.open(outfn, "n")
 
 for ln in file(infn, "r"):
     ln = ln.strip(" \r\n\t")
diff --git a/service-type-database/service-types b/service-type-database/service-types
index 24f4d6a..6ede09d 100644
--- a/service-type-database/service-types
+++ b/service-type-database/service-types
@@ -30,32 +30,56 @@
 ### documentation. If you're looking for the correct service type to
 ### use for your application please refer to the URL mentioned above.
 
+
+# Devices
+
+_workstation._tcp:Workstation
+_workstation._tcp[de]:Arbeitsplatzrechner
+
+
+# Web
+
 _http._tcp:Web Site
 _http._tcp[de]:Web-Angebot
 
 _https._tcp:Secure Web Site
 _https._tcp[de]:Sicheres Web-Angebot
 
+_rss._tcp:Web Syndication RSS
+
+
+# Network
+
+_domain._udp:DNS Server
+_domain._udp[de]: DNS-Dienst
+
+_ntp._udp:NTP Time Server
+
+_smb._tcp:Microsoft Windows Network
+
+_airport._tcp:Apple AirPort
+
+
+# File and data access
+
 _ftp._tcp:FTP File Transfer
-_ftp._tcp[de]:FTP Dateifreigabe
+_ftp._tcp[de]:FTP-Dateifreigabe
 
-_h323._tcp:H.323 Telephony
-_h323._tcp[de]:H.323 Telefonie
+_webdav._tcp:WebDAV File Share
 
-_sip._udp:SIP Telephony
-_sip._udp[de]:SIP Telefonie
+_webdavs._tcp:Secure WebDAV File Share
 
-_ssh._tcp:SSH Remote Terminal
-_ssh._tcp[de]:SSH Fernzugriff
+_afpovertcp._tcp:Apple File Sharing
 
-_distcc._tcp:Distributed Compiler
-_distcc._tcp[de]:Verteilter Compiler
+_nfs._tcp:Network File System
 
-_daap._tcp:iTunes Audio Access
-_daap._tcp[de]:iTunes Audio-Zugriff
+_apt._tcp:APT Package Repository
 
-_domain._udp:DNS Server
-_domain._udp[de]: DNS Dienst
+
+# Remote access
+
+_ssh._tcp:SSH Remote Terminal
+_ssh._tcp[de]:SSH-Fernzugriff
 
 _imap._tcp:IMAP Mail Access
 
@@ -67,45 +91,86 @@ _sftp-ssh._tcp:SFTP File Transfer
 
 _telnet._tcp:Telnet Remote Terminal
 
-_presence._tcp:iChat Presence
-
-_webdav._tcp:WebDAV File Share
+_timbuktu._tcp:Timbuktu Remote Desktop Control
 
-_webdavs._tcp:Secure WebDAV File Share
 
-_workstation._tcp:Workstation
-_workstation._tcp[de]:Arbeitsplatzrechner
+# Printing
 
 _printer._tcp:UNIX Printer
 
-_afpovertcp._tcp:Apple File Sharing
-
 _pdl-datastream._tcp:PDL Printer
 
 _ipp._tcp:Internet Printer
 
-_rss._tcp:Web Syndication RSS
+
+# Multimedia
+
+_daap._tcp:iTunes Audio Access
+_daap._tcp[de]:iTunes Audio-Zugriff
 
 _dacp._tcp:iTunes Remote Control
 
 _realplayfavs._tcp:RealPlayer Shared Favorites
 
-_timbuktu._tcp:Timbuktu Remote Desktop Control
+_raop._tcp:AirTunes Remote Audio
+
+_rtsp._tcp:RTSP Realtime Streaming Server
+_rtp._udp:RTP Realtime Streaming Server
+
+_dpap._tcp:Digital Photo Sharing
+
+_pulse-server._tcp:PulseAudio Sound Server
+_pulse-sink._tcp:PulseAudio Sound Sink
+_pulse-source._tcp:PulseAudio Sound Source
+
+_mpd._tcp:Music Player Daemon
+
+
+# Communication, presence, working together
+
+_presence._tcp:iChat Presence
+
+_sip._udp:SIP Telephony
+_sip._udp[de]:SIP-Telefonie
+
+_h323._tcp:H.323 Telephony
+_h323._tcp[de]:H.323-Telefonie
+
+_presence_olpc._tcp:OLPC Presence
+
+_iax._udp:Asterisk Exchange
+
+_skype._tcp:Skype VoIP
 
 _see._tcp:SubEthaEdit Collaborative Text Editor
 
+_lobby._tcp:Gobby Collaborative Editor Session
+
+
+# Databases
+
 _postgresql._tcp:PostgreSQL Server
 
-_ksysguard._tcp:KDE System Guard
 
-_omni-bookmark._tcp:OmniWeb Bookmark Sharing
+# Development
+
+_svn._tcp:Subversion Revision Control
+
+_distcc._tcp:Distributed Compiler
+_distcc._tcp[de]:Verteilter Compiler
+
+
+# Vendor specific
 
 _MacOSXDupSuppress._tcp:MacOS X Duplicate Machine Suppression
 
-_lobby._tcp:Gobby Collaborative Editor Session
+_ksysguard._tcp:KDE System Guard
 
-_dpap._tcp:Digital Photo Sharing
+_omni-bookmark._tcp:OmniWeb Bookmark Sharing
 
-_skype._tcp:Skype VoIP
 
-_airport._tcp:Apple AirPort
+# Other
+
+_pgpkey-hkp._tcp:GnuPG/PGP HKP Key Server
+
+_ldap._tcp:LDAP Directory Server