On Wed, 2005-07-13 at 23:24 +0200, Michael Banck wrote:
> -S is used be dpkg-buildpackage to do just what we have now: Include the
> .orig.tar.gz when necessary, so I think it would be bad to use that.
> We suggested --force-source-orig, maybe --include-source-orig would be
> alright as well (additionally to -s). Along with a corresponding config
> file option.
OK. Please find a patch attached.
With regards to the config file option you mentioned. I can't see config
file options for other build related options (like -s) so I haven't
included one in this patch.
Adding a config file option for --include-source-orig would be
inconsistent. If this is incorrect I can add one easily, but I wonder if
you are mistaken above and a config file option is not needed for this?
Regards
--
Matt Brown
[EMAIL PROTECTED]
Mob +64 275 611 544 www.mattb.net.nz
diff -Nur sbuild-0.35-orig/sbuild sbuild-0.35/sbuild
--- sbuild-0.35-orig/sbuild 2005-04-01 04:42:48.000000000 +1200
+++ sbuild-0.35/sbuild 2005-07-14 10:21:14.000000000 +1200
@@ -90,6 +90,7 @@
$main::nomail = 0;
$main::build_arch_all = 0;
$main::build_source = 0;
+$main::include_source_orig = 0;
$main::jobs_file = "build-progress";
$main::max_lock_trys = 120;
$main::lock_interval = 5;
@@ -124,6 +125,9 @@
elsif (/^-s$/ || /^--source$/) {
$main::build_source++;
}
+ elsif (/^--include-source-orig$/) {
+ $main::include_source_orig++;
+ }
elsif (/^-d/ || /^--dist/) {
if (/^-d(.)/ || /^--dist=(.)/) {
$main::distribution = $1.$';
@@ -737,7 +741,7 @@
}
if ($main::sub_pid == 0) {
setpgrp( 0, $$ );
- my $binopt = $main::build_source ? "" : $main::build_arch_all ? "-b" : "-B";
+ my $binopt = $main::build_source ? $main::include_source_orig ? "-sa" : "" : $main::build_arch_all ? "-b" : "-B";
if ($main::chroot_dir) {
my $bdir = $dir;
$bdir =~ s/^\Q$main::chroot_dir\E//;
diff -Nur sbuild-0.35-orig/sbuild.1 sbuild-0.35/sbuild.1
--- sbuild-0.35-orig/sbuild.1 2004-09-18 01:17:40.000000000 +1200
+++ sbuild-0.35/sbuild.1 2005-07-14 10:25:10.000000000 +1200
@@ -29,7 +29,8 @@
[ \-m/\-\-maintainer=<maintainer> ]
[ \-e/\-\-uploader=<uploader> ]
[ \-e/\-\-keyid=<key> ]
-[ \-\-purge=<mode>] [\-s/\-\-source ] [ \-v/\-\-verbose ]
+[ \-\-purge=<mode>] [\-s/\-\-source ] [\-\-include\-source\-orig ]
+[ \-v/\-\-verbose ]
[ \-\-make\-binNMU=<entry> ]
[ \-\-nolog ]
package-to-build_x.y-z(.dsc) [ ... ]
@@ -111,6 +112,11 @@
.IR \-s , "--source"
Also build source package, i.e. use dpkg-buildpackage without -B. This
also switches on --purge=never.
+.TP
+.IR "--include-source-orig"
+When used with in conjunction with \-s this option forces the inclusion
+of the orig.tar.gz file in the generated .changes file even in cases where
+it would not normally be included.
.TP
.IR \-v , "--verbose"
Be verbose, i.e. all information goes to stdout as well as to the log files.
