Use dh(1). WIP.

diff --git a/debian/changelog b/debian/changelog
index a1d232a59c1f9680007787b6174fce3cba80591a..57b0eea64237034e2006f606e3b4f6b04b784831 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+userv-utils (0.6.0~~iwj2) unstable; urgency=low
+
+  * Use dh(1).  WIP.
+
+ --
+

 userv-utils (0.6.0~~iwj1) unstable; urgency=low
 
   * WIP
 userv-utils (0.6.0~~iwj1) unstable; urgency=low
 
   * WIP


@@ -10,7 +16,7 @@ userv-utils (0.6.0~~iwj1) unstable; urgency=low
   * ipif: Deprecate udptunnel.
   * ipif: Provide head comment of service.c as a txt docs.
 
   * ipif: Deprecate udptunnel.
   * ipif: Provide head comment of service.c as a txt docs.
 

- --
+ -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Wed, 04 Dec 2013 23:01:37 +0000

 
 userv-utils (0.5.0) unstable; urgency=low
 
 
 userv-utils (0.5.0) unstable; urgency=low
 

diff --git a/debian/compat b/debian/compat
new file mode 100644 (file)
index 0000000..45a4fb7
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+8

diff --git a/debian/rules b/debian/rules
index 49c2f017f53e0fa66dda0b2ee023eed4b7d0d535..c67fbb9f2eb546d3d3c263b1c30411509cfe8efe 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -30,27 +30,21 @@ cwd=        $(shell pwd)
 d=     $(cwd)/debian
 t=     $d/tmp
 
 d=     $(cwd)/debian
 t=     $d/tmp
 

-build:
+%:
+       dh $@
+
+override_dh_auto_configure:
+
+override_dh_auto_build:

        $(checkdir)
        set -e; for s in $(subdirs_build); do \
                $(MAKE) -C $$s all depr=disable; \
        done
        touch build
 
        $(checkdir)
        set -e; for s in $(subdirs_build); do \
                $(MAKE) -C $$s all depr=disable; \
        done
        touch build
 

-clean:
-       $(checkdir)
-       rm -f build
-       set -e; for s in $(subdirs_build); do \
-               $(MAKE) -C $$s -i distclean || \
-               $(MAKE) -C $$s -f Makefile.in distclean; \
-       done
-       rm -rf *~ debian/tmp debian/*~ debian/files* debian/substvars*
-
-binary-prep:
+override_dh_auto_install:

        $(checkdir)
        $(checkdir)

-       rm -rf debian/tmp*
-       #
-       #
+       rm -rf $t

        set -e; for s in $(subdirs_build) $(subdirs_nobuild); do \
                $(MAKE) -C $$s install install-docs install-examples \
                        prefix=$t/userv-$$s/usr \
        set -e; for s in $(subdirs_build) $(subdirs_nobuild); do \
                $(MAKE) -C $$s install install-docs install-examples \
                        prefix=$t/userv-$$s/usr \


@@ -59,11 +53,13 @@ binary-prep:
                        depr=disable \
                        gituser=root; \
        done
                        depr=disable \
                        gituser=root; \
        done

-       #
-       mv debian/tmp/userv-www-cgi debian/tmp/userv-cgi
-       mv debian/tmp/userv-groupmanage/usr/share/doc/groupmanage \
-          debian/tmp/userv-groupmanage/usr/share/doc/userv-groupmanage
-       #
+       cd $t; for f in *; do rm -rf ../$$f; mv $$f ..; done
+
+override_dh_install:
+       mv debian/userv-www-cgi debian/userv-cgi
+       mv debian/userv-groupmanage/usr/share/doc/groupmanage \
+          debian/userv-groupmanage/usr/share/doc/userv-groupmanage
+       @:

        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 \


@@ -72,7 +68,7 @@ binary-prep:
                        $t/$$p/usr/share/doc/$$p/changelog.Debian.gz; \
                gzip -9v $t/$$p/usr/share/doc/$$p/changelog; \
                done
                        $t/$$p/usr/share/doc/$$p/changelog.Debian.gz; \
                gzip -9v $t/$$p/usr/share/doc/$$p/changelog; \
                done

-       #
+       @:

        rename 's/\.example$$//' $t/userv-ipif/etc/userv/vpn/*.example \
                $t/userv-dyndns/etc/userv/dyndns-service-users.example \
                $t/userv-groupmanage/etc/groupmanage.conf.example
        rename 's/\.example$$//' $t/userv-ipif/etc/userv/vpn/*.example \
                $t/userv-dyndns/etc/userv/dyndns-service-users.example \
                $t/userv-groupmanage/etc/groupmanage.conf.example


@@ -84,44 +80,18 @@ binary-prep:
                  find etc -type f -exec printf '/%s\n' '{}' ';' \
                        >>DEBIAN/conffiles; \
        done
                  find etc -type f -exec printf '/%s\n' '{}' ';' \
                        >>DEBIAN/conffiles; \
        done

-       #
+       @:

        mv $t/userv-misc/usr/bin/mailq $t/userv-misc/usr/bin/mailq.userv
        mv $t/userv-misc/usr/bin/mailq $t/userv-misc/usr/bin/mailq.userv

-       #
-#      gzip -9f $t/*/usr/share/man/man*/*
-
-binary-hook-userv-misc:
-binary-hook-userv-groupmanage:
-binary-hook-userv-cgi:
-binary-hook-userv-dyndns:
-binary-hook-userv-ipif:
-binary-hook-userv-git-daemon:
+       @:

 
 

-binary-one:
-       set -e; for f in preinst postinst prerm postrm conffiles; do \
-               test -f debian/$p/$$f || continue; \
-               cp debian/$p/$$f $t/$p/DEBIAN/$$f; \
-               chmod u=rwX,go=rX $t/$p/DEBIAN/$$f; \
-       done
-       dpkg-gencontrol -p$p -P$t/$p -Tdebian/sv-$p
-       chown -R root.root debian/tmp
-       chmod -R g-ws debian/tmp
-       debian/rules binary-hook-$p
-       dpkg --build $t/$p ..
-
-binary-indep:  checkroot build binary-prep
-       set -e; for p in $(packages_indep); do \
-               debian/rules binary-one p=$$p; done
-
-binary-arch:   checkroot build binary-prep
+override_dh_auto_clean:

        $(checkdir)
        $(checkdir)

-       dpkg-shlibdeps -Tdebian/sv-userv-ipif \
-               $t/userv-ipif/usr/bin/udptunnel-forwarder \
-               $t/userv-ipif/usr/lib/userv/ipif
-       dpkg-shlibdeps -Tdebian/sv-userv-cgi \
-               $t/userv-cgi/usr/lib/userv/cgi/target \
-               $t/userv-cgi/usr/lib/userv/cgi/cgi/ucgi
-       set -e; for p in $(packages_arch); \
-               do debian/rules binary-one p=$$p; done
+       rm -f build
+       set -e; for s in $(subdirs_build); do \
+               $(MAKE) -C $$s -i distclean || \
+               $(MAKE) -C $$s -f Makefile.in distclean; \
+       done
+       rm -rf *~ debian/tmp debian/*~ debian/files* debian/substvars*

 
 define checkdir
        test -f ipif/service.c
 
 define checkdir
        test -f ipif/service.c


@@ -129,13 +99,6 @@ endef
 
 # Below here is fairly generic really
 
 
 # Below here is fairly generic really
 

-binary:                binary-indep binary-arch
-
-source diff:
-       @echo >&2 'source and diff are obsolete - use dpkg-source -b'; false
-

 checkroot:
        $(checkdir)
        test root = "`whoami`"
 checkroot:
        $(checkdir)
        test root = "`whoami`"

-
-.PHONY: binary binary-arch binary-indep clean checkroot

diff --git a/debian/userv-dyndns/postinst b/debian/userv-dyndns.postinst
similarity index 100%
rename from debian/userv-dyndns/postinst
rename to debian/userv-dyndns.postinst

diff --git a/debian/userv-git-daemon/postinst b/debian/userv-git-daemon.postinst
similarity index 100%
rename from debian/userv-git-daemon/postinst
rename to debian/userv-git-daemon.postinst