+ * pbuilder-buildpackage (PACKAGENAME): add banner for logfile.

+
+	* debian/control (Recommends): add devscripts to recommends
+
+	* pbuilder-checkparams (USE_PKGNAME_LOGFILE): fix typo
+
+	* pbuilder-modules (pbuilder-options): add reference to pkgname-logfile to help text.
+
+	* pbuilder.8: documentation of pkgname-logfile moved closer to --logfile option.
+
+	* ChangeLog: spell-checked.
+
+	* pbuilder.8: document --pkgname-logfile option.
+	From Michael Banck <mbanck@gmx.net>, requested feature.
+
 	* pbuilder-checkparams (PBUILDER_BUILD_LOGFILE): logfile name is stored in PBUILDER_BUILD_LOGFILE
+	(PBUILDER_BUILD_LOGFILE): add --pkgname-logfile option for using logfile with pkgname-version.log
+	(USE_PKGNAME_LOGFILE): make this variable be usable only as command-line option, and not for
+	configuration.

8 files changed, 60 insertions, 9 deletions

diff --git a/ChangeLog b/ChangeLog
index 002fd34..9f3fbe0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,24 @@
 2002-12-12  Junichi Uekawa  <dancer@debian.org>
 
+	* pbuilder-buildpackage (PACKAGENAME): add banner for logfile.
+
+	* debian/control (Recommends): add devscripts to recommends
+
+	* pbuilder-checkparams (USE_PKGNAME_LOGFILE): fix typo
+
+	* pbuilder-modules (pbuilder-options): add reference to pkgname-logfile to help text.
+
+	* pbuilder.8: documentation of pkgname-logfile moved closer to --logfile option.
+
+	* ChangeLog: spell-checked.
+
+	* pbuilder.8: document --pkgname-logfile option.
+	From Michael Banck <mbanck@gmx.net>, requested feature.
+
 	* pbuilder-checkparams (PBUILDER_BUILD_LOGFILE): logfile name is stored in PBUILDER_BUILD_LOGFILE
+	(PBUILDER_BUILD_LOGFILE): add --pkgname-logfile option for using logfile with pkgname-version.log
+	(USE_PKGNAME_LOGFILE): make this variable be usable only as command-line option, and not for 
+	configuration.
 
 	* pbuilderrc.5: update doc to document AUTO_DEBSIGN
 
@@ -8,6 +26,7 @@
 	pdebuild is used inside pbuilder.
 	(PKG_SOURCENAME, PKG_VERSION): define as version and source base name.
 	(debsign): invoke debsign when AUTO_DEBSIGN=yes.
+	From Andrew Lau <netsnipe@debianplanet.org>, requested feature.
 
 	* pdebuild.1: update docs, so that --buildresult quirk is documented,
 	and --auto-debsign is documented.
@@ -63,7 +82,7 @@
 2002-11-12  Junichi Uekawa  <dancer@debian.org>
 
 	* debian/README.Debian: update documentation a 
-	littlebit.
+	little-bit.
 
 2002-10-30  Junichi Uekawa  <dancer@debian.org>
 
@@ -97,7 +116,7 @@
 	Reported by: Robert Bihlmeyer <robbe@orcus.priv.at>
 
 	* pbuilder-buildpackage: Changed to work with trap instead of other
-	kludgy alternatives.
+	kludgey alternatives.
 
 	* pbuilder-buildpackage-funcs: fixed to use trap for buildpackage hooks.
 
diff --git a/THANKS b/THANKS
index 0be0f41..97a34af 100644
--- a/THANKS
+++ b/THANKS
@@ -19,6 +19,7 @@ Peter Hawkins <peter@hawkins.emu.id.au>
 Michael Banck <mbanck@gmx.net>;
 Clint Adams <schizo@debian.org>
 Daniel Schepler <schepler@math.berkeley.edu>
+Andrew Lau <netsnipe@debianplanet.org>
 
 I thank them all!
 
diff --git a/debian/changelog b/debian/changelog
index dfafc9d..16ee65c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,14 @@
-pbuilder (0.52) UNRELEASED; urgency=low
+pbuilder (0.52) unstable; urgency=low
 
   * Clarify pbuilder.8 documentation on the timing of hook "A".
   * --auto-debsign option, to debsign the resulting package. 
   (closes: #165511), requested from Andrew Lau <netsnipe@debianplanet.org>
+  * --pkgname-logfile option, to allow creation of log files based on
+  package name and version. (closes: #157791), requested from Michael Banck <mbanck@gmx.net>
+  * debian/control: add devscripts to recommends, because this package uses
+  devscripts features quite a lot in pdebuild etc.
 
- -- Junichi Uekawa <dancer@debian.org>  Thu, 12 Dec 2002 17:45:49 +0900
+ -- Junichi Uekawa <dancer@debian.org>  Thu, 12 Dec 2002 18:28:48 +0900
 
 pbuilder (0.51) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 4327041..1350072 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Standards-Version: 3.5.7
 Package: pbuilder
 Architecture: all
 Depends: debootstrap (>= 0.1.17.9), wget, gcc, debianutils (>= 1.13.1)
-Recommends: fakeroot, sudo
+Recommends: fakeroot, sudo, devscripts
 Suggests: pbuilder-user-mode-linux
 Description: personal package builder for Debian packages
  pbuilder constructs a chroot system, and builds a package inside the
diff --git a/pbuilder-buildpackage b/pbuilder-buildpackage
index 0ed9a4d..d1d1089 100755
--- a/pbuilder-buildpackage
+++ b/pbuilder-buildpackage
@@ -20,7 +20,6 @@ export LANG=C
 export LC_ALL=C
 set -e
 
-
 . /usr/lib/pbuilder/pbuilder-checkparams
 . /usr/lib/pbuilder/pbuilder-runhooks
 . /usr/lib/pbuilder/pbuilder-buildpackage-funcs
@@ -46,18 +45,29 @@ fi
 
 export HOME="/tmp/buildd"
 
-showbuildbanner '$Id'
+showbuildbanner '$Id$'
 echobacktime
 extractbuildplace 
 trap umountproc_cleanbuildplace exit
 loadhooks
 createbuilduser
 
-echo Copying source file
+if [ -z "${PBUILDER_BUILD_LOGFILE}" ]; then
+    if [ "${USE_PKGNAME_LOGFILE}" = "yes" ]; then
+	PBUILDER_BUILD_LOGFILE=$(readlink -f "${BUILDRESULT}/"$(basename "${PACKAGENAME}" .dsc).log)
+	exec > "${PBUILDER_BUILD_LOGFILE}"
+	exec 2>&1
+	echo "I: Using pkgname logfile"
+	showbuildbanner '$Id$'
+	echobacktime
+    fi
+fi
+
+echo "Copying source file"
 copydsc "$PACKAGENAME" "$BUILDPLACE/tmp/buildd"
 executehooks "D"
 
-echo Extracting source
+echo "Extracting source"
 if ! $CHROOTEXEC /bin/bash -c "( cd tmp/buildd; chown $BUILDUSERNAME:$BUILDUSERNAME ../buildd *; $SUTOUSER /usr/bin/dpkg-source -x $(basename $PACKAGENAME) )"; then
     echo "pbuilder: Failed extracting the source" >&2 
     exit 1;
diff --git a/pbuilder-checkparams b/pbuilder-checkparams
index b442ac0..6e0f6e1 100755
--- a/pbuilder-checkparams
+++ b/pbuilder-checkparams
@@ -26,6 +26,7 @@ CHROOTEXEC=""
 OVERRIDE_APTLINES="no"
 BINARY_ARCH="no"
 PBUILDER_BUILD_LOGFILE=
+USE_PKGNAME_LOGFILE=""
 
 while [ -n "$1" ]; do 
     case "$1" in 
@@ -91,6 +92,10 @@ while [ -n "$1" ]; do
 	    PBUILDER_BUILD_LOGFILE=$(readlink -f "$2")
 	    shift; shift;
 	    ;;
+	--pkgname-logfile)
+	    USE_PKGNAME_LOGFILE="yes"
+	    shift; 
+	    ;;
 	--aptconfdir)
 	    APTCONFDIR="$2";
 	    shift; shift;
diff --git a/pbuilder-modules b/pbuilder-modules
index 2df5a18..450089a 100644
--- a/pbuilder-modules
+++ b/pbuilder-modules
@@ -58,6 +58,7 @@ pbuilder-options:
  --debemail [mail address]
  --debbuildopts [dpkg-buildpackage options]
  --logfile [filename to output log]
+ --pkgname-logfile
  --aptconfdir [overriding apt config dir]
  --timeout [timeout time]
  --override-config 
diff --git a/pbuilder.8 b/pbuilder.8
index 5a6dc4e..b5d318e 100644
--- a/pbuilder.8
+++ b/pbuilder.8
@@ -275,6 +275,16 @@ instead of messages coming to the
 standard output.
 
 .TP
+.BI "--pkgname-logfile"
+Alternative option to 
+.B "--logfile"
+option. 
+Automatically creates a logfile that is named by the .dsc file name,
+only really applicable for 
+.B build
+target
+
+.TP
 .BI "--aptconfdir [" "APT configuration directory to use" "]"
 Uses the apt configuration file found in the specified directory 
 as the chroot configuration.
@@ -312,6 +322,7 @@ Setting
 after this option will re-set some parts of the effect.
 
 
+
 .SH "FILES"
 .TP
 .I "/etc/pbuilderrc"