Frederic Peters <fpeters@debian.org>:

	Update to match the current debian package


svn path=/trunk/; revision=18799

1 files changed, 30 insertions, 23 deletions

diff --git a/debian/control b/debian/control
index 6eba8448b0..1cf9379e28 100644
--- a/debian/control
+++ b/debian/control
@@ -1,59 +1,66 @@
-Source: ethereal
+Source: wireshark
 Section: net
 Priority: optional
 Maintainer: Frederic Peters <fpeters@debian.org>
-Standards-Version: 3.6.1.0
-Build-Depends: libgtk2.0-dev (>=2.4.0-0), libpcap0.8-dev, flex, libz-dev, dpatch, debhelper (>= 3.0), libtool, python, automake, autoconf, autotools-dev, libadns1-dev, xsltproc, docbook-xsl (>= 1.64.1.0-0), libpcre3-dev, libcap-dev
-Build-Conflicts: libsnmp4.2-dev, libsnmp5-dev
+Standards-Version: 3.7.2.0
+Build-Depends: libgtk2.0-dev (>=2.4.0-0), libpcap0.8-dev, flex, libz-dev, dpatch, debhelper (>= 3.0), libtool, python, automake1.9, autoconf, autotools-dev, libadns1-dev, xsltproc, docbook-xsl (>= 1.64.1.0-0), libpcre3-dev, libcap-dev, bison, libgnutls-dev
+Build-Conflicts: libsnmp4.2-dev, libsnmp-dev
 
-Package: ethereal-common
+Package: wireshark-common
 Architecture: any
 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)
+Recommends: wireshark (>= ${Source-Version}) | tshark (>= ${Source-Version})
+Replaces: ethereal-common
+Conflicts: ethereal-common
 Description: network traffic analyser (common files)
  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
+ packets off the wire. Wireshark decodes numerous protocols (too many
  to list).
  .
- This package provides files common to both ethereal (the GTK+ version)
- and tethereal (the console version).
+ This package provides files common to both wireshark (the GTK+ version)
+ and tshark (the console version).
 
-Package: ethereal
+Package: wireshark
 Architecture: any
-Depends: ${shlibs:Depends}, ethereal-common (= ${Source-Version})
+Depends: ${shlibs:Depends}, wireshark-common (= ${Source-Version})
 Recommends: gksu
+Replaces: ethereal
+Conflicts: ethereal
 Description: network traffic analyzer
  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
+ packets off the wire. Wireshark decodes numerous protocols (too many
  to list).
  .
- This package provides ethereal (the GTK+ version)
+ This package provides wireshark (the GTK+ version)
 
-Package: tethereal
+Package: tshark
 Architecture: any
-Depends: ${shlibs:Depends}, ethereal-common (= ${Source-Version})
+Depends: ${shlibs:Depends}, wireshark-common (= ${Source-Version})
+Replaces: tethereal
+Conflicts: tethereal
 Description: network traffic analyzer (console)
  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
+ packets off the wire. Wireshark decodes numerous protocols (too many
  to list).
  .
- This package provides the console version of ethereal, named
- "tethereal".
+ This package provides the console version of wireshark, named
+ "tshark".
 
-Package: ethereal-dev
+Package: wireshark-dev
 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
+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.8, autoconf
+Replaces: ethereal-dev
+Conflicts: ethereal-dev
 Description: network traffic analyser (development tools)
  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
+ packets off the wire. Wireshark decodes numerous protocols (too many
  to list).
  .
- This package provides idl2eth and other necessary files to develop
+ This package provides idl2wrs and other necessary files to develop
  new packet dissectors.