Produces plausible-looking packages

diff --git a/.bzrignore b/.bzrignore
index 2b78d82513c32503988a2873813e308a9842b3a0..feb11fbe0f790868cb4ce376e596576652b2438b 100644 (file)
--- a/.bzrignore
+++ b/.bzrignore
@@ -1,4 +1,6 @@
-debian/autodebtest
+debian/autopkgtest
+debian/autopkgtest-xenlvm
+debian/*.debhelper
 debian/tmp
 debian/files
 xen/sed-readconfig

diff --git a/Makefile b/Makefile
index 47098fe35c4236682c8576fba5492be32233369d..ecc624d3512478eee06ba3bde24a3a9fcb7c51ab 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -38,3 +38,6 @@ install-here:
 
 install: install-here
        cd xen && $(MAKE) install
+
+clean:
+       cd xen && $(MAKE) clean

diff --git a/debian/control b/debian/control
index 3927f365e486f9068c7a86b160fb7594aad16ce1..c6bce1688ee48a185ae8342a1596031df2349b26 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Architecture: all
 Depends: python2.4
 Conflicts: autodebtest (<< 0.5.3)
 Replaces: autodebtest (<< 0.5.3)
-Suggest: autopkgtest-xenlvm
+Suggests: autopkgtest-xenlvm
 Description: automatic as-installed testing for Debian packages
  autopkgtest runs tests on binary packages.  The tests are run on the
  package as installed on a testbed system (which may be found via a
@@ -21,7 +21,7 @@ Description: automatic as-installed testing for Debian packages
 Package: autopkgtest-xenlvm
 Architecture: all
 Depends: pbuilder, libadns1-bin, chiark-utils-bin, iproute
-Suggest: autopkgtest
+Suggests: autopkgtest
 Description: Xen/LVM2 based testbed snapshot system
  Machinery for setting up a Xen domain which can be resumed over and
  over again, discarding changes made each time.  This can be useful

diff --git a/debian/rules b/debian/rules
index 6b0ddd3edf71ea4d8b3163055e4601ba6cb75f42..6c6c3bb178c985bfa796b0efeb1060f97e004617 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -23,7 +23,8 @@
 # installed as /usr/share/doc/autopkgtest/CREDITS).
 
 p=autopkgtest
-px=autopkgtext-xenlvm
+px=autopkgtest-xenlvm
+topdir=`pwd`
 
 build build-indep:
        $(MAKE)
@@ -37,21 +38,25 @@ binary binary-indep: checkdir
        dh_installdirs usr
 
        $(MAKE) install-here prefix=debian/$p/usr
-       $(MAKE) -C xen install \
-               prefix=debian/$(px)/usr \
-               etc=debian/$(px)/etc cfg_suffix=''
+       $(MAKE) -C xen install pkgname=$(px) \
+               prefix=$(topdir)/debian/$(px)/usr \
+               etcdir=$(topdir)/debian/$(px)/etc cfg_suffix=''
 
        cat CREDITS debian/copyright.suffix \
                >debian/$p/usr/share/doc/$p/copyright
+       dh_installinit -p $(px) --onlyscripts --name=adtxenlvm -- defaults 19
        dh_compress
        dh_link
        dh_md5sums
        dh_fixperms
        dh_gencontrol
+       dh_installdeb
+       dh_installchangelogs
        dh_builddeb
 
 clean: checkdir
        dh_testroot
+       $(MAKE) clean
        dh_clean
 
 checkdir:

diff --git a/settings.make b/settings.make
index 1c439ad45cee8ea992ce33e1b6ed05231cb80c6c..279482ad40b2f0b1992ad30226a5b99c54b61d64 100644 (file)
--- a/settings.make
+++ b/settings.make
@@ -3,8 +3,9 @@ share =         $(prefix)/share
 bindir =       $(prefix)/bin
 mandir =       $(share)/man
 man1dir =      $(mandir)/man1
-docdir =       $(share)/doc/autopkgtest
-sharedir =     $(share)/autopkgtest
+pkgname =      autopkgtest
+docdir =       $(share)/doc/$(pkgname)
+sharedir =     $(share)/$(pkgname)
 etcdir =       /etc
 etcinitddir =  $(etcdir)/init.d
 xenscripts =   $(etcdir)/xen/scripts
@@ -13,4 +14,5 @@ cfg_suffix =  .dist
 INSTALL =              install
 INSTALL_DIRS =         $(INSTALL) -d
 INSTALL_PROGRAM =      $(INSTALL) -m 0755
+INSTALL_DATA =         $(INSTALL)
 INSTALL_DOC =          $(INSTALL)

diff --git a/xen/Makefile b/xen/Makefile
index 00d12e62e1b6724d199d079010454b206b0e83c0..f4bb374f9c282b0f323c9398aec7f477404c08a8 100644 (file)
--- a/xen/Makefile
+++ b/xen/Makefile
@@ -28,14 +28,16 @@ sharefiles =        readconfig
 
 exec_prefix =  adt-xenlvm-
 
+all:           readconfig
+
 install:       all
        $(INSTALL_DIRS) -d $(bindir) $(docdir) $(man1dir) \
-               $(sharedir) $(etcinitdddir) $(xenscripts)
+               $(sharedir) $(etcinitddir) $(xenscripts)
        set -e; for f in $(programs) $(shareprograms); do \
                $(INSTALL_PROGRAM) $$f $(sharedir); \
                done
        set -e; for f in $(programs); do \
-               ln -s $(sharedir)/$$f $(bindir)/$(exec_prefix)$$f; \
+               ln -sf $(sharedir)/$$f $(bindir)/$(exec_prefix)$$f; \
                test ! -f $$f.1 || $(INSTALL_DOC) $$f.1 \
                        $(man1dir)/$(exec_prefix)$$f; \
                done
@@ -44,8 +46,7 @@ install:      all
                done
        $(INSTALL_DATA) initscript $(etcinitddir)/adtxenlvm$(cfg_suffix)
        $(INSTALL_DATA) vif-route-adt $(xenscripts)/vif-route-adt$(cfg_suffix)
-
-all:           readconfig
+       $(INSTALL_DOC) README $(docdir)
 
 readconfig:    sed-readconfig readconfig.in
        sed -f $^ >$@.new && mv -f $@.new $@
@@ -54,3 +55,6 @@ sed-readconfig:       README Makefile
        echo '/@@varlist@@/{h' >$@.new
        sed -n 's,^adt_\([_0-9a-z]*\)[  ].*,s/\\*/\1/p;g,p' <$< >>$@.new
        echo 'd}' >>$@.new && mv -f $@.new $@
+
+clean:
+       rm -f readconfig *~

diff --git a/xen/on-testbed b/xen/on-testbed
index aa5205137c303db4b7b7ed69d99ce6ac2e19f076..96a4b7b042eed4c2fcd31cdba449770e4964e439 100755 (executable)
--- a/xen/on-testbed
+++ b/xen/on-testbed
@@ -1,4 +1,4 @@
 #!/bin/sh
 set -e
 . ${ADT_XENLVM_SHARE:=/usr/share/autopkgtest/xenlvm}/readconfig
-ssh -i $adt_sshkey $adt_guest_ipaddr "$@"
+ssh $adt_ssh_keyident_args $adt_guest_ipaddr "$@"