[Pkg-sysvinit-commits] r1755 - sysvinit/trunk/debian

[Petter Reinholdtsen]

Author: pere
Date: 2009-09-09 22:09:20 +0000 (Wed, 09 Sep 2009)
New Revision: 1755

Modified:
   sysvinit/trunk/debian/rules
Log:
Use DH_OPTIONS in rules. Patch from Michael Biebl.

Modified: sysvinit/trunk/debian/rules
===================================================================
--- sysvinit/trunk/debian/rules	2009-09-09 22:00:05 UTC (rev 1754)
+++ sysvinit/trunk/debian/rules	2009-09-09 22:09:20 UTC (rev 1755)
@@ -6,6 +6,9 @@
 # Uncomment this to turn on verbose mode.
 # export DH_VERBOSE=1
 
+# This has to be exported to make some magic below work.
+export DH_OPTIONS
+
 tmp     = $(shell pwd)/debian/tmp
 sysvtmp = $(shell pwd)/debian/sysvinit
 utiltmp = $(shell pwd)/debian/sysvinit-utils
@@ -71,6 +74,7 @@
 	touch $@
 
 # Make a binary package (.deb file)
+binary-arch: DH_OPTIONS=-a
 binary-arch: build
 	dh_testroot
 	dh_prep
@@ -136,16 +140,17 @@
 	dh_shlibdeps -pinitscripts $(inittmp)/lib/init/readlink
 
 	# Wrap it all up
-	dh_installman -a
-	dh_installdocs -a
-	dh_lintian -a
-	dh_strip -a
-	dh_compress -a
-	dh_gencontrol -a
-	dh_md5sums -a
-	dh_builddeb -a
+	dh_installman
+	dh_installdocs
+	dh_lintian
+	dh_strip
+	dh_compress
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
 
 # Architecture independant files.
+binary-indep: DH_OPTIONS=-i
 binary-indep:
 	#
 	# sysv-rc package
@@ -153,23 +158,23 @@
 	dh_testroot
 	dh_prep
 	$(MAKE) -C debian/src/sysv-rc install DESTDIR=$(rctmp)
-	dh_installdocs -i
-	dh_installchangelogs -i
+	dh_installdocs
+	dh_installchangelogs
 	sed -i -ne '/sysvinit (2.84-3)/q' -e p \
 		$(rctmp)$(doc)/sysv-rc/changelog.Debian
-	dh_installdebconf -i
-	dh_installdeb -i
+	dh_installdebconf
+	dh_installdeb
 	# Neither rc, rcS nor README are conffiles
 	$(RM) $(rctmp)/DEBIAN/conffiles
 	dh_fixperms -psysv-rc -X/etc/init.d/README
 
 	# Wrap it all up
-	dh_installman -i
-	dh_lintian -i
-	dh_compress -i
-	dh_gencontrol -i
-	dh_md5sums -i
-	dh_builddeb -i
+	dh_installman
+	dh_lintian
+	dh_compress
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
 
 clean:
 	dh_testdir