--- 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
+

9 files changed, 83 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 89e1190..94c4128 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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
+
 2005-04-11  Junichi Uekawa  <dancer@debian.org>
 
 	* examples/B91dpkg-i: Fix example script so that it actually works.
diff --git a/Documentation/pbuilder-doc.xml b/Documentation/pbuilder-doc.xml
index 6b04918..a488583 100644
--- a/Documentation/pbuilder-doc.xml
+++ b/Documentation/pbuilder-doc.xml
@@ -981,6 +981,29 @@ $ sudo pbuilder update --hookdir ~/loginhooks/E10shell
 	inside your chroot.
       </para>
     </sect1>
+    <sect1 id="sponsor">
+      <title>Using pdebuild to sponsor package</title>
+      <para>
+	To sign a package marking for sponsorship, 
+	it is possible to use<command><option> --auto-debsign</option></command> and 
+	<command><option>--debsign-k</option></command> options of pdebuild.
+      </para>
+      <screen>
+	<command>pdebuild  <option>--auto-debsign </option> <option>--debsign-k </option><parameter>XXXXXXXX</parameter></command>
+      </screen>
+    </sect1>
+    <sect1 id="sourcechanges">
+      <title>Why is there a source.changes file in ../?</title>
+      <para>
+	When running pdebuild, pbuilder will run dpkg-buildpackage to create a 
+	Debian source package to pass it on to pbuilder.
+	File named XXXX_YYY_source.changes is what remains from that process.
+	It is harmless unless you try to upload it to the Debian archive.
+      </para>
+      <para>
+	This behavior is different when running through --use-pdebuild-internal
+      </para>
+    </sect1>
     <!-- end of FAQ -->
   </chapter>
   <chapter id="otheruse">
diff --git a/debian/changelog b/debian/changelog
index a828b6a..2d0ce54 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+pbuilder (0.126) unstable; urgency=low
+
+  * Documentation/pbuilder-doc.xml: 
+    Add documentation on why source.changes file is generated.
+    Add documentation on what options are available for sponsoring.
+  * Add --debsign-k option to pdebuild to allow specifying the keyid 
+    for signing the package; for sponsoring. (closes: #304849)
+
+ -- Junichi Uekawa <dancer@debian.org>  Sat, 16 Apr 2005 13:39:04 +0900
+
 pbuilder (0.125) unstable; urgency=low
 
   * Bug fix: "pbuilder: example/B91dpkg-i calls dpkg --purge with
diff --git a/pbuilder-checkparams b/pbuilder-checkparams
index 33ffd24..c205be5 100755
--- a/pbuilder-checkparams
+++ b/pbuilder-checkparams
@@ -183,6 +183,10 @@ while [ -n "$1" ]; do
 	    AUTO_DEBSIGN="yes"
 	    shift;
 	    ;;
+	--debsign-k)
+	    DEBSIGN_KEYID="$2"
+	    shift; shift; 
+	    ;;
 	--buildsourceroot*)
 	    BUILDSOURCEROOTCMD="$2";
 	    shift; shift;
diff --git a/pbuilder-modules b/pbuilder-modules
index 9a549af..dda4edc 100644
--- a/pbuilder-modules
+++ b/pbuilder-modules
@@ -78,6 +78,8 @@ pdebuild-specific pbuilder-options:
  --pbuilderroot [command to obtain root privilege for pbuilder] 
  --buildsourceroot [command to obtain root privilege for dpkg-buildpackage]
  --use-pdebuild-internal
+ --auto-debsign
+ --debsign-k [keyid]
 EOF
     exit 1
 }
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
diff --git a/pdebuild-user-mode-linux b/pdebuild-user-mode-linux
index 3fc7934..b08f8b1 100644
--- a/pdebuild-user-mode-linux
+++ b/pdebuild-user-mode-linux
@@ -49,6 +49,12 @@ else
     pbuilder-user-mode-linux build "$@" --buildresult "${UML_BUILDRESULT}" --debbuildopts "${DEBBUILDOPTS}" ../"${PKG_SOURCENAME}_${PKG_VERSION}".dsc
 fi
 
+# do signing with optional key specifier
 if [ "${AUTO_DEBSIGN}" = "yes" ]; then
-    debsign "${UML_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]="${UML_BUILDRESULT}/${PKG_SOURCENAME}_${PKG_VERSION}_${ARCHITECTURE}.changes"
+    debsign "${DEBSIGN_PARAM[@]}"
 fi
diff --git a/pdebuild-user-mode-linux.1 b/pdebuild-user-mode-linux.1
index 2402c44..4bda374 100644
--- a/pdebuild-user-mode-linux.1
+++ b/pdebuild-user-mode-linux.1
@@ -26,6 +26,12 @@ invoking dpkg-buildpackage
 Invoke debsign at the end of pdebuild process.
 
 .TP
+.BI "--debsign-k"
+Pass 
+.B -k
+option to debsign to specify which keyid to sign.
+
+.TP
 .BI "--buildresult [" "Directory for build results" "]"
 
 The place which build result is stored.
diff --git a/pdebuild.1 b/pdebuild.1
index 2fca1d5..41626c3 100644
--- a/pdebuild.1
+++ b/pdebuild.1
@@ -30,6 +30,12 @@ invoking pbuilder.
 Invoke debsign at the end of pdebuild process.
 
 .TP
+.BI "--debsign-k"
+Pass 
+.B -k
+option to debsign to specify which keyid to sign.
+
+.TP
 .BI "--buildresult [" "Directory for build results" "]"
 
 The place which build result is stored.