debian/control: Fix the dependencies.

  * Fix up the Build-Depends.  The Python requirements for the
    architecture-independent packages are quite heavy, so split out
    Build-Depends-Indep.

  * Add detailed version information to the various build and runtime
    dependencies.

  * Observe that `tripe-keys' depends on curl(1) to run, so we need it
    at build time for testing, and the `tripe-keys' package needs it at
    runtime.

diff --git a/debian/control b/debian/control
index 976964bf8993ae6d67b53f0c985b398e8ef6ce59..eb944af563052d68f8ac4c22198ac9c418dc865d 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -3,9 +3,13 @@ Section: net
 Priority: extra
 Maintainer: Mark Wooding <mdw@distorted.org.uk>
 XS-Python-Version: >= 2.4
 Priority: extra
 Maintainer: Mark Wooding <mdw@distorted.org.uk>
 XS-Python-Version: >= 2.4

-Build-Depends: catacomb-dev (>= 2.1.4), mlib-dev (>= 2.2.2),
- tshark, wireshark-dev (>= 0.10.10), debhelper (>= 9),
- python-central
+Build-Depends: debhelper (>= 9), pkg-config, curl, rsync, python-central,
+       tshark, wireshark-dev (>= 0.10.10),
+       mlib-dev (>= 2.2.2),
+       catacomb-dev (>= 2.1.4), catacomb-bin (>= 2.1.4)
+Build-Depends-Indep: python,
+       python-cdb, python-gtk2,
+       python-mlib (>= 1.0.2), python-catacomb (>= 1.1.0)

 Standards-Version: 3.1.1
 
 Package: tripe
 Standards-Version: 3.1.1
 
 Package: tripe


@@ -73,7 +77,8 @@ Description: Trivial IP Encryption: a simple virtual private network
 
 Package: tripemon
 Architecture: all
 
 Package: tripemon
 Architecture: all

-Depends: python (>= 2.4), python-gtk2 (>= 2.6), tripe
+Depends: python (>= 2.4), python-gtk2 (>= 2.6),
+       python-mlib (>= 1.0.2), tripe, python-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.
 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.


@@ -83,7 +88,7 @@ Description: Trivial IP Encryption: a simple virtual private network
 
 Package: python-tripe
 Architecture: all
 
 Package: python-tripe
 Architecture: all

-Depends: ${python:Depends}, python-mlib, tripe
+Depends: ${python:Depends}, python-mlib (>= 1.0.2), tripe

 Recommends: python-codespeak-lib
 XB-Python-Version: ${python:Versions}
 Description: Trivial IP Encryption: a simple virtual private network
 Recommends: python-codespeak-lib
 XB-Python-Version: ${python:Versions}
 Description: Trivial IP Encryption: a simple virtual private network


@@ -100,8 +105,8 @@ Description: Trivial IP Encryption: a simple virtual private network
 
 Package: tripe-peer-services
 Architecture: all
 
 Package: tripe-peer-services
 Architecture: all

-Depends: python (>= 2.4), python-mlib, tripe, python-cdb, python-tripe,
-       pathmtu, iproute
+Depends: python (>= 2.4), python-cdb, iproute, python-mlib (>= 1.0.2),
+       tripe, python-tripe, pathmtu

 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.
 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.


@@ -113,7 +118,8 @@ Description: Trivial IP Encryption: a simple virtual private network
 
 Package: tripe-keys
 Architecture: all
 
 Package: tripe-keys
 Architecture: all

-Depends: python (>= 2.4), tripe, catacomb-bin, python-catacomb
+Depends: python (>= 2.4), curl, tripe,
+       catacomb-bin, python-catacomb (>= 1.1.0)

 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.
 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.