4 files changed, 34 insertions, 30 deletions
diff --git a/ucspi-tcp6-deb/debian/clean b/ucspi-tcp6-deb/debian/clean
index 56caf22..81a4356 100644..100755
--- a/ucspi-tcp6-deb/debian/clean
+++ b/ucspi-tcp6-deb/debian/clean
@@ -1,12 +1,13 @@
-ucspi-tcp6/ucspi-tcp6-1.13.00/src/ip4_bit.o
-ucspi-tcp6/ucspi-tcp6-1.13.00/src/ip6_bit.o
-ucspi-tcp6/ucspi-tcp6-1.13.00/src/remoteinfo.o
-ucspi-tcp6/ucspi-tcp6-1.13.00/src/rules.o
-ucspi-tcp6/ucspi-tcp6-1.13.00/src/argv0
-ucspi-tcp6/ucspi-tcp6-1.13.00/src/argv0.o
-ucspi-tcp6/ucspi-tcp6-1.13.00/src/commands.o
-ucspi-tcp6/ucspi-tcp6-1.13.00/src/rblsmtpd
-ucspi-tcp6/ucspi-tcp6-1.13.00/src/rblsmtpd.o
-ucspi-tcp6/ucspi-tcp6-1.13.00/src/date@
-ucspi-tcp6/ucspi-tcp6-1.13.00/src/finger@
-ucspi-tcp6/ucspi-tcp6-1.13.00/src/http@
+#!/usr/bin/dh-exec
+ucspi-tcp6/ucspi-tcp6-${UPSTREAM_VERSION}/src/ip4_bit.o
+ucspi-tcp6/ucspi-tcp6-${UPSTREAM_VERSION}/src/ip6_bit.o
+ucspi-tcp6/ucspi-tcp6-${UPSTREAM_VERSION}/src/remoteinfo.o
+ucspi-tcp6/ucspi-tcp6-${UPSTREAM_VERSION}/src/rules.o
+ucspi-tcp6/ucspi-tcp6-${UPSTREAM_VERSION}/src/argv0
+ucspi-tcp6/ucspi-tcp6-${UPSTREAM_VERSION}/src/argv0.o
+ucspi-tcp6/ucspi-tcp6-${UPSTREAM_VERSION}/src/commands.o
+ucspi-tcp6/ucspi-tcp6-${UPSTREAM_VERSION}/src/rblsmtpd
+ucspi-tcp6/ucspi-tcp6-${UPSTREAM_VERSION}/src/rblsmtpd.o
+ucspi-tcp6/ucspi-tcp6-${UPSTREAM_VERSION}/src/date@
+ucspi-tcp6/ucspi-tcp6-${UPSTREAM_VERSION}/src/finger@
+ucspi-tcp6/ucspi-tcp6-${UPSTREAM_VERSION}/src/http@
diff --git a/ucspi-tcp6-deb/debian/install b/ucspi-tcp6-deb/debian/install
index ec56e3a..1b43657 100644..100755
--- a/ucspi-tcp6-deb/debian/install
+++ b/ucspi-tcp6-deb/debian/install
@@ -1,16 +1,20 @@
-ucspi-tcp6/ucspi-tcp6-1.13.00/src/addcr         usr/bin
-ucspi-tcp6/ucspi-tcp6-1.13.00/src/argv0         usr/bin
-ucspi-tcp6/ucspi-tcp6-1.13.00/src/date@         usr/bin
-ucspi-tcp6/ucspi-tcp6-1.13.00/src/delcr         usr/bin
-ucspi-tcp6/ucspi-tcp6-1.13.00/src/finger@       usr/bin
-ucspi-tcp6/ucspi-tcp6-1.13.00/src/fixcrio       usr/bin
-ucspi-tcp6/ucspi-tcp6-1.13.00/src/http@         usr/bin
-ucspi-tcp6/ucspi-tcp6-1.13.00/src/mconnect      usr/bin
-ucspi-tcp6/ucspi-tcp6-1.13.00/src/rblsmtpd      usr/bin
-ucspi-tcp6/ucspi-tcp6-1.13.00/src/recordio      usr/bin
-ucspi-tcp6/ucspi-tcp6-1.13.00/src/tcpcat        usr/bin
-ucspi-tcp6/ucspi-tcp6-1.13.00/src/tcpclient     usr/bin
-ucspi-tcp6/ucspi-tcp6-1.13.00/src/tcprules      usr/bin
-ucspi-tcp6/ucspi-tcp6-1.13.00/src/tcprulescheck usr/bin
-ucspi-tcp6/ucspi-tcp6-1.13.00/src/tcpserver     usr/bin
-ucspi-tcp6/ucspi-tcp6-1.13.00/src/who@          usr/bin
+#!/usr/bin/dh-exec
+ucspi-tcp6/ucspi-tcp6-${UPSTREAM_VERSION}/src/addcr         usr/bin
+ucspi-tcp6/ucspi-tcp6-${UPSTREAM_VERSION}/src/argv0         usr/bin
+ucspi-tcp6/ucspi-tcp6-${UPSTREAM_VERSION}/src/date@         usr/bin
+ucspi-tcp6/ucspi-tcp6-${UPSTREAM_VERSION}/src/delcr         usr/bin
+ucspi-tcp6/ucspi-tcp6-${UPSTREAM_VERSION}/src/finger@       usr/bin
+ucspi-tcp6/ucspi-tcp6-${UPSTREAM_VERSION}/src/fixcrio       usr/bin
+ucspi-tcp6/ucspi-tcp6-${UPSTREAM_VERSION}/src/http@         usr/bin
+ucspi-tcp6/ucspi-tcp6-${UPSTREAM_VERSION}/src/mconnect      usr/bin
+ucspi-tcp6/ucspi-tcp6-${UPSTREAM_VERSION}/src/rblsmtpd      usr/bin
+ucspi-tcp6/ucspi-tcp6-${UPSTREAM_VERSION}/src/recordio      usr/bin
+ucspi-tcp6/ucspi-tcp6-${UPSTREAM_VERSION}/src/tcpcat        usr/bin
+ucspi-tcp6/ucspi-tcp6-${UPSTREAM_VERSION}/src/tcpclient     usr/bin
+ucspi-tcp6/ucspi-tcp6-${UPSTREAM_VERSION}/src/tcprules      usr/bin
+ucspi-tcp6/ucspi-tcp6-${UPSTREAM_VERSION}/src/tcprulescheck usr/bin
+ucspi-tcp6/ucspi-tcp6-${UPSTREAM_VERSION}/src/tcpserver     usr/bin
+ucspi-tcp6/ucspi-tcp6-${UPSTREAM_VERSION}/src/who@          usr/bin
+
+ucspi-tcp6/ucspi-tcp6-${UPSTREAM_VERSION}/man/*.1  usr/share/man/man1
+ucspi-tcp6/ucspi-tcp6-${UPSTREAM_VERSION}/man/*.5  usr/share/man/man5
diff --git a/ucspi-tcp6-deb/debian/manpages b/ucspi-tcp6-deb/debian/manpages
deleted file mode 100644
index 7ef24ab..0000000
--- a/ucspi-tcp6-deb/debian/manpages
+++ /dev/null
@@ -1,2 +0,0 @@
-ucspi-tcp6/ucspi-tcp6-1.13.00/man/*.1
-ucspi-tcp6/ucspi-tcp6-1.13.00/man/*.5
diff --git a/ucspi-tcp6-deb/debian/rules b/ucspi-tcp6-deb/debian/rules
index 58ae71b..46f9a49 100755
--- a/ucspi-tcp6-deb/debian/rules
+++ b/ucspi-tcp6-deb/debian/rules
@@ -6,6 +6,7 @@ export DH_VERBOSE = 1
 #export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
 
 UPSTREAM_VERSION := $(shell dpkg-parsechangelog --show-field Version | cut -d- -f1)
+export UPSTREAM_VERSION
 
 get-orig-source:
 	uscan --download-current-version