aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--debian/changelog6
-rw-r--r--pbuilder.812
-rw-r--r--pdebuild.110
4 files changed, 32 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index a3e5ecd..de10330 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-08-29 Junichi Uekawa <dancer@debian.org>
+
+ * pdebuild.1: update semantics; left-to-right
+ * pbuilder.8: update semantics; left-to-right
+
2005-08-28 Junichi Uekawa <dancer@debian.org>
* pbuilderrc: SHELL variable is set a default value.
diff --git a/debian/changelog b/debian/changelog
index 6824d4f..a278763 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+pbuilder (0.131) UNRELEASED; urgency=low
+
+ * Document that pbuilder applies options from left-to-right. (closes: #324620)
+
+ -- Junichi Uekawa <dancer@debian.org> Mon, 29 Aug 2005 21:34:04 +0900
+
pbuilder (0.130) unstable; urgency=low
* depend on cdebootstrap, and suggest debootstrap. You may alternatively use
diff --git a/pbuilder.8 b/pbuilder.8
index b785178..e6d6e8f 100644
--- a/pbuilder.8
+++ b/pbuilder.8
@@ -18,7 +18,9 @@ Front end program to the
.B "pbuilder"
suite of programs, used for creating and maintaining chroot environment
and building Debian package in the chroot environment.
-.SH OPTIONS
+
+.SH "COMMANDS"
+
.TP
.B "create"
Creates a
@@ -93,6 +95,14 @@ This command is a convenience script,
and it does not accept most command-line options.
This may change in the future.
+.SH "OPTIONS"
+
+The command is followed by options of the form
+.BI "\-\-" "option name"
+which will modify the semantics as explained below.
+They are applied from left-to-right, and when there are
+conflicting options, the rightmost options will have effect.
+
.TP
.BI "\-\-basetgz [" "basetgz-location" "]"
Specifies the location of
diff --git a/pdebuild.1 b/pdebuild.1
index 9682922..f6608ef 100644
--- a/pdebuild.1
+++ b/pdebuild.1
@@ -14,6 +14,16 @@ One must be inside the source tree containing the
directory, in order to make it work.
.SH "PDEBUILD OPTIONS"
+
+The first option is always the operation to be done.
+It is followed by options of the form
+.BI "\-\-" "option name"
+which will modify the semantics as explained below.
+They are applied from left-to-right, and when there are
+conflicting options, the rightmost options will have effect.
+
+
+
.TP
.BI "\-\-buildsourceroot [" "fakeroot" "]"
The command used to gain root privilege for