Michael Banck <[EMAIL PROTECTED]> writes: > On Tue, Mar 28, 2006 at 08:55:14PM +0100, Roger Leigh wrote: >> +$main::force_build_source = 0; > > If I understand correctly, that configure value determines whether the > .orig.tar.gz tarball will be included in the source package, *if* a > source package is built.
If this is specified, a source package (.orig.tar.gz, .diff.gz, .dsc) will always be built. Without it, a full source package will only be built if the Debian version is 0 or 1. -s/--source also needs to be used as well, so perhaps this should be enabled by default when --force-orig-source is used? > If so, I think this variable is badly named, as it suggests it means > adding -s to sbuild's command-line no matter what. Maybe rename it to > $main::force_orig_source as well? OK. I've attached a patch making the above changes. Is this OK? > This is only cosmetic if users don't get in contact with it, but as far > as I can tell, you could add this to you ~/.sbuildrc in order to make > sure -sa is passed to dpkg-source always? In that case, we should make > it a bit clearer perhaps. You could put $main::force_orig_source=1; in the .sbuildrc, though since it's not in the "conf" package, this wouldn't be a supported configuration. Regards, Roger -- Roger Leigh Printing on GNU/Linux? http://gutenprint.sourceforge.net/ Debian GNU/Linux http://www.debian.org/ GPG Public Key: 0x25BFB848. Please sign and encrypt your mail.
Index: sbuild =================================================================== RCS file: /cvsroot/buildd-tools/sbuild/sbuild,v retrieving revision 1.111 diff -u -r1.111 sbuild --- sbuild 28 Mar 2006 22:02:36 -0000 1.111 +++ sbuild 29 Mar 2006 08:24:12 -0000 @@ -115,7 +115,7 @@ $main::auto_giveback = 0; $main::build_arch_all = 0; $main::build_source = 0; -$main::force_build_source = 0; +$main::force_orig_source = 0; $main::jobs_file = "build-progress"; $main::max_lock_trys = 120; $main::lock_interval = 5; @@ -193,7 +193,8 @@ $main::build_source++; } elsif (/^--force-orig-source$/) { - $main::force_build_source++; + $main::build_source++; + $main::force_orig_source++; } elsif (/^-d/ || /^--dist/) { if (/^-d(.)/ || /^--dist=(.)/) { @@ -843,7 +844,7 @@ open( STDIN, "</dev/null" ); setsid; my $binopt = $main::build_source ? - $main::force_build_source ? "-sa" : "" : + $main::force_orig_source ? "-sa" : "" : $main::build_arch_all ? "-b" : "-B"; if ($main::chroot_dir) {
pgp3dRIjhC1bc.pgp
Description: PGP signature