Hi! On Sun, 2011-11-13 at 22:42:49 +0000, Roger Leigh wrote: > New version attached. It includes your changes, plus the > documentation fixes you suggested.
I've now come back to this and it indeed does make sense and looks sane. I've some comments below, that once fixed I'll be comfortable merging this for 1.16.4. Thanks Jonathan for looking into this previously! > >From fc2782bcdd940ebf61a47ce182cbdef7a469d62a Mon Sep 17 00:00:00 2001 > From: Roger Leigh <[email protected]> > Date: Sun, 13 Nov 2011 19:18:28 +0000 > Subject: [PATCH] Add Build-Depends-Arch and Build-Conflicts-Arch It would be nice to add a small rationale here in the commit message, why these fields might be useful. > Signed-off-by: Roger Leigh <[email protected]> > --- > > diff --git a/man/deb-src-control.5 b/man/deb-src-control.5 > index 76e2f9e..4987223 100644 > --- a/man/deb-src-control.5 > +++ b/man/deb-src-control.5 > @@ -109,27 +109,50 @@ package. > > .TP > .BI Build\-Depends: " package-list" > -A list of packages that need to be installed and configured to be able to > build > -the source package. > +A list of packages that need to be installed and configured to be able > +to build the source package. Including a dependency in this list has > +the same effect as including it in both Build-Depends-Arch and > +Build-Depends-Indep, with the additional effect of being used for > +source-only builds. The field names need to be bolded and their dashes escaped (the same for all the following ones). > +.TP > +.BI Build\-Conflicts: " package list" > +A list of packages that should not be installed when the package is > +built, for example because they interfere with the build system used. > +Including a dependency in this list has the same effect as including > +it in both Build-Conflicts-Arch and Build-Conflicts-Indep, with the > +additional effect of being used for source-only builds. This field > +was introduced in dpkg version 1.16.2; in order to build with older > +dpkg versions, \fBBuild\-Conflicts\fP should be used instead. The comment about it being introduced recently seems misplaced here. > diff --git a/scripts/dpkg-checkbuilddeps.pl b/scripts/dpkg-checkbuilddeps.pl > index 93af92e..d8d36e4 100755 > --- a/scripts/dpkg-checkbuilddeps.pl > +++ b/scripts/dpkg-checkbuilddeps.pl > @@ -56,9 +57,11 @@ sub usage { > . "\n", $progname; > } > > -my $binary_only=0; > +my $ignore_bd_arch=0; > +my $ignore_bd_indep=0; Spaces around assignments for new or changed code. Otherwise, looks great. thanks, guillem -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected]
