ethereal->wireshark updates

svn path=/trunk/; revision=18206

5 files changed, 10 insertions, 10 deletions

diff --git a/debian/changelog b/debian/changelog
index bb293fcec2..5e49da253d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -291,13 +291,13 @@ ethereal (0.10.3-1) unstable; urgency=high
     (closes: #71994)
   * added another .desktop entry to start ethereal with gksu from Gnome menu
   * Upstream changes; libethereal and libwiretap handled differently; they may
-    end up in new packages (but go in ethereal-common for now)
+    end up in new packages (but go in wireshark-common for now)
 
  -- Frederic Peters <fpeters@debian.org>  Sat, 27 Mar 2004 14:09:49 +0100
 
 ethereal (0.10.2-2) unstable; urgency=low
 
-  * New files in ethereal-dev (closes: #236702)
+  * New files in wireshark-dev (closes: #236702)
 
  -- Frederic Peters <fpeters@debian.org>  Sun,  7 Mar 2004 21:43:17 +0100
 
diff --git a/debian/control b/debian/control
index fff1d04797..6eba8448b0 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,7 @@ Depends: ${shlibs:Depends}
 Recommends: ethereal (>= 0.9.1-3) | tethereal (>= 0.9.1-3)
 Conflicts: ethereal (<< 0.9.1-3), tethereal (<< 0.9.1-3)
 Description: network traffic analyser (common files)
- Ethereal is a network traffic analyzer, or "sniffer", for Unix and
+ Wireshark is a network traffic analyzer, or "sniffer", for Unix and
  Unix-like operating systems. A sniffer is a tool used to capture 
  packets off the wire. Ethereal decodes numerous protocols (too many
  to list).
@@ -25,7 +25,7 @@ Architecture: any
 Depends: ${shlibs:Depends}, ethereal-common (= ${Source-Version})
 Recommends: gksu
 Description: network traffic analyzer
- Ethereal is a network traffic analyzer, or "sniffer", for Unix and
+ Wireshark is a network traffic analyzer, or "sniffer", for Unix and
  Unix-like operating systems. A sniffer is a tool used to capture 
  packets off the wire. Ethereal decodes numerous protocols (too many
  to list).
@@ -36,7 +36,7 @@ Package: tethereal
 Architecture: any
 Depends: ${shlibs:Depends}, ethereal-common (= ${Source-Version})
 Description: network traffic analyzer (console)
- Ethereal is a network traffic analyzer, or "sniffer", for Unix and
+ Wireshark is a network traffic analyzer, or "sniffer", for Unix and
  Unix-like operating systems. A sniffer is a tool used to capture 
  packets off the wire. Ethereal decodes numerous protocols (too many
  to list).
@@ -49,7 +49,7 @@ Architecture: any
 Section: devel
 Depends: ${shlibs:Depends}, omniidl (>> 1:3.0.4.1-10) | omniidl4 (>= 4.0.1-2) , libpcap0.8-dev, libtool, libglib2.0-dev, python, snacc, autotools-dev, debhelper, cdbs, automake1.7, autoconf
 Description: network traffic analyser (development tools)
- Ethereal is a network traffic analyzer, or "sniffer", for Unix and
+ Wireshark is a network traffic analyzer, or "sniffer", for Unix and
  Unix-like operating systems. A sniffer is a tool used to capture 
  packets off the wire. Ethereal decodes numerous protocols (too many
  to list).
diff --git a/debian/patches/01_idl2deb.dpatch b/debian/patches/01_idl2deb.dpatch
index 576af123de..e233204886 100644
--- a/debian/patches/01_idl2deb.dpatch
+++ b/debian/patches/01_idl2deb.dpatch
@@ -12,7 +12,7 @@ diff -urNad --exclude=CVS --exclude=.svn ./idl2deb /tmp/dpep-work.K2bQz4/etherea
 +#!/usr/bin/env python
 +
 +# idl2deb - quick hack by W. Borgert <debacle@debian.org> to create
-+# Debian GNU/Linux packages from idl2eth modules for Ethereal.
++# Debian GNU/Linux packages from idl2eth modules for Wireshark.
 +# Copyright 2003, W. Borgert
 +
 +# Makefile.am and configure.ac code by:
diff --git a/debian/patches/02_asn2deb.dpatch b/debian/patches/02_asn2deb.dpatch
index d4a0d39830..51e81c54b3 100644
--- a/debian/patches/02_asn2deb.dpatch
+++ b/debian/patches/02_asn2deb.dpatch
@@ -12,10 +12,10 @@ diff -urNad --exclude=CVS --exclude=.svn ./asn2deb /tmp/dpep-work.5BSR7A/etherea
 +#!/usr/bin/env python
 +
 +# asn2deb - quick hack by W. Borgert <debacle@debian.org> to create
-+# Debian GNU/Linux packages from ASN.1 files for Ethereal.
++# Debian GNU/Linux packages from ASN.1 files for Wireshark.
 +# Copyright 2004, W. Borgert
 +
-+# ASN.1 module for Ethereal, use of snacc type table:
++# ASN.1 module for Wireshark, use of snacc type table:
 +# Copyright 2003, Matthijs Melchior <matthijs.melchior@xs4all.nl>
 +#
 +# Wireshark - Network traffic analyzer
diff --git a/debian/patches/09_idl2eth.dpatch b/debian/patches/09_idl2eth.dpatch
index 9b29b179fa..4277d4d5b5 100644
--- a/debian/patches/09_idl2eth.dpatch
+++ b/debian/patches/09_idl2eth.dpatch
@@ -13,7 +13,7 @@ diff -urNad --exclude=CVS --exclude=.svn ./idl2eth.sh /tmp/dpep-work.ZF6eGD/ethe
  fi
  
 -#
--# Run ethereal backend, looking for ethereal_be.py and ethereal_gen.py
+-# Run wireshark backend, looking for ethereal_be.py and ethereal_gen.py
 -# in pythons's "site-packages" directory. If cannot find that, then
 -# try looking in current directory. If still cannot, then exit with
 -# error.