From 5e401ee6a8f1c0d0a84e9e239c47f50607e4c093 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 25 Jun 2010 03:57:24 +0200
Subject: service-type-db: add Window Shifter protocol (See #308)

---
 service-type-database/Makefile.am   | 16 ++++++++--------
 service-type-database/service-types |  6 ++++--
 2 files changed, 12 insertions(+), 10 deletions(-)

(limited to 'service-type-database')

diff --git a/service-type-database/Makefile.am b/service-type-database/Makefile.am
index 6419ba7..fa1bd40 100644
--- a/service-type-database/Makefile.am
+++ b/service-type-database/Makefile.am
@@ -27,12 +27,12 @@ noinst_SCRIPTS=build-db
 pkglib_DATA+=service-types.db
 
 build-db: build-db.in
-	sed -e 's,@PYTHON\@,$(PYTHON),g' \
-	    -e 's,@DBM\@,gdbm,g' $< > $@
+	$(AM_V_GEN)sed -e 's,@PYTHON\@,$(PYTHON),g' \
+	    -e 's,@DBM\@,gdbm,g' $< > $@ && \
 	chmod +x $@
 
 service-types.db: service-types build-db
-	$(PYTHON) build-db $< $@.coming
+	$(AM_V_GEN)$(PYTHON) build-db $< $@.coming && \
 	mv $@.coming $@
 
 CLEANFILES = service-types.db build-db
@@ -44,16 +44,16 @@ noinst_SCRIPTS=build-db
 pkglib_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' $< > $@
+	$(AM_V_GEN)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
+	$(AM_V_GEN)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
+	$(AM_V_GEN)mv service-types.db.coming.dir service-types.db.dir
 service-types.db: service-types build-db
-	$(PYTHON) build-db $< $@.coming
+	$(AM_V_GEN)$(PYTHON) build-db $< $@.coming && \
 	if test -f "$@.coming"; then mv $@.coming $@; fi
 
 CLEANFILES = service-types.db* build-db
diff --git a/service-type-database/service-types b/service-type-database/service-types
index 934c968..efdce07 100644
--- a/service-type-database/service-types
+++ b/service-type-database/service-types
@@ -20,7 +20,7 @@
 # available database unless its license is known and compatible with
 # our project! The database available on
 #
-#         http://www.dns-sd.org/ServiceTypes.html 
+#         http://www.dns-sd.org/ServiceTypes.html
 #
 # is not a source that complies with the criterion!
 
@@ -92,7 +92,7 @@ _ssh._tcp[de]:SSH-Fernzugriff
 _ssh._tcp[it]:SSH Terminale remoto
 
 _rfb._tcp:VNC Remote Access
-_rfb._tcp[it]:Controllo remoto VNC 
+_rfb._tcp[it]:Controllo remoto VNC
 
 _telnet._tcp:Telnet Remote Terminal
 _telnet._tcp[it]:Telnet Terminale Remoto
@@ -214,3 +214,5 @@ _tp._tcp:Thousand Parsec Server
 _tps._tcp:Thousand Parsec Server (Secure)
 _tp-http._tcp:Thousand Parsec Server (HTTP Tunnel)
 _tp-https._tcp:Thousand Parsec Server (Secure HTTP Tunnel)
+
+_shifter._tcp: Window Shifter
-- 
cgit