dgit build uses dpkg-buildpackage

diff --git a/debian/changelog b/debian/changelog
index 5d32b0c584e793c570f68ce9f8c5af1e7ecc99f0..f3bce71582fdfe25263fdaae65b502cbfba086c0 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,11 +11,13 @@ dgit (0.11) unstable; urgency=low
   * Use "ftp.debian.org" not "http.debian.net" as the default Debian
     archive.  (http.debian.net tends to defeat certain kinds of cacheing,
     and can also have more skew.)
   * Use "ftp.debian.org" not "http.debian.net" as the default Debian
     archive.  (http.debian.net tends to defeat certain kinds of cacheing,
     and can also have more skew.)

+  * dgit build uses dpkg-buildpackage; there is a dgit git-build
+    for using git-buildpackage.

   * Better error message for use of UNRELEASED suite.  Closes: #720523.
   * Do not canonicalise suite more than once.  Related to: #720526.
   * Fix a badly open-coded copy of check_not_dirty.  Closes: #720524.
   * Fix some bugs in building (eg build-source would fail to do the quilt
   * Better error message for use of UNRELEASED suite.  Closes: #720523.
   * Do not canonicalise suite more than once.  Related to: #720526.
   * Fix a badly open-coded copy of check_not_dirty.  Closes: #720524.
   * Fix some bugs in building (eg build-source would fail to do the quilt

-    fixup).
+    fixup; the --clean check in build was wrong).

 
  --
 
 
  --
 

diff --git a/dgit b/dgit
index 1db2cdb0893108093911b78dcb460087ce89ee01..03542c3d0ba3963029e73af6a0f29da8db07ad7b 100755 (executable)
--- a/dgit
+++ b/dgit
@@ -1063,7 +1063,16 @@ sub build_prep () {
 }
 
 sub cmd_build {
 }
 
 sub cmd_build {

-    badusage "dgit build implies --clean=dpkg-source" if defined $package;
+    badusage "dgit build implies --clean=dpkg-source"
+       if $clean ne 'dpkg-source';
+    build_prep();
+    runcmd_ordryrun @dpkgbuildpackage, qw(-us -uc), changesopts(), @ARGV;
+    printdone "build successful\n";
+}
+
+sub cmd_git_build {
+    badusage "dgit git-build implies --clean=dpkg-source"
+       if $clean ne 'dpkg-source';

     build_prep();
     my @cmd =
        (qw(git-buildpackage -us -uc --git-no-sign-tags),
     build_prep();
     my @cmd =
        (qw(git-buildpackage -us -uc --git-no-sign-tags),

diff --git a/dgit.1 b/dgit.1
index 1abb7ecdc11480d587611eafd5e5373e4bf4aac6..9740856b215a59d62c8790743b3cb2faa2d2b023 100644 (file)
--- a/dgit.1
+++ b/dgit.1
@@ -82,22 +82,20 @@ into the current branch.
 .TP
 \fBdgit build\fR ...
 Runs
 .TP
 \fBdgit build\fR ...
 Runs

-.B git-buildpackage
+.B dpkg-buildpackage

 with some suitable options.  Options and argumments after build
 with some suitable options.  Options and argumments after build

-will be passed on to git-buildpackage.  It is not necessary to use
+will be passed on to dpkg-buildpackage.  It is not necessary to use

 dgit build when using dgit; it is OK to use any approach which ensures
 that the generated source package corresponds to the relevant git
 commit.
 
 dgit build when using dgit; it is OK to use any approach which ensures
 that the generated source package corresponds to the relevant git
 commit.
 

-.B NB
-that this function will be changed in the future to use
-dpkg-buildpackage directly.
-

 Tagging, signing and actually uploading should be left to dgit push.
 .TP
 \fBdgit build-source\fR ...
 Builds the source package, and a changes file for a prospective
 Tagging, signing and actually uploading should be left to dgit push.
 .TP
 \fBdgit build-source\fR ...
 Builds the source package, and a changes file for a prospective

-source-only upload.  The output is left in
+source-only upload, using
+.BR dpkg-source .
+The output is left in

 .IR package \fB_\fR version \fB.dsc\fR
 and
 .IR package \fB_\fR version \fB_source.changes\fR.
 .IR package \fB_\fR version \fB.dsc\fR
 and
 .IR package \fB_\fR version \fB_source.changes\fR.


@@ -105,14 +103,23 @@ and
 Tagging, signing and actually uploading should be left to dgit push.
 .TP
 \fBdgit sbuild\fR ...
 Tagging, signing and actually uploading should be left to dgit push.
 .TP
 \fBdgit sbuild\fR ...

-Constructs the source package, and uses sbuild to do a binary
-build, and uses mergechanges to merge the source and binary
-changes files.  Options and argumments after sbuild will be passed on
-to sbuild.  Changes files matching
+Constructs the source package, uses
+.B  sbuild
+to do a binary build, and uses mergechanges to merge the source and
+binary changes files.  Options and argumments after sbuild will be
+passed on to sbuild.  Changes files matching

 .IB package _ version _*.changes
 in the parent directory will be removed; the output is left in
 .IR package \fB_\fR version \fB_multi.changes\fR.
 
 .IB package _ version _*.changes
 in the parent directory will be removed; the output is left in
 .IR package \fB_\fR version \fB_multi.changes\fR.
 

+Tagging, signing and actually uploading should be left to dgit push.
+.TP
+\fBdgit git-build\fR ...
+Runs
+.B git-buildpackage
+with some suitable options.  Options and argumments after git-build
+will be passed on to git-buildpackage.
+

 Tagging, signing and actually uploading should be left to dgit push.
 .TP
 .B dgit push
 Tagging, signing and actually uploading should be left to dgit push.
 .TP
 .B dgit push