* fix pdebuild --help output (closes: #367133)

	* pbuilderrc.5: undocument the restriction that --buildresult
	option needs to be specified for pdebuild, and BUILDRESULT cannot
	be used.

	I should probably warn that the directory should be absolute.

	* pdebuild.1: fix man a bit to make --buildresult option doc
	unambiguous.

16 files changed, 37 insertions, 25 deletions

diff --git a/ChangeLog b/ChangeLog
index 322322e..80f3698 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2006-05-15  Junichi Uekawa  <dancer@debian.org>
+
+	* pbuilderrc.5: undocument the restriction that --buildresult
+	option needs to be specified for pdebuild, and BUILDRESULT cannot
+	be used.
+
+	I should probably warn that the directory should be absolute.
+
+	* pdebuild.1: fix man a bit to make --buildresult option doc
+	unambiguous.
+
+	* pbuilder-modules: fix pdebuild command options.
+
 2006-04-22  Junichi Uekawa  <dancer@debian.org>
 
 	* Documentation/pbuilder-doc.xml: update docs on user-mode-linux usage.
diff --git a/debian/changelog b/debian/changelog
index c733324..675a200 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
 pbuilder (0.153) UNRELEASED; urgency=low
 
-  * 
+  * fix pdebuild --help output (closes: #367133)
 
- -- Junichi Uekawa <dancer@debian.org>  Wed, 26 Apr 2006 09:36:45 +0900
+ -- Junichi Uekawa <dancer@debian.org>  Mon, 15 May 2006 03:10:06 +0900
 
 pbuilder (0.152) unstable; urgency=low
 
diff --git a/pbuilder b/pbuilder
index dbc62d4..28170b7 100755
--- a/pbuilder
+++ b/pbuilder
@@ -1,6 +1,6 @@
 #! /bin/bash
 #   pbuilder -- personal Debian package builder
-#   Copyright (C) 2001-2005 Junichi Uekawa
+#   Copyright (C) 2001-2006 Junichi Uekawa
 #
 #   This program is free software; you can redistribute it and/or modify
 #   it under the terms of the GNU General Public License as published by
diff --git a/pbuilder-buildpackage b/pbuilder-buildpackage
index e186ec8..e7f3d14 100755
--- a/pbuilder-buildpackage
+++ b/pbuilder-buildpackage
@@ -1,6 +1,6 @@
 #! /bin/bash
 #   pbuilder -- personal Debian package builder
-#   Copyright (C) 2001-2005 Junichi Uekawa
+#   Copyright (C) 2001-2006 Junichi Uekawa
 #
 #   This program is free software; you can redistribute it and/or modify
 #   it under the terms of the GNU General Public License as published by
diff --git a/pbuilder-buildpackage-funcs b/pbuilder-buildpackage-funcs
index d1ead6d..179ba67 100644
--- a/pbuilder-buildpackage-funcs
+++ b/pbuilder-buildpackage-funcs
@@ -1,6 +1,6 @@
 #! /bin/bash
 #   pbuilder -- personal Debian package builder
-#   Copyright (C) 2001,2002,2005 Junichi Uekawa
+#   Copyright (C) 2001,2002,2005-2006 Junichi Uekawa
 #
 #   This program is free software; you can redistribute it and/or modify
 #   it under the terms of the GNU General Public License as published by
diff --git a/pbuilder-checkparams b/pbuilder-checkparams
index 34fdccb..db68dc2 100755
--- a/pbuilder-checkparams
+++ b/pbuilder-checkparams
@@ -1,7 +1,7 @@
 #! /bin/bash 
 # this is sourced from pbuilder packages to process the optional parameters.
 #   pbuilder -- personal Debian package builder
-#   Copyright (C) 2001-2005 Junichi Uekawa
+#   Copyright (C) 2001-2006 Junichi Uekawa
 #
 #   This program is free software; you can redistribute it and/or modify
 #   it under the terms of the GNU General Public License as published by
diff --git a/pbuilder-createbuildenv b/pbuilder-createbuildenv
index 13307a7..32d2bd6 100755
--- a/pbuilder-createbuildenv
+++ b/pbuilder-createbuildenv
@@ -1,7 +1,7 @@
 #! /bin/bash
 # Creating the build environment with debootstrap.
 #   pbuilder -- personal Debian package builder
-#   Copyright (C) 2001-2003,2005 Junichi Uekawa
+#   Copyright (C) 2001-2003,2005-2006 Junichi Uekawa
 #
 #   This program is free software; you can redistribute it and/or modify
 #   it under the terms of the GNU General Public License as published by
diff --git a/pbuilder-loadconfig b/pbuilder-loadconfig
index a998548..73d5f00 100644
--- a/pbuilder-loadconfig
+++ b/pbuilder-loadconfig
@@ -1,7 +1,7 @@
 #! /bin/bash 
 # this is sourced from pbuilder packages to process the optional parameters.
 #   pbuilder -- personal Debian package builder
-#   Copyright (C) 2001,2002 Junichi Uekawa
+#   Copyright (C) 2001,2002,2006 Junichi Uekawa
 #
 #   This program is free software; you can redistribute it and/or modify
 #   it under the terms of the GNU General Public License as published by
diff --git a/pbuilder-modules b/pbuilder-modules
index 3650cd6..2f864cd 100644
--- a/pbuilder-modules
+++ b/pbuilder-modules
@@ -24,7 +24,7 @@ Copyright 2001-2005 Junichi Uekawa
 Distributed under GNU Public License version 2 or later
 
 pbuilder [operation] [pbuilder-options]
-pdebuild [pbuilder-options]
+pdebuild [pdebuild-options] -- [pbuilder-options]
 
 command lines:
 pbuilder create [--basetgz base.tgz-path] [--distribution potato|woody|sarge|etch|sid|experimental]
diff --git a/pbuilder-satisfydepends b/pbuilder-satisfydepends
index 00e9e34..92c1389 100644
--- a/pbuilder-satisfydepends
+++ b/pbuilder-satisfydepends
@@ -1,6 +1,6 @@
 #!/bin/bash
 #   pbuilder -- personal Debian package builder
-#   Copyright (C) 2001,2002,2003,2005 Junichi Uekawa
+#   Copyright (C) 2001,2002,2003,2005-2006 Junichi Uekawa
 #
 #   This program is free software; you can redistribute it and/or modify
 #   it under the terms of the GNU General Public License as published by
diff --git a/pbuilder-uml-checkparams b/pbuilder-uml-checkparams
index 7bc532d..bf35e34 100644
--- a/pbuilder-uml-checkparams
+++ b/pbuilder-uml-checkparams
@@ -1,6 +1,6 @@
 #! /bin/bash
 #   pbuilder-user-mode-linux -- personal Debian package builder
-#   Copyright (C) 2004,2005 Junichi Uekawa
+#   Copyright (C) 2004-2006 Junichi Uekawa
 #
 #   This program is free software; you can redistribute it and/or modify
 #   it under the terms of the GNU General Public License as published by
diff --git a/pbuilder-updatebuildenv b/pbuilder-updatebuildenv
index 7a0a0b3..4eb0d81 100755
--- a/pbuilder-updatebuildenv
+++ b/pbuilder-updatebuildenv
@@ -1,6 +1,6 @@
 #! /bin/bash
 #   pbuilder -- personal Debian package builder
-#   Copyright (C) 2001-2003,2005 Junichi Uekawa
+#   Copyright (C) 2001-2003,2005-2006 Junichi Uekawa
 #
 #   This program is free software; you can redistribute it and/or modify
 #   it under the terms of the GNU General Public License as published by
diff --git a/pbuilder-user-mode-linux b/pbuilder-user-mode-linux
index 6d8c1d8..d9ebffd 100755
--- a/pbuilder-user-mode-linux
+++ b/pbuilder-user-mode-linux
@@ -1,7 +1,8 @@
 #! /bin/bash
-# common modules for pbuilder.
+# pbuilder user-mode-linux hack.
+# 
 #   pbuilder -- personal Debian package builder
-#   Copyright (C) 2001-2005 Junichi Uekawa
+#   Copyright (C) 2001-2006 Junichi Uekawa
 #
 #   This program is free software; you can redistribute it and/or modify
 #   it under the terms of the GNU General Public License as published by
diff --git a/pbuilderrc.5 b/pbuilderrc.5
index 0e82edd..ee11d96 100644
--- a/pbuilderrc.5
+++ b/pbuilderrc.5
@@ -1,4 +1,4 @@
-.TH "pbuilderrc" 5 "2006 Feb 11" "Debian" "pbuilder"
+.TH "pbuilderrc" 5 "2006 May 15" "Debian" "pbuilder"
 .SH NAME
 pbuilderrc \- configuration files for personal package builder
 .SH DESCRIPTION
@@ -113,11 +113,11 @@ being mounted.
 Specify the default directory which the build result will
 be copied over to after the building.
 
-This option is not effective for 
-.B pdebuild 
-command. Use 
+Unlike
 .B "--buildresult"
-option instead.
+command-line option.
+The path is not canonicalized, so you should specify a full-path,
+not a relative path.
 
 .TP
 .BI "DISTRIBUTION=" "sid"
@@ -338,4 +338,3 @@ The homepage is available at
 .SH "SEE ALSO"
 .RI "pbuilder (" 8 "), "
 .RI "pdebuild (" 1 ")"
-
diff --git a/pdebuild-checkparams b/pdebuild-checkparams
index 6cd055f..0b60624 100644
--- a/pdebuild-checkparams
+++ b/pdebuild-checkparams
@@ -1,7 +1,7 @@
 #! /bin/bash 
 # this is sourced from pbuilder packages to process the optional parameters.
 #   pbuilder -- personal Debian package builder
-#   Copyright (C) 2005 Junichi Uekawa
+#   Copyright (C) 2005-2006 Junichi Uekawa
 #
 #   This program is free software; you can redistribute it and/or modify
 #   it under the terms of the GNU General Public License as published by
@@ -110,4 +110,3 @@ fi
 if [ -z "${CHROOTEXEC}" ]; then
     CHROOTEXEC="chroot $BUILDPLACE "
 fi
-
diff --git a/pdebuild.1 b/pdebuild.1
index f6608ef..2dcb450 100644
--- a/pdebuild.1
+++ b/pdebuild.1
@@ -1,4 +1,4 @@
-.TH "pdebuild" 1 "2005 Jul 10" "Debian" "pbuilder"
+.TH "pdebuild" 1 "2006 May 15" "Debian" "pbuilder"
 .SH NAME
 pdebuild \- pbuilder way of doing debuild
 .SH SYNOPSIS
@@ -50,8 +50,8 @@ option to debsign to specify which keyid to sign.
 
 The place which build result is stored.
 
-Note that for pdebuild, the setting for buildresult needs to be specified
-here in the command-line.
+Note that for pdebuild, buildresult needs to be specified as pdebuild
+option in the command-line, not as pbuilder option.
 
 .TP
 .BI "\-\-configfile [" "Extra config file to use" "]"