Transform ethereal.ico to wireshark.ico. Update references accordingly.

Change the name of the Windows package to "wireshark-setup-..."  Other
Ethereal -> Wireshark updates.

We _really_ need a better Wireshark icon.

svn path=/trunk/; revision=18253

10 files changed, 13 insertions, 13 deletions

diff --git a/image/capinfos.rc.in b/image/capinfos.rc.in
index cb0c36b2e8..9311fae68c 100644
--- a/image/capinfos.rc.in
+++ b/image/capinfos.rc.in
@@ -1,6 +1,6 @@
 #include "winver.h"
 
-ETHEREAL_ICON		ICON			"ethereal.ico"
+WIRESHARK_ICON		ICON			"wireshark.ico"
 
 VS_VERSION_INFO VERSIONINFO
  FILEVERSION @RC_VERSION@,0
diff --git a/image/dumpcap.rc.in b/image/dumpcap.rc.in
index 69ca43fac1..96df2cfaa1 100644
--- a/image/dumpcap.rc.in
+++ b/image/dumpcap.rc.in
@@ -1,6 +1,6 @@
 #include "winver.h"
 
-ETHEREAL_ICON		ICON			"ethereal.ico"
+WIRESHARK_ICON		ICON			"wireshark.ico"
 
 VS_VERSION_INFO VERSIONINFO
  FILEVERSION @RC_VERSION@,0
diff --git a/image/editcap.rc.in b/image/editcap.rc.in
index 02f84690a0..e5dbb80299 100644
--- a/image/editcap.rc.in
+++ b/image/editcap.rc.in
@@ -1,6 +1,6 @@
 #include "winver.h"
 
-ETHEREAL_ICON		ICON			"ethereal.ico"
+WIRESHARK_ICON		ICON			"wireshark.ico"
 
 VS_VERSION_INFO VERSIONINFO
  FILEVERSION @RC_VERSION@,0
diff --git a/image/ethereal.rc.in b/image/ethereal.rc.in
index 7b3226d502..cc3cf5c19b 100644
--- a/image/ethereal.rc.in
+++ b/image/ethereal.rc.in
@@ -2,7 +2,7 @@
 
 #include "image/win32-file-dlg.rc"
 
-ETHEREAL_ICON		ICON			"ethereal.ico"
+WIRESHARK_ICON		ICON			"wireshark.ico"
 
 VS_VERSION_INFO VERSIONINFO
  FILEVERSION @RC_VERSION@,0
diff --git a/image/libethereal.rc.in b/image/libethereal.rc.in
index 89b35d1f4d..181023f01e 100644
--- a/image/libethereal.rc.in
+++ b/image/libethereal.rc.in
@@ -17,13 +17,13 @@ BEGIN
     BEGIN
         BLOCK "040904b0"
         BEGIN
-            VALUE "CompanyName", "The Wireshark developer community, http://www.ethereal.com/\0"
-            VALUE "FileDescription", "Ethereal dissector library\0"
+            VALUE "CompanyName", "The Wireshark developer community, http://www.wireshark.org/\0"
+            VALUE "FileDescription", "Wireshark dissector library\0"
             VALUE "FileVersion", "@VERSION@\0"
             VALUE "InternalName", "libethereal @VERSION@\0"
             VALUE "LegalCopyright", "Copyright © 2000 Gerald Combs <gerald@wireshark.org>, Gilbert Ramirez <gram@alumni.rice.edu> and others\0"
             VALUE "OriginalFilename", "libethereal.dll\0"
-            VALUE "ProductName", "Ethereal\0"
+            VALUE "ProductName", "Wireshark\0"
             VALUE "ProductVersion", "@VERSION@\0"
         END
     END
diff --git a/image/mergecap.rc.in b/image/mergecap.rc.in
index 8a2b1d6441..c5c468431c 100644
--- a/image/mergecap.rc.in
+++ b/image/mergecap.rc.in
@@ -1,6 +1,6 @@
 #include "winver.h"
 
-ETHEREAL_ICON		ICON			"ethereal.ico"
+WIRESHARK_ICON		ICON			"wireshark.ico"
 
 VS_VERSION_INFO VERSIONINFO
  FILEVERSION @RC_VERSION@,0
diff --git a/image/tethereal.rc.in b/image/tethereal.rc.in
index a71b59c5ba..2595fc477f 100644
--- a/image/tethereal.rc.in
+++ b/image/tethereal.rc.in
@@ -1,6 +1,6 @@
 #include "winver.h"
 
-ETHEREAL_ICON		ICON			"ethereal.ico"
+WIRESHARK_ICON		ICON			"wireshark.ico"
 
 VS_VERSION_INFO VERSIONINFO
  FILEVERSION @RC_VERSION@,0
diff --git a/image/text2pcap.rc.in b/image/text2pcap.rc.in
index 0362f7625b..7ab2a431e7 100644
--- a/image/text2pcap.rc.in
+++ b/image/text2pcap.rc.in
@@ -1,6 +1,6 @@
 #include "winver.h"
 
-ETHEREAL_ICON		ICON			"ethereal.ico"
+WIRESHARK_ICON		ICON			"wireshark.ico"
 
 VS_VERSION_INFO VERSIONINFO
  FILEVERSION @RC_VERSION@,0
diff --git a/image/ethereal.ico b/image/wireshark.ico
index bc3ea34d6a..a543b1ce8a 100644
--- a/image/ethereal.ico
+++ b/image/wireshark.ico
diff --git a/image/wiretap.rc.in b/image/wiretap.rc.in
index 7d1dfe6023..b0cbbe0c5c 100644
--- a/image/wiretap.rc.in
+++ b/image/wiretap.rc.in
@@ -17,13 +17,13 @@ BEGIN
     BEGIN
         BLOCK "040904b0"
         BEGIN
-            VALUE "CompanyName", "The Wireshark developer community, http://www.ethereal.com/\0"
-            VALUE "FileDescription", "Ethereal capture file library\0"
+            VALUE "CompanyName", "The Wireshark developer community, http://www.wireshark.org/\0"
+            VALUE "FileDescription", "Wireshark capture file library\0"
             VALUE "FileVersion", "@VERSION@\0"
             VALUE "InternalName", "wiretap @VERSION@\0"
             VALUE "LegalCopyright", "Copyright © 2000 Gerald Combs <gerald@wireshark.org>, Gilbert Ramirez <gram@alumni.rice.edu> and others\0"
             VALUE "OriginalFilename", "wiretap-@VERSION@.dll\0"
-            VALUE "ProductName", "Ethereal\0"
+            VALUE "ProductName", "Wireshark\0"
             VALUE "ProductVersion", "@VERSION@\0"
         END
     END