From 3002d5d517b3f3fa5fb4cb79558f9161d7c2592a Mon Sep 17 00:00:00 2001 From: Junichi Uekawa Date: Mon, 16 Apr 2007 07:46:42 +0900 Subject: --debbuildopts --debootstrapopts documentation clarification --- ChangeLog | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'ChangeLog') diff --git a/ChangeLog b/ChangeLog index 97cae37..4e64487 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2007-04-16 Junichi Uekawa + + * pdebuild.1: documentation update: note --debbuildopts and + --debootstrapopts have different ways of specifying multiple + options. This probably needs really fixing, but that will happen sometime later. + + * pbuilder.8: ditto. + 2007-04-11 Junichi Uekawa * AUTHORS, etc: remove $Id$, which is CVS specific -- cgit v1.2.3 From 03100c8ad82aa716bdd56691102a4f91586a517f Mon Sep 17 00:00:00 2001 From: Junichi Uekawa Date: Mon, 16 Apr 2007 07:50:28 +0900 Subject: B92test-pkg clarification --- ChangeLog | 2 ++ examples/B92test-pkg | 8 +++++--- 2 files changed, 7 insertions(+), 3 deletions(-) (limited to 'ChangeLog') diff --git a/ChangeLog b/ChangeLog index 4e64487..921ed3a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2007-04-16 Junichi Uekawa + * examples/B92test-pkg: change comment to clarify. + * pdebuild.1: documentation update: note --debbuildopts and --debootstrapopts have different ways of specifying multiple options. This probably needs really fixing, but that will happen sometime later. diff --git a/examples/B92test-pkg b/examples/B92test-pkg index 926d46a..5a2aba4 100644 --- a/examples/B92test-pkg +++ b/examples/B92test-pkg @@ -1,8 +1,10 @@ #!/bin/bash # example file to be used with --hookdir # -# run tests -# 2005 Junichi Uekawa +# run tests. Current directory is top of source-code. +# +# 2005, 2007 Junichi Uekawa +# set -e echo "Installing the prerequisites" @@ -20,7 +22,7 @@ COUNT=0 unset FAIL || true NOFAIL=1 -# make current directory a better place to live. +# The current directory is the top of the source-tree. cd /tmp/buildd/*/debian/.. for SCRIPT in $(run-parts --test /tmp/buildd/*/debian/pbuilder-test) ; do -- cgit v1.2.3 From 57278de13e6038265c8a0c39d4ec79cd416cd133 Mon Sep 17 00:00:00 2001 From: Junichi Uekawa Date: Tue, 17 Apr 2007 08:49:57 +0900 Subject: add lenny tests for upgrade testing --- ChangeLog | 5 +++++ testsuite/run-test.sh | 14 +++++++------- 2 files changed, 12 insertions(+), 7 deletions(-) (limited to 'ChangeLog') diff --git a/ChangeLog b/ChangeLog index 921ed3a..47a99bf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2007-04-17 Junichi Uekawa + + * testsuite/run-test.sh (HOOKOPTION): change upgrade testing + procedure + 2007-04-16 Junichi Uekawa * examples/B92test-pkg: change comment to clarify. diff --git a/testsuite/run-test.sh b/testsuite/run-test.sh index 3f7160f..57de9cf 100755 --- a/testsuite/run-test.sh +++ b/testsuite/run-test.sh @@ -79,15 +79,15 @@ for DEBOOTSTRAP in debootstrap cdebootstrap; do # upgrading testing. case $distribution in - sarge) - sudo ${PBUILDER} update $HOOKOPTION --basetgz ${testimage} --distribution etch --mirror $mirror --override-config --logfile ${logdir}/pbuilder-update-${distribution}-etch.log + etch) + sudo ${PBUILDER} update $HOOKOPTION --basetgz ${testimage} --distribution lenny --mirror $mirror --override-config --logfile ${logdir}/pbuilder-update-${distribution}-etch.log log_success update-${distribution}-etch.log - sudo ${PBUILDER} update $HOOKOPTION --basetgz ${testimage} --distribution sid --mirror $mirror --override-config --logfile ${logdir}/pbuilder-update-${distribution}-etch-sid.log - log_success update-${distribution}-etch-sid.log - sudo ${PBUILDER} update $HOOKOPTION --basetgz ${testimage} --distribution experimental --mirror $mirror --override-config --logfile ${logdir}/pbuilder-update-${distribution}-etch-sid-experimental.log - log_success update-${distribution}-etch-sid-experimental.log + sudo ${PBUILDER} update $HOOKOPTION --basetgz ${testimage} --distribution sid --mirror $mirror --override-config --logfile ${logdir}/pbuilder-update-${distribution}-sid.log + log_success update-${distribution}-lenny-sid.log + sudo ${PBUILDER} update $HOOKOPTION --basetgz ${testimage} --distribution experimental --mirror $mirror --override-config --logfile ${logdir}/pbuilder-update-${distribution}-lenny-sid-experimental.log + log_success update-${distribution}-sid-experimental.log ;; - etch) + lenny) sudo ${PBUILDER} update $HOOKOPTION --basetgz ${testimage} --distribution sid --mirror $mirror --override-config --logfile ${logdir}/pbuilder-update-${distribution}-sid.log log_success update-${distribution}-sid.log sudo ${PBUILDER} update $HOOKOPTION --basetgz ${testimage} --distribution experimental --mirror $mirror --override-config --logfile ${logdir}/pbuilder-update-${distribution}-sid-experimental.log -- cgit v1.2.3 From 83aa0648af323a64ab759ab8698c73a733845c64 Mon Sep 17 00:00:00 2001 From: Junichi Uekawa Date: Tue, 17 Apr 2007 08:50:32 +0900 Subject: remove amd64 from debian/rules --- ChangeLog | 2 ++ debian/changelog | 4 ++-- debian/rules | 14 -------------- 3 files changed, 4 insertions(+), 16 deletions(-) (limited to 'ChangeLog') diff --git a/ChangeLog b/ChangeLog index 47a99bf..7518973 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2007-04-17 Junichi Uekawa + * debian/rules: remove amd64 from build rules. + * testsuite/run-test.sh (HOOKOPTION): change upgrade testing procedure diff --git a/debian/changelog b/debian/changelog index 1281797..689f5d1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -pbuilder (0.166) UNRELEASED; urgency=low +pbuilder (0.166) unstable; urgency=low [ Junichi Uekawa ] * Re-Bug fix: "pbuilder: pbuilder-uml should not overwrite network @@ -15,7 +15,7 @@ pbuilder (0.166) UNRELEASED; urgency=low * New pbuilder-satisfydepends-aptitude resolver based on aptitude; based on an idea by Mike Hommey; closes: #337015. - -- Junichi Uekawa Mon, 16 Apr 2007 07:46:01 +0900 + -- Junichi Uekawa Tue, 17 Apr 2007 08:42:01 +0900 pbuilder (0.165) unstable; urgency=low diff --git a/debian/rules b/debian/rules index 6993112..e07aa50 100755 --- a/debian/rules +++ b/debian/rules @@ -74,20 +74,6 @@ ifeq (${ARCH},i386) dh_md5sums -a dh_builddeb -a endif -ifeq (${ARCH},amd64) - dh_testdir -a - dh_testroot -a - dh_installdocs -a - dh_installman -ppbuilder-uml pbuilder-user-mode-linux.1 pbuilder-uml.conf.5 pdebuild-user-mode-linux.1 - dh_installchangelogs -a - dh_link -a - dh_compress -a - dh_fixperms -a - dh_installdeb -a - dh_gencontrol -a - dh_md5sums -a - dh_builddeb -a -endif binary: binary-indep binary-arch -- cgit v1.2.3