added some feature, which I think was a bad idea.

7 files changed, 67 insertions, 1 deletions

diff --git a/debian/changelog b/debian/changelog
index f4abe23..0fafc0e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ pbuilder (0.10) unstable; urgency=low
 
   * Patch for full non-interactive compilation by
     Daniel Kobras (kobras@debian.org) applied. (closes: #116891)
+    However, note that doing this will result in "pbuilder login" being very
+    uninteresting.
   * Depends on gcc, because debootstrap does not seem to function well
     without gcc. Actually, dpkg does not work without gcc, when it is asked
     questions about the "architecture."
@@ -21,6 +23,8 @@ 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".
 
  -- Junichi Uekawa <dancer@debian.org>  Sat,  3 Nov 2001 02:23:41 +0900
 
diff --git a/pbuilder b/pbuilder
index 86da5c6..e094164 100755
--- a/pbuilder
+++ b/pbuilder
@@ -39,8 +39,9 @@ case "$1" in
 	umountproc
 	cleanbuildplace
 	;;
-    debuild) # undocumented untested code.
+    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
diff --git a/pbuilder-checkparams b/pbuilder-checkparams
index 7ec612f..95728bc 100755
--- a/pbuilder-checkparams
+++ b/pbuilder-checkparams
@@ -65,6 +65,14 @@ while [ -n "$1" ]; do
 	    DEBEMAIL="$2";
 	    shift; shift;
 	    ;;
+	--buildsourceroot*)
+	    BUILDSOURCEROOTCMD="$2";
+	    shift; shift;
+	    ;;
+	--pbuilderroot*)
+	    PBUILDERROOTCMD="$2";
+	    shift; shift;
+	    ;;
 	--help)
 	    showhelp
 	    ;;
diff --git a/pbuilder-modules b/pbuilder-modules
index a4208a4..431f014 100644
--- a/pbuilder-modules
+++ b/pbuilder-modules
@@ -25,6 +25,10 @@ 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:
  --basetgz [base.tgz location]
  --buildplace [location of build]
@@ -39,6 +43,8 @@ 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)
 EOF
     exit 1
 }
diff --git a/pbuilder.1 b/pbuilder.1
index 41eb512..4fd89e1 100644
--- a/pbuilder.1
+++ b/pbuilder.1
@@ -11,6 +11,8 @@ pbuilder \- personal package builder
 .BI "pbuilder clean"
 .PP
 .BI "pbuilder login"
+.PP
+.BI "pbuilder debuild"
 .SH DESCRIPTION
 Front end program to the 
 .B "pbuilder"
@@ -49,6 +51,18 @@ specified in
 .B "login"
 Logs into the chroot, and cleaned up afterwards.
 Any changes you make will not be kept.
+
+.TP
+.B "debuild"
+Builds a Debian package from the Debian source directory.
+There needs to be a 
+.I "debian/"
+directory in the current directory.
+
+This command is a convenience script, 
+and it does not accept most command-line options.
+This may change in the future.
+
 .TP
 .BI "--basetgz [" "basetgz-location" "]"
 Specifies the location of 
@@ -160,6 +174,18 @@ 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
 .I "/etc/pbuilderrc"
diff --git a/pbuilderrc b/pbuilderrc
index 582aa5f..51427ba 100755
--- a/pbuilderrc
+++ b/pbuilderrc
@@ -25,3 +25,7 @@ export DEBIAN_FRONTEND=noninteractive
 # Address used when building.
 #DEBEMAIL="someone@somewhere"
 
+#for pbuilder debuild
+BUILDSOURCEROOTCMD=fakeroot
+PBUILDERROOTCMD=sudo
+
diff --git a/pbuilderrc.5 b/pbuilderrc.5
index b1ea1d0..6bd6c8c 100644
--- a/pbuilderrc.5
+++ b/pbuilderrc.5
@@ -125,6 +125,23 @@ Overwridden with
 .B "--debemail"
 command-line option.
 
+.TP
+.BI "BUILDSOURCEROOTCMD=" "fakeroot"
+
+This command is used on invocation of fakeroot 
+for 
+.B "dpkg-buildpackage"
+in 
+.B "pbuilder debuild"
+
+.TP
+.BI "PBUILDERROOTCMD=" "sudo"
+
+This command is used on invocation of 
+.B "pbuilder build"
+in 
+.B "pbuilder debuild"
+
 .SH "FILES"
 .I "/etc/pbuilderrc"
 .SH "SEE ALSO"