diff options
-rw-r--r-- | ChangeLog | 17 | ||||
-rw-r--r-- | debian/changelog | 12 | ||||
-rwxr-xr-x | pbuilder-buildpackage | 2 | ||||
-rwxr-xr-x | pbuilder-checkparams | 3 | ||||
-rw-r--r-- | pbuilder.1 | 2 | ||||
-rwxr-xr-x | pbuilderrc | 2 | ||||
-rw-r--r-- | pbuilderrc.5 | 1 |
7 files changed, 33 insertions, 6 deletions
@@ -1,3 +1,20 @@ +2002-03-03 Junichi Uekawa <dancer@debian.org> + + * pbuilder.1: fix the documentation, --debbuildopts. + Note the default. + + * pbuilder-checkparams (BUILDPLACE): no longer set DEBEMAIL to + nobody@nowhere even if it is "". Just hope that the + user has set it to a valid value. + + * pbuilderrc (DEBEMAIL): nobody@nowhere is the default DEBEMAIL. + Configure it! + +2002-02-26 Junichi Uekawa <dancer@debian.org> + + * pbuilder-buildpackage: reversed logic. sort -nr instead of sort in + PACKAGEVERSION apt-cache routine. + 2002-02-24 Junichi Uekawa <dancer@debian.org> * debian/changelog: release 0.24 diff --git a/debian/changelog b/debian/changelog index e49ba9f..d4746e2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,15 @@ +pbuilder (0.25) unstable; urgency=low + + * new version, not yet released (FIXME!!) + * Build-Dependency version checking improved, should work slightly better + when multiple versions are available (reported by jbouse@debian.org) + * logic-error on DEBEMAIL handling fixed. When it was blank, + it was set to "nobody@nowhere", but that shouldn't be necessary. + (closes: 136628) + * pbuilderrc.5: documenting pbuilder default is to build binary-only build. + + -- Junichi Uekawa <dancer@debian.org> Mon, 4 Mar 2002 00:27:08 +0900 + pbuilder (0.24) unstable; urgency=low * hooks support is in place for build target now. Read pbuilder.1 diff --git a/pbuilder-buildpackage b/pbuilder-buildpackage index 96ddf18..bacd86a 100755 --- a/pbuilder-buildpackage +++ b/pbuilder-buildpackage @@ -36,7 +36,7 @@ function checkbuilddep_versiondeps () { local PACKAGE="$1" local COMPARESTRING="$2" local DEPSVERSION="$3" - local PACKAGEVERSION=$($CHROOTEXEC usr/bin/apt-cache show $PACKAGE | grep "^Version:" | sort | head -1 | sed 's/^Version: \(.*\)$/\1/') + local PACKAGEVERSION=$($CHROOTEXEC usr/bin/apt-cache show $PACKAGE | grep "^Version:" | sort -rn | head -1 | sed 's/^Version: \(.*\)$/\1/') # no versioned provides. if dpkg --compare-versions "$PACKAGEVERSION" "$COMPARESTRING" "$DEPSVERSION"; then # satisfies depends diff --git a/pbuilder-checkparams b/pbuilder-checkparams index 7cafa02..3de8880 100755 --- a/pbuilder-checkparams +++ b/pbuilder-checkparams @@ -124,9 +124,6 @@ while [ -n "$1" ]; do done BUILDPLACE=${BUILDPLACE?"Build root directory is not defined"} -if [ -z "$DEBEMAIL" ]; then - DEBEMAIL="nobody@nowhere" -fi case "$PBCURRENTCOMMANDLINEOPERATION" in login) @@ -234,7 +234,7 @@ variable, or pbuilderrc .BI "--debbuildopts [" "options" "]" List of options that are passed on to dpkg-buildpackage. Overrides -any value given in DEBBUILDOPTS as specified in the environment or in +any value given in DEBBUILDOPTS as specified in pbuilderrc. .TP @@ -26,7 +26,7 @@ HOOKDIR="" export DEBIAN_FRONTEND="noninteractive" # Address used when building. -#DEBEMAIL="someone@somewhere" +DEBEMAIL="nobody@nowhere" #for pbuilder debuild BUILDSOURCEROOTCMD="fakeroot" diff --git a/pbuilderrc.5 b/pbuilderrc.5 index 3245440..b29f643 100644 --- a/pbuilderrc.5 +++ b/pbuilderrc.5 @@ -149,6 +149,7 @@ The options given here will be passed on to This can be useful e.g. for binary-only builds. The command-line option .B "--debbuildopts" overrides any contents specified here. +The default value is to build binary-only. .TP .BI "BUILDSOURCEROOTCMD=" "fakeroot" |