Debian: run dh_lintian

[chiark-utils.git] / debian / rules

diff --git a/debian/rules b/debian/rules
index cf5973423acadf5b751868e9f82d348d0cdcc58c..695bb683347ff553b70fd4a6ccdd01f82ccd7891 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,7 @@
 SHELL=/bin/bash
 
 subdirs_build_arch=    cprogs
-subdirs_nobuild=backup sync-accounts scripts
+subdirs_nobuild=backup sync-accounts scripts fishdescriptor
 package=       chiark-utils
 packages_indep=        chiark-backup chiark-scripts
 packages_arch= chiark-rwbuffer chiark-really chiark-utils-bin
@@ -23,10 +23,6 @@ build:
        set -e; for s in $(subdirs_build_arch); do \
                $(MAKE) -C $$s all $(makebuildargs); \
        done
-
-       dh_python2
-       dh_python3
-
        touch build
 
 build-indep: build
@@ -56,6 +52,7 @@ binary-prep:
        #
        mv $t/cprogs $t/chiark-utils-bin
        #
+       cp -a debian/tmp/fishdescriptor/* debian/tmp/scripts/.
        cp -a debian/tmp/sync-accounts/* debian/tmp/scripts/.
        rm -r debian/tmp/sync-accounts
        mv debian/tmp/scripts debian/tmp/chiark-scripts
@@ -112,6 +109,7 @@ binary-one:
                cp debian/$p/$$f $t/$p/DEBIAN/$$f; \
                chmod u=rwX,go=rX $t/$p/DEBIAN/$$f; \
        done
+       dh_lintian -p$p -Pdebian/tmp/$p
        dh_link -p$p -Pdebian/tmp/$p
        dpkg-gencontrol -p$p -P$t/$p -Tdebian/sv-$p
        chown -R root.root debian/tmp
@@ -135,7 +133,7 @@ binary-arch:        checkroot build binary-prep
                case "$$f" in \
                */xbatmon-simple|*/xduplic-copier) \
                                        d=Suggests      ;; \
-               */watershed|*/summer|*/cgi-fcgi-interp) \
+               */watershed|*/summer|*/cgi-fcgi-interp|*/prefork-interp) \
                                        d=Recommends    ;; \
                *)                      d=Depends       ;; \
                esac; \