Ethereal -> Wireshark

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@18370 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/gtk/gui_utils.c b/gtk/gui_utils.c
index 23f3239eb1ed990efc824df097210aef153ac12d..bba70067ec6b0eb5f89930a51e393dad6c9145fa 100644 (file)
--- a/gtk/gui_utils.c
+++ b/gtk/gui_utils.c
@@ -99,7 +99,7 @@ static gboolean window_geom_load(const gchar *name, window_geometry_t *geom);
    specified by the WM_NAME property of a window or the resource
    or class name specified by the WM_CLASS property and base the
    choice of icon for the window on one of those; WM_CLASS for
-   Wireshark's windows has a resource name of "ethereal" and a class
+   Wireshark's windows has a resource name of "wireshark" and a class
    name of "Wireshark".  However, the way that's done is window-manager-
    specific, and there's no way to determine what size a particular
    window manager would want, so there's no way to automate this as

diff --git a/packaging/rpm/SPECS/wireshark.spec.in b/packaging/rpm/SPECS/wireshark.spec.in
index c14913a5c51c9c86d1e3842ffc92dbbf1a31426e..1afa6d5b44c68d49df33ed19caced1d6645bcf95 100644 (file)
--- a/packaging/rpm/SPECS/wireshark.spec.in
+++ b/packaging/rpm/SPECS/wireshark.spec.in
@@ -22,7 +22,7 @@ Requires:     libpcap openssl
 Wireshark is a free network protocol analyzer for Unix and Windows. It
 allows you to examine data from a live network or from a capture file
 on disk. You can interactively browse the capture data, viewing summary
-and detail information for each packet. Ethereal has several powerful
+and detail information for each packet. Wireshark has several powerful
 features, including a rich display filter language and the ability to
 view the reconstructed stream of a TCP session.
 

diff --git a/packaging/svr4/checkinstall.in b/packaging/svr4/checkinstall.in
index d753fa8f084b553669c6b4c84132c4575147aa53..6777fcee290e4c59458c2bdb14a34f2b3688407f 100755 (executable)
--- a/packaging/svr4/checkinstall.in
+++ b/packaging/svr4/checkinstall.in
@@ -19,14 +19,14 @@ platform=`uname -p`
 expected_platform="@host_cpu@"
 
 if [ -x $GTK_CONFIG ] ; then
-  # First try the GTK location that was used to build ethereal.  This
+  # First try the GTK location that was used to build wireshark.  This
   # is probably the safest bet.
   gtk_installed=`$GTK_CONFIG --version`
   gtk_major_installed=`echo $gtk_installed | cut -f1 -d.`
   gtk_minor_installed=`echo $gtk_installed | cut -f2 -d.`
 elif gtk_installed=`gtk-config --version 2>&-`; then
   # Punt! 
-  # If gtk-config is in the $PATH then ethereal should install fine.
+  # If gtk-config is in the $PATH then wireshark should install fine.
   # Some modifications to $LD_LIBRARY_PATH (or non Solaris equivalent)
   # may be required by the user.  Should there be a warning here?
   gtk_major_installed=`echo $gtk_installed | cut -f1 -d.`

diff --git a/packaging/svr4/pkginfo.in b/packaging/svr4/pkginfo.in
index d866224c31769e5c6b5ff0a5655b033d5742dd39..eeffc13055addcbaec32be59901cb349f7669aab 100644 (file)
--- a/packaging/svr4/pkginfo.in
+++ b/packaging/svr4/pkginfo.in
@@ -5,7 +5,7 @@ ARCH="@host_cpu@"
 CLASSES="none"
 CATEGORY="application,network"
 DESC="A GUI network protocol analyzer"
-VENDOR="Ethereal Development Team"
+VENDOR="Wireshark Development Team"
 PSTAMP="2000-07-16"
 EMAIL="gerald@wireshark.org"
 ISTATES="S s 1 2 3"