diff options
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | debian/changelog | 3 | ||||
| -rw-r--r-- | debian/copyright | 19 | ||||
| -rwxr-xr-x | pbuilder | 19 | ||||
| -rwxr-xr-x | pbuilder-checkparams | 1 | ||||
| -rw-r--r-- | pbuilder-modules | 4 | ||||
| -rwxr-xr-x | testsuite/run-test.sh | 8 |
7 files changed, 53 insertions, 11 deletions
@@ -1,5 +1,13 @@ 2004-01-11 Junichi Uekawa <dancer@debian.org> + * pbuilder-checkparams (IGNORE_UMOUNT): logging + + * debian/copyright (Copyright): update copyright info. + + * pbuilder: update copyright info + + * pbuilder-modules: update copyright info. + * testsuite/run-test.sh: change to pbuilder test, instead of UML. * testsuite/run-test-uml.sh: split out UML test @@ -1874,7 +1882,7 @@ energy. When pbuilder stabilizes, I will look at doing it. 14 Jan 2002 Junichi Uekawa <dancer@debian.org> - Copyright (c) 2001-2003 Junichi Uekawa + Copyright (c) 2001-2004 Junichi Uekawa $Id$ diff --git a/debian/changelog b/debian/changelog index d1be06b..67b675b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,8 +5,9 @@ pbuilder (0.99) UNRELEASED; urgency=low - pbuilder create failure due to debootstrap needs to be fixed in debootstrap script side. * Fix B91dpkg-i to fix typo in script to get names of packages properly. * Change HTML CSS + * debian/copyright: fix to get full copyright notice. - -- Junichi Uekawa <dancer@debian.org> Sun, 11 Jan 2004 09:34:02 +0900 + -- Junichi Uekawa <dancer@debian.org> Sun, 11 Jan 2004 23:47:41 +0900 pbuilder (0.98) unstable; urgency=low diff --git a/debian/copyright b/debian/copyright index a276204..a7db8af 100644 --- a/debian/copyright +++ b/debian/copyright @@ -9,5 +9,24 @@ Upstream Author: Copyright: +# pbuilder -- personal Debian package builder +# Copyright (C) 2001-2004 Junichi Uekawa +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +# pbuilder by Junichi Uekawa <dancer@debian.org> 2001 Aug 25 + GPL version 2 or later. See /usr/share/common-licenses/GPL on Debian systems. @@ -1,7 +1,22 @@ #! /bin/bash +# pbuilder -- personal Debian package builder +# Copyright (C) 2001-2004 Junichi Uekawa +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + # pbuilder by Junichi Uekawa <dancer@debian.org> 2001 Aug 25 -# Copyright 2001-2003 Junichi Uekawa -#Distributed under GPL version 2 or later set -e diff --git a/pbuilder-checkparams b/pbuilder-checkparams index de9682c..b9e5cf1 100755 --- a/pbuilder-checkparams +++ b/pbuilder-checkparams @@ -118,6 +118,7 @@ while [ -n "$1" ]; do shift; shift; ;; --logfile) + echo " -> Logging to $2" exec > "$2"; exec 2>&1 PBUILDER_BUILD_LOGFILE=$(readlink -f "$2") diff --git a/pbuilder-modules b/pbuilder-modules index e106ca6..27a6ca8 100644 --- a/pbuilder-modules +++ b/pbuilder-modules @@ -1,7 +1,7 @@ #! /bin/bash # common modules for pbuilder. # pbuilder -- personal Debian package builder -# Copyright (C) 2001-2003 Junichi Uekawa +# Copyright (C) 2001-2004 Junichi Uekawa # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -20,7 +20,7 @@ function showhelp () { cat <<EOF pbuilder - a personal builder -Copyright 2001-2003 Junichi Uekawa +Copyright 2001-2004 Junichi Uekawa Distributed under GNU Public License version 2 or later pbuilder [operation] [pbuilder-options] diff --git a/testsuite/run-test.sh b/testsuite/run-test.sh index e92295a..aa3d1fb 100755 --- a/testsuite/run-test.sh +++ b/testsuite/run-test.sh @@ -2,18 +2,16 @@ # This is a testsuite. # estimated run-time on my PC; ?? minutes. -PBUILDER=/usr/bin/pbuilder +PBUILDER=/usr/sbin/pbuilder vmstat -n 1 > vmstat & VMSTATPID=$! LC_ALL=C iostat -dxt hda > iostat & IOSTATPID=$! -sudo pbuilder test --configfile non-existing-configfile - if [ -x "${PBUILDER}" ]; then for distribution in sid sarge; do - sudo ${PBUILDER} create --mirror http://ring.asahi-net.or.jp/archives/linux/debian/debian --distribution "${distribution}" --basetgz $(pwd)/testimage --logfile ${PBUILDER}-create-${distribution}.log + sudo ${PBUILDER} create --mirror http://ring.asahi-net.or.jp/archives/linux/debian/debian --distribution "${distribution}" --basetgz $(pwd)/testimage --logfile pbuilder-create-${distribution}.log for PKG in dsh; do ( @@ -32,7 +30,7 @@ if [ -x "${PBUILDER}" ]; then ) done sudo ${PBUILDER} execute --basetgz $(pwd)/testimage --logfile pbuilder-execute-${distribution}.log ../examples/execute_paramtest.sh test1 test2 test3 - rm -rf testbuild testbuild2 testimage + sudo rm -rf testbuild testbuild2 testimage done fi |