Merge branch 'master' of metalzone.distorted.org.uk:~mdw/public-git/tripe

* 'master' of metalzone.distorted.org.uk:~mdw/public-git/tripe:
  debian/changelog: Another version.
  Disassociate public key tags from peer names.
  svc/conntrack: Make the kickpeers coroutine more robust.
  svc/conntrack.8.in: Document the D-Bus connection state notifications.
  peerdb/peers.in.5.in: Fix formatting.

Conflicts:
	debian/changelog

diff --git a/debian/changelog b/debian/changelog
index 2a7576f..03aa001 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,17 @@
-tripe (1.0.0pre9) experimental; urgency=low
+tripe (1.0.0pre9maemo1) experimental; urgency=low
 
   * Make conntrack rather more robust against errors.
   * Logically separate key tags from peer names.
 
  -- Mark Wooding <mdw@distorted.org.uk>  Mon, 17 May 2010 20:27:33 +0100
 
+tripe (1.0.0pre8.1maemo1) experimental; urgency=low
+
+  * Maemo-specific hacking: remove GUI stuff and Wireshark integration;
+    force Python version (to avoid bogus ancient Scratchbox version).
+
+ -- Mark Wooding <mdw@distorted.org.uk>  Sat, 15 May 2010 21:07:19 +0100
+
 tripe (1.0.0pre8.1) experimental; urgency=low
 
   * Whoops.  conntrack was almost completely broken.  Fix it a lot.

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.

diff --git a/init/Makefile.am b/init/Makefile.am
index e8d662d..262ba81 100644 (file)
--- a/init/Makefile.am
+++ b/init/Makefile.am
@@ -44,7 +44,7 @@ tripe-init: tripe-init.in Makefile
 EXTRA_DIST             += tripe.conf
 install-data-local:: tripe.conf
        initconfig=$(initconfig) && dir=$${initconfig%/*} && \
-               $(MKDIR_P) $(DESTDIR)$$dir
+               $(mkdir_p) $(DESTDIR)$$dir
        test -f $(DESTDIR)$(initconfig) || \
                $(INSTALL_SCRIPT) $(srcdir)/tripe.conf \
                        $(DESTDIR)$(initconfig)
@@ -54,7 +54,7 @@ uninstall-local::
 ## Necessary directories.
 install-data-hook::
        for i in "$(configdir)" "$(socketdir)"; do \
-         case "$$i" in /*) $(MKDIR_P) $(DESTDIR)$$i ;; esac; \
+         case "$$i" in /*) $(mkdir_p) $(DESTDIR)$$i ;; esac; \
        done
 
 ###----- That's all, folks --------------------------------------------------

diff --git a/peerdb/Makefile.am b/peerdb/Makefile.am
index c606474..5e915cd 100644 (file)
--- a/peerdb/Makefile.am
+++ b/peerdb/Makefile.am
@@ -57,7 +57,7 @@ EXTRA_DIST            += tripe-newpeers.8.in
 EXTRA_DIST             += peers.in
 
 install-data-local:: peers.in
-       $(MKDIR_P) $(DESTDIR)$(configdir)/peers.d
+       $(mkdir_p) $(DESTDIR)$(configdir)/peers.d
        $(INSTALL_DATA) $(srcdir)/peers.in \
                $(DESTDIR)$(configdir)/peers.d/10base
 uninstall-local::