Bug#661538: Add support for Build-Depends-Stage1 in order to allow breaking of cyclic Build-depends loops

[Jonathan Nieder]

Wookey wrote:
(out of order for convenience)

> Attached is a slightly better version which is at least useful enough to
> work with.

Thanks.  What did you think of Raphaël's idea of the virtual
bootstrap-stage package?

Won't there be need for a Build-Conflicts-Stage1, too?

[...]
> I've been meaning to start a thread on debian-devel to check that
> there was reasonable consensus around this approach inorder to answer
> the substantive question of 'are we really doing it this way?'.

Ok, ok.

Aside from that sort of question, the Dpkg::Control::Fields numbering
still seems to be off.  Some people might think it is right to make
the maintainer do penance for this kind of fussy code, but I think
there are better ways to convince people to fix things. ;-)

I also was surprised that the patch did not have to touch the code in
"dpkg-source -b" that checks and normalizes Build-Depends so it could
be applied to Build-Depends-Stage1, too.  (See bug#254449.)  Is that
not needed?

The patch below (untested) fixes a few whitespace nits and the
Control::Fields numbering but not "dpkg-source -b".  Maybe it can save
some time.

Thanks again for your work,
Jonathan

diff --git i/man/deb-src-control.5 w/man/deb-src-control.5
index 15e9a911..7b627516 100644
--- i/man/deb-src-control.5
+++ w/man/deb-src-control.5
@@ -142,8 +142,8 @@ build-dependency loops when bootstrapping an architecture.
 
 .TP
 .BI Build\-Depends\-Indep\-Stage1: " package-list"
-Modified \fBBuild\-Depends\-Indep\fPA package list for building the source 
-package in 'bootstrap stage 1' mode. Staged builds are used to break 
+Modified \fBBuild\-Depends\-Indep\fPA package list for building the source
+package in 'bootstrap stage 1' mode. Staged builds are used to break
 build-dependency loops when bootstrapping an architecture.
 
 .TP
@@ -162,7 +162,7 @@ The syntax of the
 .B Build\-Depends\-Indep
 ,
 .B Build\-Depends\-Stage1
-and 
+and
 .B Build\-Depends\-Indep\-Stage1
 fields is a list of groups of alternative packages. Each group is a list
 of packages separated by vertical bar (or "pipe") symbols, "|". The
diff --git i/scripts/Dpkg/Control/Fields.pm w/scripts/Dpkg/Control/Fields.pm
index dbb041bf..fa16c8fc 100644
--- i/scripts/Dpkg/Control/Fields.pm
+++ w/scripts/Dpkg/Control/Fields.pm
@@ -61,32 +61,32 @@ our %FIELDS = (
     'Build-Conflicts' => {
         allowed => ALL_SRC,
         dependency => 'union',
-        dep_order => 3,
+        dep_order => 5,
     },
     'Build-Conflicts-Indep' => {
         allowed => ALL_SRC,
         dependency => 'union',
-        dep_order => 4,
+        dep_order => 6,
     },
     'Build-Depends' => {
         allowed => ALL_SRC,
         dependency => 'normal',
         dep_order => 1,
     },
-    'Build-Depends-Stage1' => {
+    'Build-Depends-Indep' => {
         allowed => ALL_SRC,
         dependency => 'normal',
-        dep_order => 1,
+        dep_order => 2,
     },
-    'Build-Depends-Indep' => {
+    'Build-Depends-Stage1' => {
         allowed => ALL_SRC,
         dependency => 'normal',
-        dep_order => 2,
+        dep_order => 3,
     },
     'Build-Depends-Indep-Stage1' => {
         allowed => ALL_SRC,
         dependency => 'normal',
-        dep_order => 2,
+        dep_order => 4,
     },
     'Built-Using' => {
         allowed => ALL_PKG,



--
To UNSUBSCRIBE, email to debian-dpkg-bugs-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org