From Frederic Peters:

Update of de Debian Packaging files from 0.99.2 to 0.99.6pre1.

svn path=/trunk/; revision=22238

1 files changed, 68 insertions, 13 deletions

diff --git a/debian/control b/debian/control
index 1cf9379e28..7f06adb691 100644
--- a/debian/control
+++ b/debian/control
@@ -3,15 +3,16 @@ Section: net
 Priority: optional
 Maintainer: Frederic Peters <fpeters@debian.org>
 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-Depends: libgtk2.0-dev (>=2.4.0-0), libpcap0.8-dev, flex, libz-dev, dpatch, debhelper (>= 5.0.37.2), libtool, python, automake1.9, autoconf, autotools-dev, libadns1-dev, xsltproc, docbook-xsl (>= 1.64.1.0-0), libpcre3-dev, libcap-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], bison, libgnutls-dev, python-support (>= 0.3), libportaudio-dev, libkrb5-dev
 Build-Conflicts: libsnmp4.2-dev, libsnmp-dev
+XS-Python-Version: all
 
 Package: wireshark-common
 Architecture: any
 Depends: ${shlibs:Depends}
-Recommends: wireshark (>= ${Source-Version}) | tshark (>= ${Source-Version})
-Replaces: ethereal-common
-Conflicts: ethereal-common
+Recommends: wireshark (>= ${binary:Version}) | tshark (>= ${binary:Version})
+Replaces: ethereal-common (<< 0.99.2-0)
+Conflicts: ethereal-common (<< 0.99.2-0)
 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 
@@ -23,10 +24,10 @@ Description: network traffic analyser (common files)
 
 Package: wireshark
 Architecture: any
-Depends: ${shlibs:Depends}, wireshark-common (= ${Source-Version})
+Depends: ${shlibs:Depends}, wireshark-common (= ${binary:Version})
 Recommends: gksu
-Replaces: ethereal
-Conflicts: ethereal
+Replaces: ethereal (<< 0.99.2-0)
+Conflicts: ethereal (<< 0.99.2-0)
 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 
@@ -37,9 +38,9 @@ Description: network traffic analyzer
 
 Package: tshark
 Architecture: any
-Depends: ${shlibs:Depends}, wireshark-common (= ${Source-Version})
-Replaces: tethereal
-Conflicts: tethereal
+Depends: ${shlibs:Depends}, wireshark-common (= ${binary:Version})
+Replaces: tethereal (<< 0.99.2-0)
+Conflicts: tethereal (<< 0.99.2-0)
 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 
@@ -52,9 +53,10 @@ Description: network traffic analyzer (console)
 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.8, autoconf
-Replaces: ethereal-dev
-Conflicts: ethereal-dev
+Depends: ${shlibs:Depends}, omniidl (>> 1:3.0.4.1-10) | omniidl4 (>= 4.0.1-2) , libpcap0.8-dev, libtool, libglib2.0-dev, ${python:Depends}, snacc, autotools-dev, debhelper, cdbs, automake1.8, autoconf
+Replaces: ethereal-dev (<< 0.99.2-0)
+Conflicts: ethereal-dev (<< 0.99.2-0)
+XB-Python-Version: ${python:Versions}
 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 
@@ -64,3 +66,56 @@ Description: network traffic analyser (development tools)
  This package provides idl2wrs and other necessary files to develop
  new packet dissectors.
 
+Package: ethereal-common
+Architecture: any
+Depends: wireshark-common (= ${binary:Version})
+Description: dummy upgrade package for ethereal -> wireshark
+ 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. Wireshark decodes numerous protocols (too many
+ to list).
+ .
+ It was previously named ethereal.  This is a transitional package
+ so ethereal users get wireshark on upgrades.  This package handles
+ ethereal-common -> wireshark-common.  It can be safely removed.
+
+Package: ethereal-dev
+Architecture: any
+Section: devel
+Depends: wireshark-dev (= ${binary:Version})
+Description: dummy upgrade package for ethereal -> wireshark
+ 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. Wireshark decodes numerous protocols (too many
+ to list).
+ .
+ It was previously named ethereal.  This is a transitional package
+ so ethereal users get wireshark on upgrades.  This package handles
+ ethereal-dev -> wireshark-dev.  It can be safely removed.
+
+Package: ethereal
+Architecture: any
+Depends: wireshark (= ${binary:Version})
+Description: dummy upgrade package for ethereal -> wireshark
+ 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. Wireshark decodes numerous protocols (too many
+ to list).
+ .
+ It was previously named ethereal.  This is a transitional package
+ so ethereal users get wireshark on upgrades.  This package handles
+ ethereal -> wireshark.  It can be safely removed.
+
+Package: tethereal
+Architecture: any
+Depends: tshark (= ${binary:Version})
+Description: dummy upgrade package for ethereal -> wireshark
+ 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. Wireshark decodes numerous protocols (too many
+ to list).
+ .
+ It was previously named ethereal.  This is a transitional package
+ so ethereal users get wireshark on upgrades.  This package handles
+ tethereal -> tshark.  It can be safely removed.
+