diff options
| -rw-r--r-- | ChangeLog | 20 | ||||
| -rw-r--r-- | debian/README.Debian | 3 | ||||
| -rw-r--r-- | debian/TODO | 6 | ||||
| -rw-r--r-- | debian/changelog | 4 | ||||
| -rwxr-xr-x | pbuilder | 2 | ||||
| -rwxr-xr-x | pbuilder-buildpackage | 17 | ||||
| -rwxr-xr-x | pbuilder-checkparams | 16 | ||||
| -rwxr-xr-x | pbuilder-createbuildenv | 18 | ||||
| -rw-r--r-- | pbuilder-modules | 22 | ||||
| -rwxr-xr-x | pbuilder-updatebuildenv | 16 | ||||
| -rw-r--r-- | pbuilder.1 | 2 | ||||
| -rw-r--r-- | pbuilderrc.5 | 2 |
12 files changed, 116 insertions, 12 deletions
@@ -1,5 +1,25 @@ 2002-02-02 Junichi Uekawa <dancer@debian.org> + * debian/README.Debian: typo fixes. + + * pbuilderrc.5: checked and fixed typos. + + * pbuilder-modules: fixed, privilate -> privilege + + * debian/TODO: fixed typo, added notes. + + * pbuilder-updatebuildenv: added GPL notice + + * pbuilder-createbuildenv: added GPL notice + + * pbuilder-checkparams: added GPL notice + + * pbuilder-modules: added GPL notice + + * pbuilder-buildpackage: added GPL notice at top + + * pbuilder: updated copyright notice to 2001,2002. + * pbuilder: remove the unnecessary test -z thing, so that duplicate help message will not appear. diff --git a/debian/README.Debian b/debian/README.Debian index 730f279..c3b426f 100644 --- a/debian/README.Debian +++ b/debian/README.Debian @@ -5,7 +5,7 @@ This is a personal builder. Try: pbuilder create --distribution woody -to create the initial build env. +to create the initial chroot build environment. pbuilder update would update @@ -37,7 +37,6 @@ with it. It is best to use cp. Support for mounts will hopefully come later, with some safeguards. - I would say this package works fine if these packages manage to build. Testsuite: diff --git a/debian/TODO b/debian/TODO index 16d1c0b..7ce4478 100644 --- a/debian/TODO +++ b/debian/TODO @@ -1,5 +1,7 @@ TODO and possible bugs: + * BUG: Too many options! Creeping featurism!! + * Build dependency handles |, but not when [] and | exist. -- no package should be using it ? * Machine type specification in Build dependency should either have @@ -10,7 +12,7 @@ TODO and possible bugs: * Please file a bug if you find that pbuilder does not exit with error condition on failure to build a package. * Remember to update the TODO file. - * Suppor for apt-move. Some, mount --bind trick ? + * Support for apt-move. Some, mount --bind trick ? - documentation of how to do it - updating the script hooks interface (mount / umount) - putting example scripts. @@ -24,7 +26,7 @@ TODO and possible bugs: * Supporting non-root users running. - current recommended procedure is to use a "sudo" setup. - - is it possible to use root privilage only when required? + - is it possible to use root privilege only when required? * Supporting arbitrary mount --bind for inside chroot. - some critical checking. diff --git a/debian/changelog b/debian/changelog index 590ff61..0c2659f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,11 +4,11 @@ pbuilder (0.20) unstable; urgency=low * --othermirror option fixed. Thanks go to kov@debian.org for pointing that out (closes: #131726). * --aptconfdir option. It is now possible to specify - --aptconfdir /etc/apt to use the system confis. + --aptconfdir /etc/apt to use the system configs. (closes: #116115) * some minor fixes. - -- Junichi Uekawa <dancer@debian.org> Sat, 2 Feb 2002 00:14:39 +0900 + -- Junichi Uekawa <dancer@debian.org> Sat, 2 Feb 2002 01:06:53 +0900 pbuilder (0.19) unstable; urgency=low @@ -1,6 +1,6 @@ #! /bin/bash # pbuilder by Junichi Uekawa <dancer@debian.org> 2001 Aug 25 -# Copyright 2001 Junichi Uekawa +# Copyright 2001,2002 Junichi Uekawa #Distributed under GPL version 2 or later set -e diff --git a/pbuilder-buildpackage b/pbuilder-buildpackage index 76df7dd..c539867 100755 --- a/pbuilder-buildpackage +++ b/pbuilder-buildpackage @@ -1,4 +1,21 @@ #! /bin/bash +# pbuilder -- personal Debian package builder +# Copyright (C) 2001,2002 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 + export LANG=C export LC_ALL=C set -e diff --git a/pbuilder-checkparams b/pbuilder-checkparams index a36247c..945210f 100755 --- a/pbuilder-checkparams +++ b/pbuilder-checkparams @@ -1,5 +1,21 @@ #! /bin/bash # this is sourced from pbuilder packages to process the optional parameters. +# pbuilder -- personal Debian package builder +# Copyright (C) 2001,2002 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 for RCFILE in /usr/share/pbuilder/pbuilderrc /etc/pbuilderrc ${HOME}/.pbuilderrc; do if [ -f "$RCFILE" ]; then diff --git a/pbuilder-createbuildenv b/pbuilder-createbuildenv index 3cee940..67eea80 100755 --- a/pbuilder-createbuildenv +++ b/pbuilder-createbuildenv @@ -1,5 +1,23 @@ #! /bin/bash # Creating the build environment with debootstrap. +# pbuilder -- personal Debian package builder +# Copyright (C) 2001,2002 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 + + set -e . /usr/lib/pbuilder/pbuilder-checkparams diff --git a/pbuilder-modules b/pbuilder-modules index ca507bb..8c6ff6b 100644 --- a/pbuilder-modules +++ b/pbuilder-modules @@ -1,10 +1,26 @@ #! /bin/bash # common modules for pbuilder. +# pbuilder -- personal Debian package builder +# Copyright (C) 2001,2002 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 function showhelp () { cat <<EOF pbuilder - a personal builder -Copyright 2001 Junichi Uekawa +Copyright 2001,2002 Junichi Uekawa Distributed under GNU Public License version 2 or later pbuilder [operation] [operation options] @@ -46,8 +62,8 @@ pbuilder options --aptconfdir [overriding apt config dir] pdebuild options - --pbuilderroot [command to obtain root privilate for pbuilder] - --buildsourceroot [command to obtain root privilate for dpkg-buildpackage] + --pbuilderroot [command to obtain root privilege for pbuilder] + --buildsourceroot [command to obtain root privilege for dpkg-buildpackage] EOF exit 1 } diff --git a/pbuilder-updatebuildenv b/pbuilder-updatebuildenv index 2fed04e..96d8418 100755 --- a/pbuilder-updatebuildenv +++ b/pbuilder-updatebuildenv @@ -1,4 +1,20 @@ #! /bin/bash +# pbuilder -- personal Debian package builder +# Copyright (C) 2001,2002 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 set -e @@ -162,7 +162,7 @@ Loads the configuration file. .BI "--hookdir [" "location of user scripts" "]" Specifies the location where scripts for user intervention during the create and update process are stored. Currently scripts are -executed at only one point, on eXit from the chrooted environment, +executed at only one point, on exit from the chrooted environment, just before either a create or a build regenerated the base.tgz file. The script names must be in the form .B "X<digit><digit><whatever-else-you-want>" diff --git a/pbuilderrc.5 b/pbuilderrc.5 index 41ca924..4ab5ab7 100644 --- a/pbuilderrc.5 +++ b/pbuilderrc.5 @@ -135,7 +135,7 @@ command-line option. The options given here will be passed on to .BR dpkg-buildpackage . -This can be useful eg. for binary-only builds. The command-line option +This can be useful e.g. for binary-only builds. The command-line option .B "--debbuildopts" overrides any contents specified here. |