dpkg-buildpackage: Add new -F option for full build

This enables to explicitly specify a normal full build and combine it
with -nc.

Closes: #547993

debian/changelog

@@ -99,6 +99,8 @@ dpkg (1.15.8) UNRELEASED; urgency=low
   * Stop exporting DPKG_LIBDIR to maintainer scripts, no need for it anymore.
   * Assign correct SE Linux label on non-regular files. Based on a patch by
     Russell Coker <russell@coker.com.au>. Closes: #587949
+  * Add -F option to dpkg-buildpackage to be able to explicitly specify a
+    normal full build and combine it with -nc. Closes: #547993
 
   [ Updated programs translations ]
   * Catalan (Guillem Jover).

man/dpkg-buildpackage.1

@@ -1,4 +1,4 @@
-.TH dpkg\-buildpackage 1 "2010-03-07" "Debian Project" "dpkg utilities"
+.TH dpkg\-buildpackage 1 "2010-07-29" "Debian Project" "dpkg utilities"
 .SH NAME
 dpkg\-buildpackage \- build binary or source packages from sources
 .
@@ -64,6 +64,10 @@ packages. Passed to \fBdpkg-genchanges\fP.
 .B \-S
 Specifies a source-only build, no binary packages need to be made.
 Passed to \fBdpkg-genchanges\fP.
+.TP
+.B \-F
+Specifies a normal full build, binary and source packages will be built.
+This is the same as the default case when no build option is specified.
 .P
 .BI \-\-target= target
 .br

scripts/dpkg-buildpackage.pl

@@ -72,6 +72,7 @@ Options:
   -B             binary-only, no arch-indep files.   } dpkg-genchanges
   -A             binary-only, only arch-indep files. }
   -S             source only, no binary files.     }
+  -F             normal full build (binaries and sources).
   -t<system>     set GNU system type.           } passed to dpkg-architecture
   -v<version>    changes since version <version>.      }
   -m<maint>      maintainer for package is <maint>.    }
@@ -219,6 +220,10 @@ while (@ARGV) {
 	$include = BUILD_SOURCE;
 	push @changes_opts, '-S';
 	@checkbuilddep_opts = ('-B');
+    } elsif (/^-F$/) {
+	!build_normal && usageerr(_g("cannot combine %s and %s"), $_, build_opt);
+	$include = BUILD_ALL;
+	@checkbuilddep_opts = ();
     } elsif (/^-v(.*)$/) {
 	$since = $1;
     } elsif (/^-m(.*)$/) {
@@ -238,7 +243,7 @@ while (@ARGV) {
 }
 
 if ($noclean) {
-    # -nc without -b/-B/-A/-S implies -b
+    # -nc without -b/-B/-A/-S/-F implies -b
     $include = BUILD_BINARY if ($include & BUILD_DEFAULT);
 }