--- ChangeLog 11 Apr 2005 06:24:29 -0000 1.293

+++ ChangeLog	16 Apr 2005 04:39:27 -0000
@@ -1,3 +1,20 @@
+2005-04-16  Junichi Uekawa  <dancer@debian.org>
+
+	* pbuilder-modules: document signing-related options in pbuilder-options.
+
+	* pdebuild-user-mode-linux:
+	* pdebuild: implement keyid specification.
+
+	* Documentation/pbuilder-doc.xml: add document on using auto-debsign
+	and add a FAQ entry for source.changes file.
+
+	* pbuilder-checkparams: use --debsign-k option
+	to specify DEBSIGN_KEYID
+
+	* pdebuild.1: add --debsign-k option
+
+	* pdebuild-user-mode-linux.1: add --debsign-k option
+

1 files changed, 8 insertions, 1 deletions

diff --git a/pdebuild b/pdebuild
index 45725b6..0b1a1ec 100644
--- a/pdebuild
+++ b/pdebuild
@@ -46,6 +46,13 @@ else
     ${PBUILDERROOTCMD} pbuilder build "$@" ${EXTRA_CONFIGFILE[@]/#/--configfile } --buildresult "${BUILDRESULT}"  --debbuildopts "${DEBBUILDOPTS}" ../"${PKG_SOURCENAME}_${PKG_VERSION}".dsc
 fi
 
+# do signing with optional key specifier
 if [ "${AUTO_DEBSIGN}" = "yes" ]; then
-    debsign "${BUILDRESULT}/${PKG_SOURCENAME}_${PKG_VERSION}_${ARCHITECTURE}.changes"
+    unset DEBSIGN_PARAM || true
+    if [ -n "${DEBSIGN_KEYID}" ]; then
+	DEBSIGN_PARAM[1]="-k${DEBSIGN_KEYID}"
+    fi
+    DEBSIGN_PARAM[2]="${BUILDRESULT}/${PKG_SOURCENAME}_${PKG_VERSION}_${ARCHITECTURE}.changes"
+    debsign "${DEBSIGN_PARAM[@]}"
+
 fi