build arch: all package in binary-indep and debhelper cleanup

debian/changelog

@@ -11,6 +11,9 @@ nagios-plugins (1.4.11-2) UNRELEASED; urgency=low
   * include a more explicit copyright notice to copyright to make lintian
     happy
   * include OpenSSL exception from upstream README into copyright
+  * make use of dh_* -i for binary-indep and dh_* -s for binary-arch
+    (Closes: #468467)
+  * remove some unneeded and commented debhelper scripts in binary-arch
 
  -- sean finney <seanius@debian.org>  Sat, 26 Jan 2008 15:08:03 +0100
 

debian/rules

@@ -160,38 +160,40 @@ install: build
 
 # Build architecture-independent files here.
 binary-indep: build install
-# We have nothing to do by default.
+	dh_testdir -i
+	dh_testroot -i
+	dh_installchangelogs -i ChangeLog
+	dh_installdocs -i
+	dh_installexamples -i command.cfg
+	dh_installman -i
+	dh_strip -i
+	dh_compress -i
+	dh_fixperms -i
+	dh_installdeb -i
+	dh_shlibdeps -i
+	dh_gencontrol -i
+	dh_md5sums -i
+	dh_builddeb -i
 
 # Build architecture-dependent files here.
 binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs ChangeLog
-	dh_installdocs
-	dh_installexamples command.cfg
-#	dh_install
-#	dh_installmenu
-#	dh_installdebconf	
-#	dh_installlogrotate
-#	dh_installemacsen
-#	dh_installpam
-#	dh_installmime
-#	dh_installinit
-#	dh_installcron
-#	dh_installinfo
-	dh_installman
+	dh_testdir -s
+	dh_testroot -s
+	dh_installchangelogs -s ChangeLog
+	dh_installdocs -s
+	dh_installexamples -s command.cfg
+	dh_installman -s
 #	dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms -X utils.pm
+	dh_strip -s
+	dh_compress -s
+	dh_fixperms -s -X utils.pm
 #	dh_perl
-#	dh_python
 #	dh_makeshlibs
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
+	dh_installdeb -s
+	dh_shlibdeps -s
+	dh_gencontrol -s
+	dh_md5sums -s
+	dh_builddeb -s
 
 binary: binary-indep binary-arch
 .PHONY: build clean binary-indep binary-arch binary install