debian/changelog: finalise 4.5.0~iwj4

[chiark-utils.git] / debian / rules

diff --git a/debian/rules b/debian/rules
index b1c92b6b0705c22deefb644b8378d6198cb7695f..ee7e2832a6b586d38ec297915d59dcc7d28fd0f0 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -1,72 +1,106 @@
 #!/usr/bin/make -f
 
 #!/usr/bin/make -f
 

-subdirs=       backup
+SHELL=/bin/bash
+
+subdirs_build_arch=    cprogs
+subdirs_nobuild=backup sync-accounts scripts

 package=       chiark-utils
 package=       chiark-utils

-packages_indep=        chiark-backup sync-accounts chiark-named-conf
-packages_arch= chiark-rwbuffer
+packages_indep=        chiark-backup chiark-scripts
+packages_arch= chiark-rwbuffer chiark-really chiark-utils-bin

 packages=      $(packages_indep) $(packages_arch)
 
 cwd=   $(shell pwd)
 d=     $(cwd)/debian
 t=     $d/tmp
 
 packages=      $(packages_indep) $(packages_arch)
 
 cwd=   $(shell pwd)
 d=     $(cwd)/debian
 t=     $d/tmp
 

+makebuildargs := OPTIMISE= DEBUG= \
+ CMDLINE_CFLAGS="$(shell dpkg-buildflags --get CFLAGS)" \
+ CMDLINE_CPPFLAGS="$(shell dpkg-buildflags --get CPPFLAGS)" \
+ CMDLINE_LDFLAGS="$(shell dpkg-buildflags --get LDFLAGS)"
+

 build:
        $(checkdir)
 build:
        $(checkdir)

-       set -e; for s in $(subdirs); do $(MAKE) -C $$s all; done
+       set -e; for s in $(subdirs_build_arch); do \
+               $(MAKE) -C $$s all $(makebuildargs); \
+       done

        touch build
 
        touch build
 

+build-indep: build
+build-arch: build
+

 clean:
        $(checkdir)
        rm -f build
 clean:
        $(checkdir)
        rm -f build

-       set -e; for s in $(subdirs); do \
+       set -e; for s in $(subdirs_build_arch); do \

                $(MAKE) -C $$s -i distclean || \
                $(MAKE) -C $$s -f Makefile.in distclean; \
        done
        rm -rf *~ debian/tmp debian/*~ debian/files* debian/substvars*
                $(MAKE) -C $$s -i distclean || \
                $(MAKE) -C $$s -f Makefile.in distclean; \
        done
        rm -rf *~ debian/tmp debian/*~ debian/files* debian/substvars*

+       rm -rf debian/sv-* debian/*.debhelper.log

 
 binary-prep:
        $(checkdir)
        rm -rf debian/tmp*
        #
 
 binary-prep:
        $(checkdir)
        rm -rf debian/tmp*
        #

+       set -e; for s in $(subdirs_build_arch) $(subdirs_nobuild); do \
+               $(MAKE) -C $$s install install-docs install-examples \
+                       prefix=$t/$$s/usr \
+                       etcdir=$t/$$s/etc \
+                       varlib=$t/$$s/var/lib \
+                       mandir=$t/$$s/usr/share/man; \
+       done
+       #
+       mv $t/cprogs $t/chiark-utils-bin
+       #
+       cp -a debian/tmp/sync-accounts/* debian/tmp/scripts/.
+       rm -r debian/tmp/sync-accounts
+       mv debian/tmp/scripts debian/tmp/chiark-scripts
+       mv debian/tmp/backup debian/tmp/chiark-backup
+       #

        set -e; for p in $(packages); do \
                install -d $t/$$p/DEBIAN $t/$$p/usr/share/doc/$$p; \
                cp debian/copyright debian/changelog \
        set -e; for p in $(packages); do \
                install -d $t/$$p/DEBIAN $t/$$p/usr/share/doc/$$p; \
                cp debian/copyright debian/changelog \

-                       $t/$$p/usr/share/doc/$$p; \
+                       $t/$$p/usr/share/doc/$$p/; \

                ln -s changelog.gz \
                        $t/$$p/usr/share/doc/$$p/changelog.Debian.gz; \
                gzip -9v $t/$$p/usr/share/doc/$$p/changelog; \
                done
        #
                ln -s changelog.gz \
                        $t/$$p/usr/share/doc/$$p/changelog.Debian.gz; \
                gzip -9v $t/$$p/usr/share/doc/$$p/changelog; \
                done
        #

-       $(MAKE) -C backup install install-docs install-examples \
-               prefix=$t/chiark-backup/usr \
-               etcdir=$t/chiark-backup/etc \
-               varlib=$t/chiark-backup/var/lib \
-               mandir=$t/chiark-backup/usr/share/man
-       #
-       $(MAKE) -C sync-accounts install install-docs install-examples \
-               prefix=$t/sync-accounts/usr \
-               etcdir=$t/sync-accounts/etc \
-               varlib=$t/sync-accounts/var/lib \
-               mandir=$t/sync-accounts/usr/share/man
-       #
-       $(MAKE) -C scripts install install-docs install-examples \
-               prefix=$t/chiark-named-conf/usr \
-               etcdir=$t/chiark-named-conf/etc \
-               varlib=$t/chiark-named-conf/var/lib \
-               mandir=$t/chiark-named-conf/usr/share/man
-       #

        install -d $t/chiark-rwbuffer/usr/bin
        install -d $t/chiark-rwbuffer/usr/share/man/man1
        install -d $t/chiark-rwbuffer/usr/bin
        install -d $t/chiark-rwbuffer/usr/share/man/man1

-       cd $t/chiark-backup/usr/bin && \
-               mv readbuffer writebuffer $t/chiark-rwbuffer/usr/bin
+       cd $t/chiark-utils-bin/usr/bin && \
+               mv readbuffer writebuffer $t/chiark-rwbuffer/usr/bin/
+       cd $t/chiark-utils-bin/usr/share/man/man1 && \
+               mv readbuffer.1 writebuffer.1 $t/chiark-rwbuffer/usr/share/man/man1/
+       #
+       install -d $t/chiark-backup/usr/share/man/man1
+       cp backup/man/*.1 $t/chiark-backup/usr/share/man/man1/

        cd $t/chiark-backup/usr/share/man/man1 && \
        cd $t/chiark-backup/usr/share/man/man1 && \

-               mv readbuffer.1 writebuffer.1 $t/chiark-rwbuffer/usr/share/man/man1
+               for m in *.1; do \
+                       mv "$$m" backup-"$$m"; \
+               done
+       cp \
+ $t/chiark-backup/usr/share/doc/chiark-backup/examples/chiark/settings.sh \
+ $t/chiark-backup/etc/chiark-backup/settings.sh
+       #
+       install -d $t/chiark-really/usr/sbin
+       install -d $t/chiark-really/usr/share/man/man8
+       cd $t/chiark-utils-bin/usr/sbin && \
+               mv really $t/chiark-really/usr/sbin/
+       cd $t/chiark-utils-bin/usr/share/man/man8 && \
+               mv really.8 $t/chiark-really/usr/share/man/man8/
+       rm      $t/chiark-utils-bin/usr/sbin/trivsoundd \
+               $t/chiark-utils-bin/usr/share/man/man8/trivsoundd.8
+       rmdir   $t/chiark-utils-bin/usr/sbin
+       #

        gzip -9f $t/*/usr/share/man/man*/*
 
 binary-hook-chiark-backup:
 binary-hook-chiark-rwbuffer:
 binary-hook-sync-accounts:
        gzip -9f $t/*/usr/share/man/man*/*
 
 binary-hook-chiark-backup:
 binary-hook-chiark-rwbuffer:
 binary-hook-sync-accounts:

-binary-hook-chiark-named-conf:
+binary-hook-chiark-scripts:
+binary-hook-chiark-really:
+binary-hook-chiark-utils-bin:

 
 binary-one:
        set -e; for f in preinst postinst prerm postrm conffiles; do \
 
 binary-one:
        set -e; for f in preinst postinst prerm postrm conffiles; do \


@@ -74,6 +108,7 @@ binary-one:
                cp debian/$p/$$f $t/$p/DEBIAN/$$f; \
                chmod u=rwX,go=rX $t/$p/DEBIAN/$$f; \
        done
                cp debian/$p/$$f $t/$p/DEBIAN/$$f; \
                chmod u=rwX,go=rX $t/$p/DEBIAN/$$f; \
        done

+       dh_link -p$p -Pdebian/tmp/$p

        dpkg-gencontrol -p$p -P$t/$p -Tdebian/sv-$p
        chown -R root.root debian/tmp
        chmod -R g-ws debian/tmp
        dpkg-gencontrol -p$p -P$t/$p -Tdebian/sv-$p
        chown -R root.root debian/tmp
        chmod -R g-ws debian/tmp


@@ -86,12 +121,34 @@ binary-indep:      checkroot build binary-prep
 
 binary-arch:   checkroot build binary-prep
        $(checkdir)
 
 binary-arch:   checkroot build binary-prep
        $(checkdir)

-       dpkg-shlibdeps -Tdebian/sv-chiark-rwbuffer $t/chiark-rwbuffer/usr/bin/*
+       set -ex; for p in chiark-really chiark-utils-bin chiark-rwbuffer; do \
+               dh_strip -p$$p -Pdebian/tmp/$$p; done
+       dpkg-shlibdeps -Tdebian/sv-chiark-rwbuffer \
+               $t/chiark-rwbuffer/usr/bin/*
+       dpkg-shlibdeps -Tdebian/sv-chiark-really \
+               $t/chiark-really/usr/sbin/*
+       set -e; for f in $t/chiark-utils-bin/usr/bin/*; do \
+               case "$$f" in \
+               */xbatmon-simple|*/xduplic-copier) \
+                                       d=Suggests      ;; \
+               */watershed|*/summer|*/cgi-fcgi-interp) \
+                                       d=Recommends    ;; \
+               *)                      d=Depends       ;; \
+               esac; \
+               a="$$a -d$$d $$f"; \
+           done; set -x; \
+           dpkg-shlibdeps -Tdebian/sv-chiark-utils-bin $$a
+       perl -i~ -pe '                                          '\
+        -e'    next unless m/^shlibs:/;                        '\
+        -e'    s/$$/,/; s/=/=, /;                              '\
+        -e'    s/, libgmp3(?:c2)?,/, libgmp3 | libgmp3c2,/;    '\
+        -e'    s/=, /=/; s/,$$//;                              '\
+                       debian/sv-*[!~]

        set -e; for p in $(packages_arch); \
                do debian/rules binary-one p=$$p; done
 
 define checkdir
        set -e; for p in $(packages_arch); \
                do debian/rules binary-one p=$$p; done
 
 define checkdir

-       test -f backup/writebuffer.c
+       test -f cprogs/writebuffer.c

 endef
 
 # Below here is fairly generic really
 endef
 
 # Below here is fairly generic really