Hacking for the fremantle build.

diff --git a/debian/control b/debian/control
index aaa36c1..91038da 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -4,8 +4,7 @@ Priority: extra
 Maintainer: Mark Wooding <mdw@distorted.org.uk>
 XS-Python-Version: >= 2.4
 Build-Depends: catacomb-dev (>= 2.1.1), mlib-dev (>= 2.0.4),
- tshark, wireshark-dev (>= 0.10.10), debhelper (>= 4.0.2),
- python-central
+ debhelper (>= 4.0.2), python-central
 Standards-Version: 3.1.1
 
 Package: tripe
@@ -50,37 +49,6 @@ Description: Trivial IP Encryption: a simple virtual private network
  The tripe-uslip tool provides a fake SLIP tunnel which can be driven from
  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
-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.4), 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: python-tripe
 Architecture: all
 Depends: ${python:Depends}, python-mlib, tripe

diff --git a/debian/rules b/debian/rules
index 7cc8074..939f5fc 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -25,7 +25,7 @@ DEB_CONFIGURE_EXTRA_FLAGS = \
        --with-logfile="/var/log/tripe.log" \
        --with-pidfile="/var/run/tripectl.pid" \
        --with-initconfig="/etc/default/tripe" \
-       --with-wireshark
+       PYTHON=/usr/bin/python2.5
 
 ###--------------------------------------------------------------------------
 ### Python.