From: octo <octo>
Date: Mon, 1 May 2006 17:54:55 +0000 (+0000)
Subject: Improvements in the Debian package.
X-Git-Tag: liboping-0.1.0~12
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=b56f8e68b390ad15859ed8e539bdef92c788fe9c;p=collectd.git

Improvements in the Debian package.
---

diff --git a/debian/control b/debian/control
index f072a26c..de3d2c93 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Standards-Version: 3.6.2
 Package: liboping
 Section: libs
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}
 Description: Library to send ICMPv4/ICMPv6 echo packets to multiple hosts
  liboping was inspired by ping, libping and fping: It differs from these
  existing solutions in that it can `ping' multiple hosts in parallel using IPv4
@@ -18,7 +18,7 @@ Description: Library to send ICMPv4/ICMPv6 echo packets to multiple hosts
 Package: liboping-dev
 Section: libdevel
 Architecture: any
-Depends: liboping (= ${Source-Version}), ${shlibs:Depends}, ${misc:Depends}
+Depends: liboping (= ${Source-Version})
 Description: Development files for the liboping library
  liboping was inspired by ping, libping and fping: It differs from these
  existing solutions in that it can `ping' multiple hosts in parallel using IPv4
@@ -28,7 +28,7 @@ Description: Development files for the liboping library
 Package: oping
 Section: net
 Architecture: any
-Depends: liboping (= ${Source-Version}), ${shlibs:Depends}, ${misc:Depends}
+Depends: liboping (= ${Source-Version}), ${shlibs:Depends}
 Description: Sends ICMPv4/ICMPv6 echo packets to multiple remote hosts
  liboping was inspired by ping, libping and fping: It differs from these
  existing solutions in that it can `ping' multiple hosts in parallel using IPv4
diff --git a/debian/liboping-dev.dirs b/debian/liboping-dev.dirs
index 44188162..6554f708 100644
--- a/debian/liboping-dev.dirs
+++ b/debian/liboping-dev.dirs
@@ -1,2 +1,3 @@
 usr/lib
 usr/include
+usr/share/man/man3
diff --git a/debian/rules b/debian/rules
index b663c35b..4a04e8d9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -39,7 +39,7 @@ config.status: configure
 
 
 #Architecture 
-build: build-arch build-indep
+build: build-arch
 
 build-arch: build-arch-stamp
 
@@ -47,17 +47,10 @@ build-arch-stamp:  config.status
 	$(MAKE) 
 	touch build-arch-stamp
 
-build-indep: build-indep-stamp
-
-build-indep-stamp:  config.status
-	# FIXME
-	#$(MAKE) doc
-	touch build-indep-stamp
-
 clean:
 	dh_testdir
 	dh_testroot
-	rm -f build-arch-stamp build-indep-stamp #CONFIGURE-STAMP#
+	rm -f build-arch-stamp
 
 	# Add here commands to clean up after the build process.
 	-$(MAKE) distclean
@@ -71,18 +64,7 @@ endif
 
 	dh_clean 
 
-install: install-indep install-arch
-install-indep:
-	dh_testdir
-	dh_testroot
-	dh_clean -k -i 
-	dh_installdirs -i
-
-	# Add here commands to install the indep part of the package into
-	# debian/<package>-doc.
-	#INSTALLDOC#
-
-	dh_install -i
+install: install-arch
 
 install-arch:
 	dh_testdir
@@ -94,9 +76,12 @@ install-arch:
 	mv -v $(CURDIR)/debian/tmp/usr/lib/*.so $(CURDIR)/debian/liboping/usr/lib/
 	mv -v $(CURDIR)/debian/tmp/usr/lib/*.{a,la} $(CURDIR)/debian/liboping-dev/usr/lib/
 	mv -v $(CURDIR)/debian/tmp/usr/include/*.h $(CURDIR)/debian/liboping-dev/usr/include/
+	#mv -v $(CURDIR)/debian/tmp/usr/share/man/man{1,3} $(CURDIR)/debian/liboping-dev/usr/share/man/
+	mv -v $(CURDIR)/debian/tmp/usr/share/man/man3/* $(CURDIR)/debian/liboping-dev/usr/share/man/man3/
 	mv -v $(CURDIR)/debian/tmp/usr/bin/* $(CURDIR)/debian/oping/usr/bin/
 
 	dh_install -s
+
 # Must not depend on anything. This is to be called by
 # binary-arch/binary-indep
 # in another 'make' thread.
@@ -128,13 +113,10 @@ binary-common:
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb
-# Build architecture independant packages using the common target.
-binary-indep: build-indep install-indep
-	$(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
 
 # Build architecture dependant packages using the common target.
 binary-arch: build-arch install-arch
 	$(MAKE) -f debian/rules DH_OPTIONS=-a binary-common
 
-binary: binary-arch binary-indep
-.PHONY: build clean binary-indep binary-arch binary install install-indep install-arch 
+binary: binary-arch
+.PHONY: build clean binary-arch binary install install-arch