--auto-debsign option

6 files changed, 79 insertions, 24 deletions

diff --git a/ChangeLog b/ChangeLog
index 2b0fd45..002fd34 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,23 @@
 2002-12-12  Junichi Uekawa  <dancer@debian.org>
 
+	* pbuilder-checkparams (PBUILDER_BUILD_LOGFILE): logfile name is stored in PBUILDER_BUILD_LOGFILE
+
+	* pbuilderrc.5: update doc to document AUTO_DEBSIGN
+
+	* pdebuild: force set BUILDRESULT from pdebuild options when invoking pbuilder, so that config from
+	pdebuild is used inside pbuilder.
+	(PKG_SOURCENAME, PKG_VERSION): define as version and source base name.
+	(debsign): invoke debsign when AUTO_DEBSIGN=yes.
+
+	* pdebuild.1: update docs, so that --buildresult quirk is documented,
+	and --auto-debsign is documented.
+
+	* pbuilder-checkparams: change option ordering so that
+	internal options go at bottom.
+	--auto-debsign option added for setting AUTO_DEBSIGN=yes
+	(BINARY_ARCH): move buildsourceroot and pbuilderroot option around 
+	so that they are in the pdebuild options section.
+
 	* pbuilder.8: fix the documentation to clarify that A is executed 
 	after satisfying the build-depends.
 
diff --git a/debian/changelog b/debian/changelog
index e0ec0be..dfafc9d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
-pbuilder (0.52) unstable; urgency=low
+pbuilder (0.52) UNRELEASED; 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>
 
- -- Junichi Uekawa <dancer@debian.org>  Thu, 12 Dec 2002 17:21:58 +0900
+ -- Junichi Uekawa <dancer@debian.org>  Thu, 12 Dec 2002 17:45:49 +0900
 
 pbuilder (0.51) unstable; urgency=low
 
diff --git a/pbuilder-checkparams b/pbuilder-checkparams
index b6580be..b442ac0 100755
--- a/pbuilder-checkparams
+++ b/pbuilder-checkparams
@@ -25,6 +25,7 @@ INTERNAL_BUILD_UML=""
 CHROOTEXEC=""
 OVERRIDE_APTLINES="no"
 BINARY_ARCH="no"
+PBUILDER_BUILD_LOGFILE=
 
 while [ -n "$1" ]; do 
     case "$1" in 
@@ -84,17 +85,10 @@ while [ -n "$1" ]; do
 	    DEBBUILDOPTS="$2";
 	    shift; shift;
 	    ;;
-	--buildsourceroot*)
-	    BUILDSOURCEROOTCMD="$2";
-	    shift; shift;
-	    ;;
-	--pbuilderroot*)
-	    PBUILDERROOTCMD="$2";
-	    shift; shift;
-	    ;;
 	--logfile)
 	    exec > $(readlink -f "$2");
 	    exec 2>&1
+	    PBUILDER_BUILD_LOGFILE=$(readlink -f "$2")
 	    shift; shift;
 	    ;;
 	--aptconfdir)
@@ -105,18 +99,6 @@ while [ -n "$1" ]; do
 	    TIMEOUT_TIME="$2"
 	    shift; shift;
 	    ;;
-	## internal options.
-	--internal-chrootexec)
-	    # specify custom chrootexec function -- this is internal debugging function
-	    CHROOTEXEC="$2"
-	    shift; shift;
-	    ;;
-	--internal-build-uml)
-	    # specify this option if I am running inside UML.
-	    echo " -> Running in pbuilder-user-mode-linux mode"
-	    INTERNAL_BUILD_UML="yes"
-	    shift; 
-	    ;;
 	--help)
 	    showhelp
 	    ;;
@@ -129,6 +111,32 @@ while [ -n "$1" ]; do
 	    DEBBUILDOPTS="${DEBBUILDOPTS} -B"
 	    shift;
 	    ;;
+	## pdebuild option
+	--auto-debsign)
+	    AUTO_DEBSIGN="yes"
+	    shift;
+	    ;;
+	--buildsourceroot*)
+	    BUILDSOURCEROOTCMD="$2";
+	    shift; shift;
+	    ;;
+	--pbuilderroot*)
+	    PBUILDERROOTCMD="$2";
+	    shift; shift;
+	    ;;
+	## internal options.
+	--internal-chrootexec)
+	    # specify custom chrootexec function -- this is internal debugging function
+	    CHROOTEXEC="$2"
+	    shift; shift;
+	    ;;
+	--internal-build-uml)
+	    # specify this option if I am running inside UML.
+	    echo " -> Running in pbuilder-user-mode-linux mode"
+	    INTERNAL_BUILD_UML="yes"
+	    shift; 
+	    ;;
+
 	--) # this is an empty option, to no longer process.
 	    shift; 
 	    break;
diff --git a/pbuilderrc.5 b/pbuilderrc.5
index 73aa694..bae7878 100644
--- a/pbuilderrc.5
+++ b/pbuilderrc.5
@@ -248,6 +248,12 @@ They probably need to be set to numeric UID values,
 so that it works the same inside the chroot and outside the 
 chroot.
 
+.TP
+.BI "AUTO_DEBSIGN=" "yes"
+When this value is set to yes, 
+.B pdebuild 
+will invoke debsign command after building.
+
 
 .SH "AUTHOR"
 Initial coding, and main maintenance is done by 
diff --git a/pdebuild b/pdebuild
index c72c7ee..cb3c7bb 100644
--- a/pdebuild
+++ b/pdebuild
@@ -11,6 +11,13 @@ if test ! -d ./debian; then
 fi;
 
 . /usr/lib/pbuilder/pbuilder-checkparams
-dpkg-buildpackage -S -us -uc -r$BUILDSOURCEROOTCMD || true
-$PBUILDERROOTCMD pbuilder build "$@" ../$(dpkg-parsechangelog|sed -n 's/^Source: //p')_$(dpkg-parsechangelog|sed -n 's/^Version: \(.*:\|\)//p').dsc
+
+PKG_SOURCENAME=$(dpkg-parsechangelog|sed -n 's/^Source: //p')
+PKG_VERSION=$(dpkg-parsechangelog|sed -n 's/^Version: \(.*:\|\)//p')
+
+dpkg-buildpackage -S -us -uc -r${BUILDSOURCEROOTCMD} || true
+${PBUILDERROOTCMD} pbuilder build "$@" --buildresult "${BUILDRESULT}" ../"${PKG_SOURCENAME}_${PKG_VERSION}".dsc
+if [ "${AUTO_DEBSIGN}" = "yes" ]; then
+    debsign "${BUILDRESULT}/${PKG_SOURCENAME}_${PKG_VERSION}.dsc"
+fi
 
diff --git a/pdebuild.1 b/pdebuild.1
index 4bd94b4..259695b 100644
--- a/pdebuild.1
+++ b/pdebuild.1
@@ -24,6 +24,15 @@ invoking dpkg-buildpackage
 The command used to gain root privilege for 
 invoking pbuilder.
 
+.TP
+.BI "--auto-debsign"
+
+Invoke debsign at the end of pdebuild process.
+
+.TP
+.BI "--buildresult [" "Directory for build results" "]"
+
+The place which build result is stored.
 
 .TP
 .BI "-- [" "pbuilder options" "]"
@@ -32,6 +41,11 @@ After the
 .B "--"
 symbol, an arbitrary number of pbuilder options can be specified.
 
+Except for
+.B "--buildresult"
+which needs to be specified before the 
+.B "--"
+
 .SH "FILES"
 .TP
 .I "/etc/pbuilderrc"