d/rules: Inline `binary-one` target into its callers

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/debian/rules b/debian/rules
index 198321467a40d09e3e1763e4091824c304d523a1..61aabf0b4c81d36b8bf5b95a1007b29c27e934f7 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -110,21 +110,14 @@ binary-prep:
        dh_installexamples
        dh_compress
 
-
-binary-one:
-       dh_lintian -p$p
-       dh_link -p$p
-       dh_fixperms -p$p
-       chmod u+s,o-x debian/chiark-really/usr/sbin/really
-       dh_installdeb -p$p
-       dh_gencontrol -p$p
-       dh_md5sums -p$p
-       dh_builddeb -p$p
-
-
 binary-indep:  build binary-prep
-       set -e; for p in $(packages_indep); do \
-               debian/rules binary-one p=$$p; done
+       dh_lintian -i
+       dh_link -i
+       dh_fixperms -i
+       dh_installdeb -i
+       dh_gencontrol -i
+       dh_md5sums -i
+       dh_builddeb -i
 
 binary-arch:   build binary-prep
        $(checkdir)
@@ -143,8 +136,14 @@ binary-arch:       build binary-prep
                a="$$a -d$$d $$f"; \
            done; set -x; \
            dh_shlibdeps -p chiark-utils-bin -- $$a
-       set -e; for p in $(packages_arch); \
-               do debian/rules binary-one p=$$p; done
+       dh_lintian -a
+       dh_link -a
+       dh_fixperms -a
+       chmod u+s,o-x debian/chiark-really/usr/sbin/really
+       dh_installdeb -a
+       dh_gencontrol -a
+       dh_md5sums -a
+       dh_builddeb -a
 
 define checkdir
        test -f cprogs/writebuffer.c