debian: Pre-emptive reorganization.

Use dh_install to install things into the correct packages.  It's
getting too cumbersome to do all this by hand.

diff --git a/debian/pkstream.install b/debian/pkstream.install
new file mode 100644 (file)
index 0000000..8f23ab6
--- /dev/null
+++ b/debian/pkstream.install
@@ -0,0 +1,2 @@
+usr/bin/pkstream
+usr/share/man/man1/pkstream.1

diff --git a/debian/rules b/debian/rules
index e1d863e320143a39d6dbdd00db0f767a238759e7..f17c0cb9a2001f0504552534c1db2769be89fb85 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -23,40 +23,17 @@ clean:
 
 install: build
        dh_clean
 
 install: build
        dh_clean

-       make -C deb-build install DESTDIR=`pwd`/debian/tripe
-       mkdir -p debian/tripe/etc/tripe/peers
-       mkdir -p debian/tripe/etc/default
-       mkdir -p debian/tripe/etc/init.d
-       cp deb-build/init/tripe-init debian/tripe/etc/init.d/tripe
-       chmod 755 debian/tripe/etc/init.d/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 \
-         debian/tripe-keys/usr/share/man/man5 \
-         debian/tripe-keys/usr/share/man/man8
-       mv debian/tripe/usr/share/man/man5/tripe-keys.conf.5 \
-         debian/tripe-keys/usr/share/man/man5
-       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
+       make -C deb-build install DESTDIR=`pwd`/debian/tmp
+       mkdir -p debian/tmp/etc/tripe/peers
+       mkdir -p debian/tmp/etc/default
+       mkdir -p debian/tmp/etc/init.d
+       cp deb-build/init/tripe-init debian/tmp/etc/init.d/tripe
+       chmod 755 debian/tmp/etc/init.d/tripe
+       cp init/tripe.conf debian/tmp/etc/default/tripe
+       mkdir -p debian/tmp/usr/share/doc/tripe-keys/examples

        cp keys/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
-       mkdir -p \
-         debian/tripemon/usr/share/man/man1
-       mv debian/tripe/usr/share/man/man1/tripemon.1 \
-         debian/tripemon/usr/share/man/man1
-       mkdir -p debian/pkstream/usr/bin
-       mv debian/tripe/usr/bin/pkstream debian/pkstream/usr/bin
-       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-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
+               debian/tmp/usr/share/doc/tripe-keys/examples
+       dh_install --sourcedir=debian/tmp

        mkdir -p debian/tripe-ethereal
 
 binary-indep: install
        mkdir -p debian/tripe-ethereal
 
 binary-indep: install

diff --git a/debian/tripe-keys.install b/debian/tripe-keys.install
new file mode 100644 (file)
index 0000000..6694f40
--- /dev/null
+++ b/debian/tripe-keys.install
@@ -0,0 +1,4 @@
+usr/bin/tripe-keys
+usr/share/man/man5/tripe-keys.conf.5
+usr/share/man/man8/tripe-keys.8
+usr/share/doc/tripe-keys

diff --git a/debian/tripe-wireshark.install b/debian/tripe-wireshark.install
new file mode 100644 (file)
index 0000000..8967025
--- /dev/null
+++ b/debian/tripe-wireshark.install
@@ -0,0 +1 @@
+usr/lib/wireshark

diff --git a/debian/tripe.install b/debian/tripe.install
new file mode 100644 (file)
index 0000000..8812f18
--- /dev/null
+++ b/debian/tripe.install
@@ -0,0 +1,6 @@
+usr/bin/tripectl
+usr/sbin/tripe
+usr/share/man/man1/tripectl.1
+usr/share/man/man5/tripe-admin.5
+usr/share/man/man8/tripe.8
+etc

diff --git a/debian/tripemon.install b/debian/tripemon.install
new file mode 100644 (file)
index 0000000..f573ab2
--- /dev/null
+++ b/debian/tripemon.install
@@ -0,0 +1,2 @@
+usr/bin/tripemon
+usr/share/man/man1/tripemon.1