Use dh_install instead of installing files manually.

diff --git a/debian/liboping-dev.install b/debian/liboping-dev.install
new file mode 100644 (file)
index 0000000..a3fde16
--- /dev/null
+++ b/debian/liboping-dev.install
@@ -0,0 +1,6 @@
+usr/include/oping.h
+usr/lib/liboping.a
+usr/lib/liboping.la
+usr/lib/liboping.so
+usr/share/man/man3/*
+

diff --git a/debian/liboping0.install b/debian/liboping0.install
new file mode 100644 (file)
index 0000000..0217c89
--- /dev/null
+++ b/debian/liboping0.install
@@ -0,0 +1,2 @@
+usr/lib/liboping.so.*
+

diff --git a/debian/oping.install b/debian/oping.install
new file mode 100644 (file)
index 0000000..f7f784d
--- /dev/null
+++ b/debian/oping.install
@@ -0,0 +1,3 @@
+usr/bin/oping
+usr/share/man/man8/*
+

diff --git a/debian/rules b/debian/rules
index 70749e5ca6771283ceea5ce19eef6377e947e5f1..8fb4a07cbe811db36e6ea74874c55f9c74170aa3 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -19,16 +19,6 @@ else
        CFLAGS += -O2
 endif
 
-libdir="$(CURDIR)/debian/liboping0/usr/lib/"
-
-libdeveldir="$(CURDIR)/debian/liboping-dev/usr/lib"
-includedir="$(CURDIR)/debian/liboping-dev/usr/include"
-man3dir="$(CURDIR)/debian/liboping-dev/usr/share/man/man3"
-
-bindir="$(CURDIR)/debian/oping/usr/bin"
-man8dir="$(CURDIR)/debian/oping/usr/share/man/man8"
-overridesdir="$(CURDIR)/debian/oping/usr/share/lintian/overrides"
-
 config.status: configure
        dh_testdir
        CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) \
@@ -61,26 +51,10 @@ install: build
        
        $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
        
-       mkdir -p $(libdir)
-       mv $(CURDIR)/debian/tmp/usr/lib/liboping.so.* $(libdir)
+       chmod u+s debian/tmp/usr/bin/oping
+       mkdir -p debian/oping/usr/share/lintian/overrides/
+       cp debian/oping.overrides debian/oping/usr/share/lintian/overrides/oping
        
-       mkdir -p $(includedir)
-       mkdir -p $(libdeveldir)
-       mkdir -p $(man3dir)
-       mv $(CURDIR)/debian/tmp/usr/include/* $(includedir)
-       mv $(CURDIR)/debian/tmp/usr/lib/liboping.a $(libdeveldir)
-       mv $(CURDIR)/debian/tmp/usr/lib/liboping.so $(libdeveldir)
-       mv $(CURDIR)/debian/tmp/usr/lib/liboping.la $(libdeveldir)
-       mv $(CURDIR)/debian/tmp/usr/share/man/man3/* $(man3dir)
-       
-       mkdir -p $(bindir)
-       mkdir -p $(man8dir)
-       mkdir -p $(overridesdir)
-       mv $(CURDIR)/debian/tmp/usr/bin/oping $(bindir)
-       chmod u+s $(bindir)/oping
-       mv $(CURDIR)/debian/tmp/usr/share/man/man8/* $(man8dir)
-       cp $(CURDIR)/debian/oping.overrides $(overridesdir)/oping
-
 binary-indep:
        # nothing to do here
 
@@ -90,13 +64,14 @@ binary-arch: build install
        dh_installchangelogs ChangeLog
        dh_installdocs -A README
        dh_installman
+       dh_install --sourcedir=debian/tmp --list-missing
        dh_link
        dh_strip
        dh_compress
        dh_fixperms -Xusr/bin/oping
        dh_makeshlibs
        dh_installdeb
-       dh_shlibdeps -l$(libdir)
+       dh_shlibdeps -ldebian/liboping0/usr/lib/
        dh_gencontrol
        dh_md5sums
        dh_builddeb