A different way to implement the aforementioned feature.

It should be really good. I hope.

9 files changed, 61 insertions, 34 deletions

diff --git a/Makefile b/Makefile
index 466ac98..bb802cd 100644
--- a/Makefile
+++ b/Makefile
@@ -7,6 +7,7 @@ TAGS:
 install:
 	install -d $(DESTDIR)/etc
 	install -d $(DESTDIR)/usr/sbin
+	install -d $(DESTDIR)/usr/bin
 	install -d $(DESTDIR)/usr/lib/pbuilder
 	install -m 755 pbuilder-buildpackage $(DESTDIR)/usr/lib/pbuilder/
 	install -m 755 pbuilder-createbuildenv $(DESTDIR)/usr/lib/pbuilder/
@@ -15,5 +16,6 @@ install:
 	install -m 755 pbuilder-checkparams $(DESTDIR)/usr/lib/pbuilder/
 	install -m 755 pbuilder-modules $(DESTDIR)/usr/lib/pbuilder/
 	install -m 755 pbuilder $(DESTDIR)/usr/sbin
+	install -m 755 pdebuild $(DESTDIR)/usr/bin
 	install -m 644 pbuilderrc $(DESTDIR)/etc
 
diff --git a/debian/changelog b/debian/changelog
index 0fafc0e..e31656f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,10 +23,11 @@ pbuilder (0.10) unstable; urgency=low
   * full non-interactive compilation patch, moved over to 
     pbuilder-modules, so that build/update/create all benefit from this.
   * cleans build place on debootstrap failure.
-  * a little hack called "pbuilder debuild" is available, but not yet
-    tested very well. This is my "most often used pattern".
+  * A simple hack "pdebuild" is available. It can be invoked 
+    from a Debian source tree, and builds the package within a chroot 
+    after gaining root privilages appropriately.
 
- -- Junichi Uekawa <dancer@debian.org>  Sat,  3 Nov 2001 02:23:41 +0900
+ -- Junichi Uekawa <dancer@debian.org>  Sat,  3 Nov 2001 19:53:07 +0900
 
 pbuilder (0.9) unstable; urgency=low
 
diff --git a/debian/rules b/debian/rules
index b93b63d..7721163 100755
--- a/debian/rules
+++ b/debian/rules
@@ -50,7 +50,7 @@ binary-arch: build install
 	dh_testdir
 	dh_testroot
 	dh_installdocs
-	dh_installman pbuilder.1 pbuilderrc.5
+	dh_installman pbuilder.1 pbuilderrc.5 pdebuild.1
 	dh_installchangelogs
 	dh_link
 	dh_compress
diff --git a/pbuilder b/pbuilder
index e094164..f459583 100755
--- a/pbuilder
+++ b/pbuilder
@@ -39,13 +39,6 @@ case "$1" in
 	umountproc
 	cleanbuildplace
 	;;
-    debuild)
-	shift;
-        test -d ./debian 
-	. /usr/lib/pbuilder/pbuilder-checkparams
-	$BUILDSOURCEROOTCMD dpkg-buildpackage -S || true
-	$PBUILDERROOTCMD pbuilder build ../$(dpkg-parsechangelog|grep ^Source:| cut -d\  -f2 )_$(dpkg-parsechangelog|grep ^Version: | cut -d\  -f2).dsc
-	;;
     *)
 	. /usr/lib/pbuilder/pbuilder-modules
 	showhelp
diff --git a/pbuilder-modules b/pbuilder-modules
index 431f014..bb15e6d 100644
--- a/pbuilder-modules
+++ b/pbuilder-modules
@@ -8,6 +8,7 @@ Copyright 2001 Junichi Uekawa
 Distributed under GNU Public License version 2 or later
 
 pbuilder [operation] [operation options]
+pdebuild [operation options]
 
 command lines:
 pbuilder create [--basetgz base.tgz-path] [--distribution woody|sid]
@@ -25,11 +26,8 @@ pbuilder clean
 pbuilder login
   Logs in to the build environment
 
-pbuilder debuild
-  Builds a Debian package from debian source directory, 
-  similar to the manner of "debuild" command.
-
 Operation Options:
+pbuilder options
  --basetgz [base.tgz location]
  --buildplace [location of build]
  --mirror [mirror location]
@@ -43,8 +41,10 @@ Operation Options:
  --configfile [configuration file to load]
  --hookdir [hook directory]
  --debemail [mail address]
- --pbuilderroot [command to obtain root privilate for pbuilder] (for debuild)
- --buildsourceroot [command to obtain root privilate for dpkg-buildpackage] (for debuild)
+
+pdebuild options
+ --pbuilderroot [command to obtain root privilate for pbuilder] 
+ --buildsourceroot [command to obtain root privilate for dpkg-buildpackage]
 EOF
     exit 1
 }
diff --git a/pbuilder.1 b/pbuilder.1
index 4fd89e1..e622038 100644
--- a/pbuilder.1
+++ b/pbuilder.1
@@ -11,8 +11,6 @@ pbuilder \- personal package builder
 .BI "pbuilder clean"
 .PP
 .BI "pbuilder login"
-.PP
-.BI "pbuilder debuild"
 .SH DESCRIPTION
 Front end program to the 
 .B "pbuilder"
@@ -174,17 +172,6 @@ Specifies that dpkg-buildpackage be called with
 instead of default value specified in the environmental
 variable, or pbuilderrc
 
-.TP
-.BI "--buildsourceroot [" "fakeroot" "]"
-The command to gain root privilege for 
-invoking dpkg-buildpackage, used in 
-.B "pbuilder debuild"
-
-.TP
-.BI "--pbuilderroot [" "sudo" "]"
-The command to gain root privilege for 
-invoking pbuilder, used in 
-.B "pbuilder debuild"
 
 .SH "FILES"
 .TP
@@ -197,5 +184,6 @@ Initial coding, and main maintenance is done by
 Junichi Uekawa <dancer@debian.org>.
 User hooks code added by Dale Amon <amon@vnl.com>
 .SH "SEE ALSO"
+.RI "pdebuild (" 1 "), "
 .RI "pbuilderrc (" 5 ") "
 
diff --git a/pbuilderrc.5 b/pbuilderrc.5
index 6bd6c8c..ffca64f 100644
--- a/pbuilderrc.5
+++ b/pbuilderrc.5
@@ -128,19 +128,19 @@ command-line option.
 .TP
 .BI "BUILDSOURCEROOTCMD=" "fakeroot"
 
-This command is used on invocation of fakeroot 
+This option is used on invocation of fakeroot 
 for 
 .B "dpkg-buildpackage"
 in 
-.B "pbuilder debuild"
+.B "pdebuild"
 
 .TP
 .BI "PBUILDERROOTCMD=" "sudo"
 
-This command is used on invocation of 
+This option is used on invocation of 
 .B "pbuilder build"
 in 
-.B "pbuilder debuild"
+.B "pdebuild"
 
 .SH "FILES"
 .I "/etc/pbuilderrc"
diff --git a/pdebuild b/pdebuild
new file mode 100644
index 0000000..97ced20
--- /dev/null
+++ b/pdebuild
@@ -0,0 +1,8 @@
+#! /bin/bash
+set -e
+
+test -d ./debian 
+. /usr/lib/pbuilder/pbuilder-checkparams
+$BUILDSOURCEROOTCMD dpkg-buildpackage -S || true
+$PBUILDERROOTCMD pbuilder build "$@" ../$(dpkg-parsechangelog|grep ^Source:| cut -d\  -f2 )_$(dpkg-parsechangelog|grep ^Version: | cut -d\  -f2).dsc
+
diff --git a/pdebuild.1 b/pdebuild.1
new file mode 100644
index 0000000..9b00fb7
--- /dev/null
+++ b/pdebuild.1
@@ -0,0 +1,35 @@
+.TH "pdebuild" 1 "2001 Nov 3" "Debian" "pbuilder"
+.SH NAME
+pdebuild \- pbuilder way of doing debuild
+.SH SYNOPSIS
+.BI "pdebuild [" "options" "]"
+.PP
+.SH DESCRIPTION
+A convenience program for 
+.B pbuilder
+which invokes pbuilder after obtaining appropriate root privilate 
+in a Debian source directory.
+.B debian
+directory must be visible on the current directory when 
+invoked.
+.SH OPTIONS
+.TP
+.BI "--buildsourceroot [" "fakeroot" "]"
+The command to gain root privilege for 
+invoking dpkg-buildpackage
+
+.TP
+.BI "--pbuilderroot [" "sudo" "]"
+The command to gain root privilege for 
+invoking pbuilder.
+
+.SH "FILES"
+.TP
+.I "/etc/pbuilderrc"
+The configuration file for pbuilder, used in pdebuild.
+.SH AUTHOR
+Initial coding, and main maintenance is done by 
+Junichi Uekawa <dancer@debian.org>.
+.SH "SEE ALSO"
+.RI "pbuilder (" 1 "), "
+.RI "pbuilderrc (" 5 ") "