debian: Get Wireshark version from the right place.

[tripe] / debian / rules

diff --git a/debian/rules b/debian/rules
index 6df30ce6438efc65634130ba2f75a340dfae2674..04bc8ca01dc05842b275c795c1bf0f19dd8debf0 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -22,27 +22,46 @@ DEB_CONFIGURE_EXTRA_FLAGS = \
        --with-tunnel="$(default_tunnel) slip" \
        --with-configdir="/etc/tripe" \
        --with-socketdir="/var/run" \
-       --with-logfile="/var/log/tripe.log" \
+       --with-logfile="/var/log/tripe/tripe.log" \
        --with-pidfile="/var/run/tripectl.pid" \
        --with-initconfig="/etc/default/tripe" \
-       --with-wireshark
+       --with-wireshark="/usr/lib/wireshark/libwireshark0/plugins"
+
+###--------------------------------------------------------------------------
+### Python.
+
+binary-install/python-tripe::
+       dh_pycentral -ppython-tripe
 
 ###--------------------------------------------------------------------------
 ### Install the startup scripts.
 
 install/tripe::
        cp $(DEB_BUILDDIR)/init/tripe-init debian/tripe.init
-       cp $(DEB_SRCDIR)/init/tripe.conf debian/tripe.default
+       sed 's/^#\(user\|group\)/\1/' \
+               $(DEB_SRCDIR)/init/tripe.conf >debian/tripe.default
+       mkdir -p debian/tripe/usr/share/doc/tripe/examples
+       for i in tripe-ipif ipif-peers tripe-upstart greet knock; do \
+         cp $(DEB_BUILDDIR)/contrib/$$i \
+               debian/tripe/usr/share/doc/tripe/examples; \
+       done
 
 cleanbuilddir::
        rm -f debian/tripe.init debian/tripe.default
 
+###--------------------------------------------------------------------------
+### Install configuration files.
+
+install/tripe-peer-services::
+       install -m644 $(DEB_SRCDIR)/peerdb/peers.in \
+               debian/tripe-peer-services/etc/tripe/peers.d/10base
+
 ###--------------------------------------------------------------------------
 ### Wireshark plugin.
 
 ## Grab the version we built against, so we can put it in the dependencies.
 install/tripe-wireshark::
-       dpkg --status wireshark | \
+       dpkg --status wireshark-common | \
                sed -n 's/^Version: */tripe:Wireshark-Version=/p' \
                >> debian/tripe-wireshark.substvars