From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 8 May 2007 21:57:32 +0000 (+0000)
Subject: rename "zssh" to "bssh" and "zvnc" to "bvnc" to avoid a name collision with an alread... 
X-Git-Tag: upstream/0.6.31~377
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=300f7ba9449afc23c2b0e23f7b4dba995452b44e;p=platform%2Fupstream%2Favahi.git

rename "zssh" to "bssh" and "zvnc" to "bvnc" to avoid a name collision with an already existing tool of the same name. (on request of the Debian people)


git-svn-id: file:///home/lennart/svn/public/avahi/trunk@1457 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe
---

diff --git a/avahi-ui/Makefile.am b/avahi-ui/Makefile.am
index da5eb01..c5ef64d 100644
--- a/avahi-ui/Makefile.am
+++ b/avahi-ui/Makefile.am
@@ -25,7 +25,7 @@ AM_CFLAGS+='-DDEBUG_TRAP=__asm__("int $$3")'
 desktopdir = $(datadir)/applications
 desktop_DATA = 
 
-EXTRA_DIST = zssh.desktop.in zvnc.desktop.in
+EXTRA_DIST = bssh.desktop.in bvnc.desktop.in
 
 
 if HAVE_GTK
@@ -56,22 +56,22 @@ libavahi_ui_la_SOURCES += ../avahi-utils/stdb.h ../avahi-utils/stdb.c
 libavahi_ui_la_CFLAGS += -DDATABASE_FILE=\"$(pkgdatadir)/service-types.db\"
 endif
 
-bin_PROGRAMS = zssh
-desktop_DATA += zssh.desktop zvnc.desktop
+bin_PROGRAMS = bssh
+desktop_DATA += bssh.desktop bvnc.desktop
 
-zssh_SOURCES = zssh.c
-zssh_CFLAGS = $(AM_CFLAGS) $(GTK20_CFLAGS)
-zssh_LDADD = $(AM_LDADD) $(GTK20_LIBS) ../avahi-client/libavahi-client.la ../avahi-common/libavahi-common.la libavahi-ui.la
+bssh_SOURCES = bssh.c
+bssh_CFLAGS = $(AM_CFLAGS) $(GTK20_CFLAGS)
+bssh_LDADD = $(AM_LDADD) $(GTK20_LIBS) ../avahi-client/libavahi-client.la ../avahi-common/libavahi-common.la libavahi-ui.la
 
 install-exec-local:
 	cd $(DESTDIR)/$(bindir) && \
-		rm -f zvnc && \
-		$(LN_S) zssh zvnc
+		rm -f bvnc && \
+		$(LN_S) bssh bvnc
 
-zssh.desktop: zssh.desktop.in
+bssh.desktop: bssh.desktop.in
 	sed -e 's,@bindir\@,$(bindir),g' $< > $@
 
-zvnc.desktop: zvnc.desktop.in
+bvnc.desktop: bvnc.desktop.in
 	sed -e 's,@bindir\@,$(bindir),g' $< > $@
 
 endif
diff --git a/avahi-ui/zssh.c b/avahi-ui/bssh.c
similarity index 99%
rename from avahi-ui/zssh.c
rename to avahi-ui/bssh.c
index b49d332..32b0ccb 100644
--- a/avahi-ui/zssh.c
+++ b/avahi-ui/bssh.c
@@ -42,7 +42,7 @@ int main(int argc, char*argv[]) {
 
     gtk_init(&argc, &argv);
 
-    if (g_str_has_suffix(argv[0], "zvnc")) {
+    if (g_str_has_suffix(argv[0], "bvnc")) {
         d = aui_service_dialog_new("Choose VNC server", NULL, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_CONNECT, GTK_RESPONSE_ACCEPT, NULL);
         aui_service_dialog_set_browse_service_types(AUI_SERVICE_DIALOG(d), "_rfb._tcp", NULL);
     } else {
diff --git a/avahi-ui/zssh.desktop.in b/avahi-ui/bssh.desktop.in
similarity index 92%
rename from avahi-ui/zssh.desktop.in
rename to avahi-ui/bssh.desktop.in
index 4571089..e1d043c 100644
--- a/avahi-ui/zssh.desktop.in
+++ b/avahi-ui/bssh.desktop.in
@@ -3,7 +3,7 @@ Version=1.0
 Encoding=UTF-8
 Name=Avahi SSH Server Browser
 Comment=Browse for Zeroconf-enabled SSH Servers
-Exec=@bindir@/zssh
+Exec=@bindir@/bssh
 Terminal=false
 Type=Application
 Icon=network-wired
diff --git a/avahi-ui/zvnc.desktop.in b/avahi-ui/bvnc.desktop.in
similarity index 92%
rename from avahi-ui/zvnc.desktop.in
rename to avahi-ui/bvnc.desktop.in
index cbeed4c..a7ce686 100644
--- a/avahi-ui/zvnc.desktop.in
+++ b/avahi-ui/bvnc.desktop.in
@@ -3,7 +3,7 @@ Version=1.0
 Encoding=UTF-8
 Name=Avahi VNC Server Browser
 Comment=Browse for Zeroconf-enabled VNC Servers
-Exec=@bindir@/zvnc
+Exec=@bindir@/bvnc
 Terminal=false
 Type=Application
 Icon=network-wired