server/tun-unet: Fix stupidity in t_create.

[tripe] / debian / rules

diff --git a/debian/rules b/debian/rules
index 7b94252d663f088d43d950a8825d250a1222cd60..e1d863e320143a39d6dbdd00db0f767a238759e7 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -13,7 +13,7 @@ build:
                --with-logfile=/var/log/tripe.log \
                --with-pidfile=/var/run/tripectl.pid \
                --with-initconfig=/etc/default/tripe \
-               --with-ethereal
+               --with-wireshark
        make -C deb-build
        touch build
 
@@ -27,9 +27,9 @@ install: build
        mkdir -p debian/tripe/etc/tripe/peers
        mkdir -p debian/tripe/etc/default
        mkdir -p debian/tripe/etc/init.d
-       cp deb-build/tripe-init debian/tripe/etc/init.d/tripe
+       cp deb-build/init/tripe-init debian/tripe/etc/init.d/tripe
        chmod 755 debian/tripe/etc/init.d/tripe
-       cp tripe.conf debian/tripe/etc/default/tripe
+       cp init/tripe.conf debian/tripe/etc/default/tripe
        mkdir -p debian/tripe-keys/usr/bin
        mv debian/tripe/usr/bin/tripe-keys debian/tripe-keys/usr/bin
        mkdir -p \
@@ -40,7 +40,7 @@ install: build
        mv debian/tripe/usr/share/man/man8/tripe-keys.8 \
          debian/tripe-keys/usr/share/man/man8
        mkdir -p debian/tripe-keys/usr/share/doc/tripe-keys/examples
-       cp tripe-keys.master \
+       cp keys/tripe-keys.master \
          debian/tripe-keys/usr/share/doc/tripe-keys/examples
        mkdir -p debian/tripemon/usr/bin
        mv debian/tripe/usr/bin/tripemon debian/tripemon/usr/bin
@@ -53,10 +53,11 @@ install: build
        mkdir -p debian/pkstream/usr/share/man/man1
        mv debian/tripe/usr/share/man/man1/pkstream.1 \
                debian/pkstream/usr/share/man/man1
-       mkdir -p debian/tripe-ethereal/usr/lib
-       mv debian/tripe/usr/lib/ethereal debian/tripe-ethereal/usr/lib
-       rm -f debian/tripe-ethereal/usr/lib/ethereal/plugins/*/*.a
+       mkdir -p debian/tripe-wireshark/usr/lib
+       mv debian/tripe/usr/lib/wireshark debian/tripe-wireshark/usr/lib
+       rm -f debian/tripe-wireshark/usr/lib/wireshark/plugins/*/*.a
        rmdir debian/tripe/usr/lib
+       mkdir -p debian/tripe-ethereal
 
 binary-indep: install
        dh_testdir -i
@@ -71,9 +72,9 @@ binary-indep: install
        dh_builddeb -i
 
 binary-arch: install
-       dpkg --status ethereal | \
-               sed -n 's/^Version: */tripe:Ethereal-Version=/p' \
-               >> debian/tripe-ethereal.substvars
+       dpkg --status wireshark | \
+               sed -n 's/^Version: */tripe:Wireshark-Version=/p' \
+               >> debian/tripe-wireshark.substvars
        dh_testdir -a
        dh_testroot -a
        dh_compress -a
@@ -97,4 +98,4 @@ source:
        d=`pwd`; cd ..; dpkg-source -i -b $$d/deb-build/=deb=/*
        rm -rf deb-build/=deb=
 
-.PHONY: binary binary-arch binary-indep clean install source 
+.PHONY: binary binary-arch binary-indep clean install source