debian/control: Move the Wireshark gubbins back to general `Build-Depends'.

[tripe] / debian / control

diff --git a/debian/control b/debian/control
index 5952862..43dbc17 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -3,12 +3,12 @@ Section: net
 Priority: extra
 Maintainer: Mark Wooding <mdw@distorted.org.uk>
 XS-Python-Version: >= 2.4
-Build-Depends: debhelper (>= 9), pkg-config, curl, rsync, python-central,
+Build-Depends: debhelper (>= 9), pkg-config, curl, rsync,
        tshark, wireshark-dev (>= 1.12.1),
+       python (>= 2.6.6-3~),
        mlib-dev (>= 2.2.2),
-       catacomb-dev (>= 2.4.0), catacomb-bin (>= 2.1.4)
-Build-Depends-Indep: python,
-       python-cdb, python-gtk2,
+       catacomb-dev (>= 2.4.2+70), catacomb-bin (>= 2.1.4)
+Build-Depends-Indep: python-cdb, python-gtk2,
        python-mlib (>= 1.0.2), python-catacomb (>= 1.2.0)
 Standards-Version: 3.1.1
 
@@ -55,25 +55,13 @@ Description: Trivial IP Encryption: a simple virtual private network
  scripts and is useful for testing.  `If in doubt, say N here.'
 
 Package: tripe-wireshark
-Architecture: any
-Depends: wireshark-common (= ${tripe:Wireshark-Version}), ${shlibs:Depends}
-Description: Trivial IP Encryption: a simple virtual private network
- TrIPE is a simple VPN protocol.  It uses cryptography to ensure secrecy
- and authenticity of packets it sends and receives.
- .
- This package contains the protocol analysis plug-in for Wireshark (the new
- name for Ethereal).
-
-Package: tripe-ethereal
 Architecture: all
-Depends: tripe-wireshark
+Depends: wireshark-common (= ${tripe:Wireshark-Version})
 Description: Trivial IP Encryption: a simple virtual private network
  TrIPE is a simple VPN protocol.  It uses cryptography to ensure secrecy
  and authenticity of packets it sends and receives.
  .
- This is a dummy package to ease the transition to tripe-wireshark (since
- Wireshark is apparently the new name for Ethereal).  You should probably
- remove this package.
+ This package contains the protocol analysis plug-in for Wireshark.
 
 Package: tripemon
 Architecture: all