dh(1): fix so that it works.

Output is now identical except that:
 * changelog.Debian.gz -> changelog.gz symlink no longer present
 * DEBIAN/md5sums now _is_ present

diff --git a/.gitignore b/.gitignore
index 0b6440f49a61a1e1ad145f6c1f51b04aaa3f3fa3..13c30c25f0e0387e84f51ba8f617d5705f3a002e 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,18 @@
 *~
 *.new
 
+debian/*.substvars
+debian/*.debhelper.log
+debian/tmp
+debian/files
+
+debian/userv-cgi
+debian/userv-dyndns
+debian/userv-git-daemon
+debian/userv-groupmanage
+debian/userv-ipif
+debian/userv-misc
+
 dist_tmp
 userv-utils-*.tar.gz
 build

diff --git a/debian/.gitignore b/debian/.gitignore
deleted file mode 100644 (file)
index 1e64510..0000000
--- a/debian/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-sv-*
-tmp
-files

diff --git a/debian/changelog b/debian/changelog
index 57b0eea64237034e2006f606e3b4f6b04b784831..0fe288b7232fe0576ba8f7f088a37e4af416b28f 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,7 +2,7 @@ userv-utils (0.6.0~~iwj2) unstable; urgency=low
 
   * Use dh(1).  WIP.
 
- --
+ -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Sun, 08 Dec 2013 13:38:23 +0000
 
 userv-utils (0.6.0~~iwj1) unstable; urgency=low
 

diff --git a/debian/rules b/debian/rules
index c67fbb9f2eb546d3d3c263b1c30411509cfe8efe..2c604d862651734cb35d4498a95d78b0c90ac8ed 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -28,7 +28,6 @@ packages=     $(packages_indep) $(packages_arch)
 
 cwd=   $(shell pwd)
 d=     $(cwd)/debian
-t=     $d/tmp
 
 %:
        dh $@
@@ -44,45 +43,34 @@ override_dh_auto_build:
 
 override_dh_auto_install:
        $(checkdir)
-       rm -rf $t
+       -
+       set -e; for p in $(packages); do rm -rf $d/$$p; done
+       -
        set -e; for s in $(subdirs_build) $(subdirs_nobuild); do \
+               t=$d/userv-$$s; \
+               rm -rf $$t; \
                $(MAKE) -C $$s install install-docs install-examples \
-                       prefix=$t/userv-$$s/usr \
-                       etcdir=$t/userv-$$s/etc \
-                       vardir=$t/userv-$$s/var \
+                       prefix=$$t/usr \
+                       etcdir=$$t/etc \
+                       vardir=$$t/var \
                        depr=disable \
-                       gituser=root; \
+                       gituser=root \
+               ; \
        done
-       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 \
-                       $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
-       @:
-       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/\.distrib$$//' $t/*/etc/userv/services.d/*.distrib
-       rename 's/$$/\.disabled/' $t/userv-misc/etc/userv/services.d/mailq
-       set -e; for p in $(packages); do \
-               cd $t/$$p; \
-               test ! -d etc || \
-                 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
-       @:
+       -
+       rename 's/\.example$$//' $d/userv-ipif/etc/userv/vpn/*.example \
+               $d/userv-dyndns/etc/userv/dyndns-service-users.example \
+               $d/userv-groupmanage/etc/groupmanage.conf.example
+       rename 's/\.distrib$$//' $d/*/etc/userv/services.d/*.distrib
+       rename 's/$$/\.disabled/' $d/userv-misc/etc/userv/services.d/mailq
+       -
+       mv $d/userv-misc/usr/bin/mailq $d/userv-misc/usr/bin/mailq.userv
+
+override_dh_install:
 
 override_dh_auto_clean:
        $(checkdir)