cleanup: Whitespaces fixes, left right and centre.

[tripe] / debian / control

diff --git a/debian/control b/debian/control
index 4386a9a3a30c0c306dcfab504ebf385848905d40..615e021a0837ff33987ac98f555344484fbe0361 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -1,9 +1,9 @@
 Source: tripe
 Section: net
 Priority: extra
-Maintainer: Mark Wooding <mdw@nsict.org>
+Maintainer: Mark Wooding <mdw@distorted.org.uk>
 Build-Depends: catacomb-dev (>= 2.1.0), mlib-dev (>= 2.0.3),
- tethereal, ethereal-dev (>= 0.10.10), debhelper (>= 4.0.2)
+ tshark, wireshark-dev (>= 0.10.10), debhelper (>= 4.0.2)
 Standards-Version: 3.1.1
 
 Package: tripe
@@ -15,7 +15,7 @@ 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 main daemon, support programs, and documentation. 
+ This package contains the main daemon, support programs, and documentation.
  It ideally wants a 2.4 series kernel with the TUN/TAP driver enabled, but
  it will work with any kernel which speaks SLIP.
 
@@ -27,13 +27,44 @@ Description: Forward UDP packets over a stream
  Pkstream is a simple program which transmits and receives UDP datagrams
  over a reliable stream.  By default, it will send and receive the
  packets on standard input and output; it also natively understands TCP
- sockets.  Anything else can probably be fudged up with port forwarder.
+ sockets.  Anything else can probably be fudged up with a port forwarder.
 
-Package: tripe-ethereal
+Package: tripe-wireshark
 Architecture: any
-Depends: ${shlibs:Depends}, ethereal-common (= ${tripe:Ethereal-Version})
+Depends: ${shlibs: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 package contains the protocol analysis plug-in for Wireshark (the new
+ name for Ethereal).
+
+Package: tripe-ethereal
+Architecture: all
+Depends: tripe-wireshark
+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.
+
+Package: tripemon
+Architecture: all
+Depends: python (>= 2.3), python-gtk2 (>= 2.6), tripe
+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 a graphical monitor program for managing and
+ keeping an eye on a TrIPE server.
+
+Package: tripe-keys
+Architecture: all
+Depends: python (>= 2.3), tripe, catacomb-bin, python-catacomb
 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 Ethereal.
+ This package contains a tool for centrally managing TrIPE keys.