diff options
| -rw-r--r-- | debian/changelog | 9 | ||||
| -rwxr-xr-x | pbuilder-buildpackage | 2 | ||||
| -rwxr-xr-x | pbuilder-checkparams | 10 | ||||
| -rw-r--r-- | pbuilder-modules | 2 | ||||
| -rw-r--r-- | pbuilder.1 | 14 | ||||
| -rwxr-xr-x | pbuilderrc | 4 | ||||
| -rw-r--r-- | pbuilderrc.5 | 11 |
7 files changed, 25 insertions, 27 deletions
diff --git a/debian/changelog b/debian/changelog index 430e7ec..6207845 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,14 +5,13 @@ pbuilder (0.10) unstable; urgency=low * Depends on gcc, because debootstrap does not seem to function well without gcc. Actually, dpkg does not work without gcc, when it is asked questions about the "architecture." - * Add support for sponsor-uploading. Thus, forcing pbuilder to build + * Add support for specifying modifier. Thus, forcing pbuilder to build with - dpkg-buildpackage -m"Junichi Uekawa <dancer@debian.org>" + dpkg-buildpackage -mdancer@debian.org" should be possible via - pbuiler build --sponsorship package.dsc - and configuring SPONSORING_MAILADDR variable in pbuilderrc. + pbuiler build --debemail dancer@debian.org package.dsc - -- Junichi Uekawa <dancer@debian.org> Fri, 26 Oct 2001 00:46:38 +0900 + -- Junichi Uekawa <dancer@debian.org> Fri, 2 Nov 2001 15:39:29 +0900 pbuilder (0.9) unstable; urgency=low diff --git a/pbuilder-buildpackage b/pbuilder-buildpackage index 45c2822..1ac84db 100755 --- a/pbuilder-buildpackage +++ b/pbuilder-buildpackage @@ -188,7 +188,7 @@ fi echo Building the package export PATH="/usr/sbin:/usr/bin:/sbin:/bin:/usr/X11R6/bin" -if ! $CHROOTEXEC /bin/bash -c "cd tmp/buildd/*/; dpkg-buildpackage \"$DPKG_BUILDPACKAGEOPT\""; then +if ! $CHROOTEXEC /bin/bash -c "cd tmp/buildd/*/; dpkg-buildpackage \"-m$DEBEMAIL\""; then echo "pbuilder: Failed autobuilding of package" >&2 abortingfunction exit 1; diff --git a/pbuilder-checkparams b/pbuilder-checkparams index 08de056..6429568 100755 --- a/pbuilder-checkparams +++ b/pbuilder-checkparams @@ -61,13 +61,12 @@ while [ -n "$1" ]; do HOOKDIR="$2"; shift; shift; ;; + --debemail) + DEBEMAIL="$2"; + shift; shift; --help) showhelp ;; - --sponsorship) - DPKG_BUILDPACKAGEOPT="-m$SPONSORING_MAILADDR"; - shift; - ;; --*) echo "Error: Unknown option [$1] was specified " >&2 exit 1; @@ -79,3 +78,6 @@ while [ -n "$1" ]; do done BUILDPLACE=${BUILDPLACE?"Build root directory is not defined"} +if [ -z "$DEBEMAIL" ]; then + DEBEMAIL="nobody@nowhere" +fi diff --git a/pbuilder-modules b/pbuilder-modules index 67af9ce..a94a655 100644 --- a/pbuilder-modules +++ b/pbuilder-modules @@ -38,7 +38,7 @@ Operation Options: --extrapackages [packages-to-add on pbuilder create] --configfile [configuration file to load] --hookdir [hook directory] - --sponsorship + --debemail [mail address] EOF exit 1 } @@ -153,16 +153,12 @@ as the 4th parameter in the chroot creation process. This allows for use of custom debootstrap hook script. .TP -.BI "--sponsorship" +.BI "--debemail [" "email-address" "]" -For Debian developer to compile packge for a sponsored -person, the Maintainer: address is set to the sponsored, -but the upload needs to be signed by the sponsor. -Thus, this is required hack to make that possible. -Add your own name, so that you can sign your package. - -It is configured through the configuration -.B "SPONSORING_MAILADDR" +Specifies that dpkg-buildpackage be called with +.B "-m$DEBEMAIL" +instead of default value specified in the environmental +variable, or pbuilderrc .SH "FILES" .TP @@ -22,6 +22,6 @@ HOOKDIR="" # make debconf not interact with user export DEBIAN_FRONTEND=noninteractive -# Address used when sponsoring. -SPONSORING_MAILADDR="" +# Address used when building. +#DEBEMAIL="someone@somewhere" diff --git a/pbuilderrc.5 b/pbuilderrc.5 index fbf3734..b1ea1d0 100644 --- a/pbuilderrc.5 +++ b/pbuilderrc.5 @@ -114,15 +114,16 @@ will update to this distribution, if this is specified, unless command line option is specified to override this. .TP -.BI "SPONSORING_MAILADDR=" "Name <Mail@Address>"; +.BI "DEBEMAIL=" "Mail@Address"; If this was specified, .B dpkg-buildpackage command will be passed with the necessary sponsorship option -.B "-mName <Mail@Address>" -when -.B "--sponsorship" -command-line option is specified, on building. +.B "-mMail@Address" +on building. +Overwridden with +.B "--debemail" +command-line option. .SH "FILES" .I "/etc/pbuilderrc" |