Bug#824169: ftp.debian.org: src:chocolate-doom/2.2.1-3 is in both main and contrib

[Jonathan Dowland]

Hi Julien, I believe we have fixed this for chocolate-doom. Would you
please remove the block?

On Fri, Sep 23, 2016 at 08:23:05AM +0200, Julien Cristau wrote:
> projectb=> select source.source, source.version, c1.name, c2.name from 
> source, files_archive_map fam1, files_archive_map fam2, component c1, 
> component c2 where source.file = fam1.file_id and source.file = fam2.file_id 
> and fam1.component_id = c1.id and fam2.component_id = c2.id and c1.id < c2.id;
>  source |   version| name |  name   
> +--+--+-
>  linux-wlan-ng  | 0.2.9+dfsg-6 | main | contrib
>  chocolate-doom | 2.2.1-3  | main | contrib
> (2 rows)

projectb=> select source.source, source.version, c1.name, c2.name from source, 
files_archive_map fam1, files_archive_map fam2, component c1, component c2 
where source.file = fam1.file_id and source.file = fam2.file_id and 
fam1.component_id = c1.id and fam2.component_id = c2.id and c1.id < c2.id;
 source  |   version| name |  name
-+--+--+-
 nvidia-settings | 375.26-1 | main | contrib
 linux-wlan-ng   | 0.2.9+dfsg-6 | main | contrib
 nvidia-settings | 370.28-1 | main | contrib
(3 rows)


Thanks

-- 
Jonathan Dowland


signature.asc
Description: Digital signature

Bug#824169: ~ Re: Bug#824169: ftp.debian.org: src:chocolate-doom/2.2.1-3 is in both main and contrib

[Jonathan Dowland]

> On 24 Dec 2016, at 11:48, Fabian Greffrath  wrote:
> 
> Merged and uploaded, thanks!

Thank you, Merry Christmas!

Bug#824169: ftp.debian.org: src:chocolate-doom/2.2.1-3 is in both main and contrib

[Fabian Greffrath]

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256

Am Samstag, den 24.12.2016, 08:54 + schrieb Jonathan Dowland:
> I've just used dcut to remove the DELAYED upload I'd made, so we can
> now
> fix and re-upload.

Merged and uploaded, thanks!

 - Fabian
-BEGIN PGP SIGNATURE-

iQIzBAEBCAAdFiEEIsF2SKlSa4TfGRyWy+qOlwzNWd8FAlheYJsACgkQy+qOlwzN
Wd9xCxAA1ONE5EbznJpGdJRGn/ookpjWNfiWhTmRiWN1e4k3noyq/8wndAZcVzKc
w/S7krv8kpwmaKFbLjeRqX/c36t457CtmLOo6QhZm0MGE55Q/v76lLqAxuu6bh2B
NrfmvRHBNjvMJ9DISzGXmOdI90nJpmHhACqE6dZka8KNp20/i34RGgrWoa+AqWLj
qq1PCQ45NOQ+nMDfnFAz74uTFciY2h1EykNBRZuV4VR7SBjjsVqb5QVTmtljax8E
lJSG2wYicSwOdQBVJhhKb5cFC8wXQ3dBbCrQk7xQb4iMiQtYgx26LJbt+DjCnLX4
/lzag3HN+Vt8OKq+PqxCBJBgWkVdpfHlYS3J29FV4AB8tuVaXF2nd38m6sFjsVYN
c3keUzxennRhBk5hXHFznElnJEQdRZRBoZBxkmm/zkUW2kVgxACSI/Zvu9Yht8e/
SlTWm5z4Af2qdfmySFJPU1qMeN6KnXEzmELgVGvy16WYBwxslOFicPO/3UlNfknt
mM72ywIfHm5gseLgp/cxIBLa4v1WDcfED5Hw6Bza3qbA+fw7CmDanr/07GfnHQQR
XJkIu2+47LBScyTWxbiC5vCqurJwmiyJZwlY9LUkcCQPjpyHV3cixyL0WzaAMM24
5BnZUORbGQ5ebXEnQvxeFcab1aSJx4IwM53E5dbODAEQU2fONGk=
=OC+V
-END PGP SIGNATURE-

Bug#824169: ftp.debian.org: src:chocolate-doom/2.2.1-3 is in both main and contrib

[Fabian Greffrath]

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256

Am Samstag, den 24.12.2016, 08:54 + schrieb Jonathan Dowland:
> I've just used dcut to remove the DELAYED upload I'd made, so we can
> now
> fix and re-upload.

I've seen you already fixed this, thanks!

I think we can merge the proposed-consolidation branch into master now.

Merry Christmas!

 - Fabian
-BEGIN PGP SIGNATURE-

iQIzBAEBCAAdFiEEIsF2SKlSa4TfGRyWy+qOlwzNWd8FAlheVjAACgkQy+qOlwzN
Wd9qghAAjpYaRND9X6tYCJi1XLmT/Ajf7KmHXkPbMkXnxOTEp+Yt2i9E3mysNgof
faLQAGV0Qxep6G4sohmwZVdH3Ayf3eiZazvo8rudKPI0NfR8h6Dbmr48HUxzdfTH
xlXputu7cqXklm7io90iAqbsU0wr/MtiEp5JxBn+joVwGP8lQ6sNEKVoPr/o3ebj
WSdxFBOszbHIjoJpoU8nmP2MYYtxSed7IvO7M4VbV7Eiboc6I96ZTVqBAxf8t8SJ
4qpK7ktLxuG8L2e13ovPEwretGP1x3K4y5DvpJFSFJ0srYUAgP7OglIYi7NK9eOr
L6fFCVAGRpKaEMD9vM+FUZptyJpPxT+9AOMOxmng7E8E+RV3NKbf7zThzE6UC0ao
dcrzBHLD5lcNx/j4hQmiwaC0+5N6bc599anbauzyifLmsEh4aqyg6fBeErh6yA3d
s46/o1LoiT8dVEpU5sVelo8WLy2+CcCYTh44rhLei80KUEsfZgf9180edcFbdp/O
+LSE3WQT0bUGhG42pCE/s0u992QwG5soE6A+wk22k7XAPDsLJDUxXcFXfkMYZW+d
EPziPA7pfmXr7P9ndztbdDtLgyod4inXc21Yag/pdSXMopGMb015QqxE3vn0Rz9w
WpePzCLkPxYZTxYeHhyPvm0dQFQSlVBNRc4FzS7FMnSUujiNvlk=
=v+3v
-END PGP SIGNATURE-

Bug#824169: ftp.debian.org: src:chocolate-doom/2.2.1-3 is in both main and contrib

[Jonathan Dowland]

On Fri, Dec 23, 2016 at 09:28:40PM +0100, Fabian Greffrath wrote:
> Not entirely. Sorry, but I think there is a glitch in the latest
> commit. The chocolate-doom package should have kept the Breaks/Replaces
> against chocolate-common (<< 2.2.1-5~).
> 
> Suppose you have only chocolate-common 2.2.1-4 installed and then
> attempt to install chocolate-doom 2.2.1-5. The latter package contains
> files that are owned by the former one and thus the installation will
> fail. Do you think it is possible to fix this and override your latest
> upload again?

I've just used dcut to remove the DELAYED upload I'd made, so we can now
fix and re-upload.


signature.asc
Description: Digital signature

Bug#824169: ftp.debian.org: src:chocolate-doom/2.2.1-3 is in both main and contrib

[Fabian Greffrath]

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256

Am Freitag, den 23.12.2016, 18:27 + schrieb Jonathan Dowland:
> On second (or third thoughts)... I've uploaded the package as-is to
> DELAYED-5.
> I suppose worst case it's borked and a fixed package needs to be
> uploaded
> after, that might be better than not getting this done in time for
> the freeze.

Thank you very much for this!

> ...upgrade seems to work, there's a problem with downgrading from
> these -5
> versions to -4 but I guess that's never officially supported anyway.

I don't think we need to support downgrading at all (i.e. I don't think
any package ever did). Forward is the only way. ;)

> Sorry yes, that's not quite what I meant. hopefully the latest pushes
> to
> the proposed-consolidate branch clear that up.

Not entirely. Sorry, but I think there is a glitch in the latest
commit. The chocolate-doom package should have kept the Breaks/Replaces
against chocolate-common (<< 2.2.1-5~).

Suppose you have only chocolate-common 2.2.1-4 installed and then
attempt to install chocolate-doom 2.2.1-5. The latter package contains
files that are owned by the former one and thus the installation will
fail. Do you think it is possible to fix this and override your latest
upload again?

Cheers,

Fabian
-BEGIN PGP SIGNATURE-

iQIzBAEBCAAdFiEEIsF2SKlSa4TfGRyWy+qOlwzNWd8FAlhdiPgACgkQy+qOlwzN
Wd+roA/+JARbWQcgFPNPDOyBcK8f0DnJpWUOUskocYs8NLvSkSvtWKXEbL2dWJe4
M36zcfyF35xUgXPVU7TmBcl6sswl084hv+OgpIR4WbxSNRH9hSaHWJ9eA1blmJzr
C4pJIxLAAqYgA9fUbgyGq8pQEWL+b4g1+/R71CNpgZ9obO3uX7h9FxNSqS9ekxS3
sQEQuFx25EeSRaNvmEIhnrGFxyqXG+RktrLr7jPfA6boKezZjWN94qYLSsWJQ0ZV
juPuskUoEFyFVnAgwvGlhWC9OcNWFg7IZuI5l9+pED+bfhX6hS03y0R5MhYvfejD
NS/13x9GIQX8Qz9F+kzQ6nb8+cFkUGzMsTWt1A3SumyQktd09ZCbdWvZnuKScsBr
pULgao2hkw/SAbGtcOP3GlXugccpopSU1RVvevsZp1YCgswOGrbFPTRX2l1O4yQ3
U0bhZYfLtFvoYv4LnsUZ0blotYQ2LrFDT1jNJL07D6q6Ti35LXSJEsJXUgeSohN2
sUlQYhjP/VETYv8+pp3rsOj6DChv0fKIh/WS2yAsNHZpU/JYoJUSfiBAJgXoRWjq
N2r8gKf6HmX88ueUV3wC1j5KzeSJDq8S+zwMvuB10cfgisrWJxjhbXLf783uPijE
uB4rtFFl5tvWBOfJt9be7IgSOb3Ksn5KjtUgr43P+UrXH73UD8w=
=zIIt
-END PGP SIGNATURE-

Bug#824169: ftp.debian.org: src:chocolate-doom/2.2.1-3 is in both main and contrib

[Jonathan Dowland]

On second (or third thoughts)... I've uploaded the package as-is to DELAYED-5.
I suppose worst case it's borked and a fixed package needs to be uploaded
after, that might be better than not getting this done in time for the freeze.


signature.asc
Description: Digital signature

Bug#824169: ftp.debian.org: src:chocolate-doom/2.2.1-3 is in both main and contrib

[Jonathan Dowland]

...upgrade seems to work, there's a problem with downgrading from these -5
versions to -4 but I guess that's never officially supported anyway.


signature.asc
Description: Digital signature

Bug#824169: ftp.debian.org: src:chocolate-doom/2.2.1-3 is in both main and contrib

[Jonathan Dowland]

On Thu, Dec 22, 2016 at 06:27:32AM +0100, Fabian Greffrath wrote:
> The transitional chocolate-common package doesn't necessarily have to
> contain the same files as before. It's perfectly fine if it is an empty
> dummy.

Sorry yes, that's not quite what I meant. hopefully the latest pushes to
the proposed-consolidate branch clear that up.

I've ran out of time to work on this anymore before Xmas and possibly until
the new year -- I've pushed my latest and put builds of those packages at
the temporary location on phobos mentioned in an earlier bug. I hope you
or someone else can double check it and possibly upload it!

Best wishes for the holiday season


signature.asc
Description: Digital signature

Bug#824169: ftp.debian.org: src:chocolate-doom/2.2.1-3 is in both main and contrib

[Fabian Greffrath]

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256

Am Mittwoch, den 21.12.2016, 16:51 + schrieb Jonathan Dowland:
> I/we still need to bring back most of the chocolate-doom.install file
> now that
> we're back to a multi-binary package, otherwise I think it looks
> good.

The transitional chocolate-common package doesn't necessarily have to
contain the same files as before. It's perfectly fine if it is an empty
dummy.

 - Fabian
-BEGIN PGP SIGNATURE-

iQIzBAEBCAAdFiEEIsF2SKlSa4TfGRyWy+qOlwzNWd8FAlhbZEQACgkQy+qOlwzN
Wd848RAAhHlMYb+ZwsL3HD7w6dxDj3fdJzYeDRXPFoWNSC3lnyImqLNtS6KyFbSi
e/Pc6xBRn5tZnNYk28BOoiMxJdHAY/oDHZQ7r44YrMT4xMBvX8/o7BNplcjLg+V4
GcBnzV0n6SzQx1aimylaoHJo0DWofH5WHCdd5BnYofhkO3m6gbVs3E9wTd7bZyPk
WXmeevtekJJ8wraO8Kbreq189PPHB+H+G2xMryhKBdhbX2s8QRLAaRlGsP8MG3JA
x1YsItblaCAcp1lsdAv3IsDFThZDpR3buiilpUaVpchWu/f58xqe8HbOZhaCYeOG
PKfaa8GD7mbZdN6OuDhQdxl+JVszvUSIf8myfsotZDTqGc88RsD4qg8VoISi4cjh
TBrPxgWYT0e1QH5m9XLIsJPsuXoIa8aCSqgQtPj6LBov7hDColtN3/vgwYV/nNh0
DDhC/LCZdYbM85EeNv/kkcqYwPZNXmTpjLOekc27/sslNo5fLAjS70Vpwn8SeMKO
+X+MJi6JctNVJN3wAjGmFC2vqii7TJnDX9hrUIY2t+3oa5U/44tMFB0DKv62u0sU
9imuKLmFq7HyinrnstWtZlGqrreXt5kRmG+W5a+HCtaBayYzl5XYDRwyjc5nA7pk
+/Jz4BSVnRuwBJMIAy8LW6C3S3JmlQDeDgrnQYm2p1R0o/Zz3tE=
=ZGxe
-END PGP SIGNATURE-

Bug#824169: ftp.debian.org: src:chocolate-doom/2.2.1-3 is in both main and contrib

[Jonathan Dowland]

OK, I've updated the packages at the temporary apt URL from my last message
with some changes that I've pushed to the VCS branch proposed-consolidate;
there is now a transitional chocolate-common and I've tested the
only-chocolate-heretic upgrade case, all is well. 

I/we still need to bring back most of the chocolate-doom.install file now that
we're back to a multi-binary package, otherwise I think it looks good.


signature.asc
Description: Digital signature

Bug#824169: ftp.debian.org: src:chocolate-doom/2.2.1-3 is in both main and contrib

[Jonathan Dowland]

On Mon, Dec 19, 2016 at 12:23:44PM +0100, Fabian Greffrath wrote:
> If you only have e.g. chocolate-heretic installed, but not chocolate-doom,
> you will not take part in the transition. Fortunately, all packages have a
> hard dependency on chocolate-common, so it might be sufficient to keep
> this as a transitional dummy package that depends on the new-enough
> chocolate-doom package.

Yes I think you are right.

I've set up a test apt repo to prove this

deb https://phobos.redmars.org/debian binary/

the version of the packages in the repo is as it was last week, i.e. no
real *-common package. I'll work on the virtual common package and see if
chocolate-heretic would update properly in that case.

-- 
Jonathan Dowland


signature.asc
Description: Digital signature

Bug#824169: ftp.debian.org: src:chocolate-doom/2.2.1-3 is in both main and contrib

[Fabian Greffrath]

Jonathan Dowland wrote:
> Honestly I don't know, I need to test it . Will try Monday

If you only have e.g. chocolate-heretic installed, but not chocolate-doom,
you will not take part in the transition. Fortunately, all packages have a
hard dependency on chocolate-common, so it might be sufficient to keep
this as a transitional dummy package that depends on the new-enough
chocolate-doom package.

 - Fabian

Bug#824169: ftp.debian.org: src:chocolate-doom/2.2.1-3 is in both main and contrib

[Jonathan Dowland]

> On 16 Dec 2016, at 18:50, Fabian Greffrath  wrote:
> 
> Am Freitag, den 16.12.2016, 19:43 +0100 schrieb Fabian Greffrath:
>> Technically, the branch looks fine, especially after the latest
>> commit
> 
> Oh wait, are you sure we don't need empty dummy packages for a proper
> transition?
> 
> - Fabian

Honestly I don't know, I need to test it . Will try Monday 

Bug#824169: ftp.debian.org: src:chocolate-doom/2.2.1-3 is in both main and contrib

[Fabian Greffrath]

Am Freitag, den 16.12.2016, 19:43 +0100 schrieb Fabian Greffrath:
> Technically, the branch looks fine, especially after the latest
> commit

Oh wait, are you sure we don't need empty dummy packages for a proper
transition?

 - Fabian


signature.asc
Description: This is a digitally signed message part

Bug#824169: ftp.debian.org: src:chocolate-doom/2.2.1-3 is in both main and contrib

[Fabian Greffrath]

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256

Am Freitag, den 16.12.2016, 16:07 + schrieb Jonathan Dowland:
> Initial proposal for a combined binary package is now pushed to the
> 'proposed-consolidate' branch.

Thank you for your work on this!

Technically, the branch looks fine, especially after the latest commit
with all the Provides/Breaks/Replaces in place (though, I would still
add the trailing tilde back to take backports into account). However,
it makes me a bit sad to let the fine-crafted package split go. Anyway,
if you suggest this is the most reasonable solution to get Choco into
testing, please go for it!

Cheers,

 - Fabian
-BEGIN PGP SIGNATURE-

iQIzBAEBCAAdFiEEIsF2SKlSa4TfGRyWy+qOlwzNWd8FAlhUNcAACgkQy+qOlwzN
Wd9KaxAAsQGkIIZm+vEONSirurmdUhbJXTNVTrgZaRYwisOKe5q5FbG4EpYoO0Te
QCQREGkltdksej2AB4h3M0YAjA8UjpAwjN13cGzY6FYIpwyX89hNL/mefFKbJfvN
PhZbswzOjzh26186qtphIOc1qX9pXKRmUJGaDdzS3ooYgOchgAfxGc4Ol/pCfJvJ
3EjofpRW7tpkbUXBzCcopIXwEc7vLkL8PekhNeUYekRWhlA7LDp8WIiZfd1J2Fim
iQ63ZF5R1Oc3g1AwXHRfrTFX6Wie+bInmWZ5Ll8U0Q3jnGIwpVB0ktLkDkl65Yf4
K0j3M2RYE4Y8FRFHLyx+VdLc9ksDOcURSgUf1DM65HqjcHE2XIKUzCSMIJUVV8GG
+CsRbkKNeqDTEMrge3waLZfokOELAvyI+JiGaB3IIFHbGxoaZHbYWRkWUMwURAj0
6cmS55FFNTw0GugeodYstWAaerqJ0uhudg4xpM7USgarK698arFpP4jzYmlHUUh9
648a23OB+E6Vi1znzEta0AFv77PdVY5978GEzhYdH4yTMf8nE/iHpdCChzhorCof
JsL5Tv7czdCC0/Hdq9iDBwJ2lxDM39L9VTkZS2kQH2viLXu/ToUsajAiRpqhPvgN
cM7dy+z8X8//+O+j50F2yEWa/eZj1XVBjzDbNbE2VvqUrSTkhUM=
=KHuA
-END PGP SIGNATURE-

Bug#824169: ftp.debian.org: src:chocolate-doom/2.2.1-3 is in both main and contrib

[Jonathan Dowland]

Initial proposal for a combined binary package is now pushed to the
'proposed-consolidate' branch.

The package description needs some rework.

We need to double-check the conflicts/replaces semantics and make sure all
upgrade scenarios are covered.

The package source is, IMHO, pleasingly simpler now.

-- 
Jonathan Dowland


signature.asc
Description: Digital signature

Bug#824169: ftp.debian.org: src:chocolate-doom/2.2.1-3 is in both main and contrib

[Jonathan Dowland]

On Fri, Dec 16, 2016 at 12:36:57PM +0100, Fabian Greffrath wrote:
> I think I'd rather move the package back to the contrib section but keep
> all four games as binary packages.

sorry for spamming as I think out loud, but what about 

 * drop chocolate-{heretic,hexen,strife} packages
 * put all their binaries in the chocolate-doom package (in main)
 * make $newversion Provides/Conflicts/Replaces: 
chocolate-{strife,heretic,hexen} (<< $newversion)

then we have 1:1 source:binary and all in main, in retrospect I'm not sure
having separate binary packages for the engines is all that useful, and having
all the engines in one package is not too wasteful either, IMHO.


signature.asc
Description: Digital signature

Bug#824169: ftp.debian.org: src:chocolate-doom/2.2.1-3 is in both main and contrib

[Jonathan Dowland]

On Fri, Dec 16, 2016 at 12:36:57PM +0100, Fabian Greffrath wrote:
> I think I'd rather move the package back to the contrib section but keep
> all four games as binary packages.

One solution that would be a minor PITA but would work going forward would be

 * delete the other games from chocolate-doom source so it's only c-d (main)
 * create a new source package for all the contrib stuff

In fact I think that's the only solution that has a chance of working for
stretch IMHO. The second package will need a trip through NEW (the first might
too, can't recall whether this is necessary for removing binary packages) and
the block would need removing manually and perhaps other clean-up needed too.

As I think more and more about it I think this might be the only option for
Stretch. I've no idea if this dak bug will ever get fixed, it's quite possible
that instead the ftp team will simply rule that source packages are not allowed
to generate binary packages in more than one suite.

-- 
Jonathan Dowland


signature.asc
Description: Digital signature

Bug#824169: ftp.debian.org: src:chocolate-doom/2.2.1-3 is in both main and contrib

[Jonathan Dowland]

On Fri, Dec 16, 2016 at 12:36:57PM +0100, Fabian Greffrath wrote:
> I think I'd rather move the package back to the contrib section but keep
> all four games as binary packages.

Personally I think that'd be a bit of a shame, but it depends which you value
more: all the engines in the archive, or one in Debian proper.

But regardless, before you do that, I would seek some assurance that this
would actually work. I was discussing the issue on #debian-release (Or -ftp)
on IRC yesterday, the block needs to be manually lifted and jcristau has
said he (at least) wouldn't do that until the root issue is fixed, but there
may also be other manual intervention needed too :(

> 10:18 nthykier: no, the source is already wrong in unstable-debug
> 10:18 nthykier: you need a removal first
> 10:18 nthykier: (for that to work - not sure how the FTP masters usually fix 
> this)
> 10:18 nthykier: changing components (e.g. non-free to main) has a history of 
> being non-trivial as well

-- 
Jonathan Dowland


signature.asc
Description: Digital signature

Bug#824169: ftp.debian.org: src:chocolate-doom/2.2.1-3 is in both main and contrib

[Fabian Greffrath]

Jonathan Dowland wrote:
> A workaround that *might* work would be if we did a release entirely in
> one
> suite only: i.e. temporarily delete the contrib binary packages. I'm not
> sure
> whether you would be happy to try that, it's pretty drastic.

I think I'd rather move the package back to the contrib section but keep
all four games as binary packages.

 - Fabian

Bug#824169: ftp.debian.org: src:chocolate-doom/2.2.1-3 is in both main and contrib

[Julien Cristau]

On Thu, Dec 15, 2016 at 15:27:01 +, Jonathan Dowland wrote:

> We are 2/10 days into the mandatory migration delay, but PTS still shows 
> "block
> request by jcristau", so I'm really not sure what will happen on 23 Dec.
> 
Nothing; the block is not specific to a version, and will remain in
place as long as this issue is unfixed.

Cheers,
Julien

Bug#824169: ftp.debian.org: src:chocolate-doom/2.2.1-3 is in both main and contrib

[Jonathan Dowland]

On Tue, Dec 13, 2016 at 01:32:31PM +0100, Fabian Greffrath wrote:
> Jonathan Dowland wrote:
> > Sure, done (and VCS updated).  Let's hope I haven't screwed it up :>
> 
> Thanks for that! Let's see what it brings...

I've just refreshed my understanding of the issue and I'm afraid I doubt
this upload will help.

The problem is that our source package produces binary packages for different
suites: main for chocolate-doom (and related), but contrib for
chocolate-heretic/hexen/strife. (both the engine packages and the corresponding
dbgsym packages)

The bug is in the ftp.d.o infrastructure, and the symptom is that it crashes
when processing our package.

To prevent the bug (which would cause a lot of problems for all Debian packages)
our package is manually blocked from migrating to testing.

A workaround that *might* work would be if we did a release entirely in one
suite only: i.e. temporarily delete the contrib binary packages. I'm not sure
whether you would be happy to try that, it's pretty drastic. But we'd still need
the release team (or jcristau specifically) to lift the block manually after we
did that, and I guess put it back again once we had re-added the contrib binary
packages to our control file.

The proper fix is to fix dak itself I think (probably ./dak/control_suite.py)
but I have no familiarity with that whatsoever and I think even reproducing the
problem on different infrastructure might be a lot of work.


-- 
Jonathan Dowland


signature.asc
Description: Digital signature

Bug#824169: ftp.debian.org: src:chocolate-doom/2.2.1-3 is in both main and contrib

[Jonathan Dowland]

On Fri, Sep 23, 2016 at 08:23:05AM +0200, Julien Cristau wrote:
> This now affects a second source package:
> 
> projectb=> select source.source, source.version, c1.name, c2.name from 
> source, files_archive_map fam1, files_archive_map fam2, component c1, 
> component c2 where source.file = fam1.file_id and source.file = fam2.file_id 
> and fam1.component_id = c1.id and fam2.component_id = c2.id and c1.id < c2.id;
>  source |   version| name |  name   
> +--+--+-
>  linux-wlan-ng  | 0.2.9+dfsg-6 | main | contrib
>  chocolate-doom | 2.2.1-3  | main | contrib
> (2 rows)

I think we are up to 3 now, or possibly a different 2:

> projectb=> select source.source, source.version, c1.name, c2.name from 
> source, files_archive_map fam1, files_archive_map fam2, component c1, 
> component c2 where source.file = fam1.file_id and source.file = fam2.file_id 
> and fam1.component_id = c1.id and fam2.component_id = c2.id and c1.id < c2.id;
> 
>  source  |   version| name |  name
> -+--+--+-
>  chocolate-doom  | 2.2.1-4  | main | contrib
>  chocolate-doom  | 2.2.1-3  | main | contrib
>  nvidia-settings | 367.57-1 | main | contrib
>  linux-wlan-ng   | 0.2.9+dfsg-6 | main | contrib
> (4 rows)

As you can see, we have tried to work around this for chocolate-doom for
bumping the version in sid.

We are 2/10 days into the mandatory migration delay, but PTS still shows "block
request by jcristau", so I'm really not sure what will happen on 23 Dec.


-- 
Jonathan Dowland



signature.asc
Description: Digital signature

Bug#824169: ftp.debian.org: src:chocolate-doom/2.2.1-3 is in both main and contrib

[Fabian Greffrath]

Jonathan Dowland wrote:
> Sure, done (and VCS updated).  Let's hope I haven't screwed it up :>

Thanks for that! Let's see what it brings...

 - Fabian

Bug#824169: ftp.debian.org: src:chocolate-doom/2.2.1-3 is in both main and contrib

[Jonathan Dowland]

On Mon, Dec 12, 2016 at 12:13:54PM +0100, Fabian Greffrath wrote:
> Yes, could you probably do the package upload, please? I am currently
> pretty far away from my private PC and would rather avoid adding any
> further delay. Thanks!

Sure, done (and VCS updated).  Let's hope I haven't screwed it up :>

-- 
Jonathan Dowland


signature.asc
Description: Digital signature

Bug#824169: ftp.debian.org: src:chocolate-doom/2.2.1-3 is in both main and contrib

[Fabian Greffrath]

Jonathan Dowland wrote:
> Do you need any assistance?

Yes, could you probably do the package upload, please? I am currently
pretty far away from my private PC and would rather avoid adding any
further delay. Thanks!

 - Fabian

Bug#824169: ftp.debian.org: src:chocolate-doom/2.2.1-3 is in both main and contrib

[Jonathan Dowland]

On Fri, Dec 09, 2016 at 12:27:16PM +0100, Fabian Greffrath wrote:
> I'd be even fine with re-uploading an otherwise unchanged package. In
> fact, this upload would (probably or is that for sure?) fix a bug and a
> severe one, but it's in another package. We could document that in
> debian/changelog and be fine with it.

That's true. Might as well bump the standards version at the same time (and
make sure no changes are needed). This also does not stop us from doing a new
upstream version if one is released in time for the freeze. Do you need any
assistance?

-- 
Jonathan Dowland


signature.asc
Description: Digital signature

Bug#824169: ftp.debian.org: src:chocolate-doom/2.2.1-3 is in both main and contrib

[Fabian Greffrath]

Jonathan Dowland wrote:
> Could we release a new Debian package version of the current release: are
> there enough (any?) small changes we can make like bump standards version
> etc.?[1] Of course there are no actual reported bugs for us to fix!

I'd be even fine with re-uploading an otherwise unchanged package. In
fact, this upload would (probably or is that for sure?) fix a bug and a
severe one, but it's in another package. We could document that in
debian/changelog and be fine with it.

 - Fabian

Bug#824169: ftp.debian.org: src:chocolate-doom/2.2.1-3 is in both main and contrib

[Jonathan Dowland]

On Wed, Dec 07, 2016 at 06:15:38PM +0100, Fabian Greffrath wrote:
> Still no response from anyone and no new Choco release in sight. What
> are we supposed to do now?

Is it very unlikely now that we'll get a new c-d in time for the freeze?
I'll just double check the schedules and ping Fraggle again.

Could we release a new Debian package version of the current release: are
there enough (any?) small changes we can make like bump standards version
etc.?[1] Of course there are no actual reported bugs for us to fix!

[1] that seems to be the only current lintian complaint
https://lintian.debian.org/tags/ancient-standards-version.html

-- 
Jonathan Dowland


signature.asc
Description: Digital signature

Bug#824169: ftp.debian.org: src:chocolate-doom/2.2.1-3 is in both main and contrib

[Fabian Greffrath]

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256

Am Mittwoch, den 16.11.2016, 10:39 + schrieb Jonathan Dowland:
> It's not clear to me whether this would work, or not, but it might be
> worth a try. Fabian, if we can convince Simon that we should release
> a
> new c-d version from the master branch, we could then upload that,
> and
> see if that newer version string managed to avoid this bug. I don't
> think
> there's anything to lose trying...

Still no response from anyone and no new Choco release in sight. What
are we supposed to do now?

 - Fabian
-BEGIN PGP SIGNATURE-

iQIzBAEBCAAdFiEEIsF2SKlSa4TfGRyWy+qOlwzNWd8FAlhIQ7sACgkQy+qOlwzN
Wd8Hag/+LUO5ySIMjwVvfBwt7RZiGc0+8Xn5GN5+LrlvCnDqMwE+/Lsaozb2y5fA
z4aIzk8hz9USnSYk5hYWftNL+nWoWQ2ahinw2qUc19ZujSwkY1Njb/gFmWJB1fne
2pK7Tq6UUSyf9DnQdLDCaS+Ucl5SgLyZ292odJOlkg99jAEYlLTwXK/Ej5rgBvhz
rsYAV4Cw1uuIpuoFVw5QL7csWVGAWKY7clAdDA+ajb+yskr+L1uf7MgGTI5+kEHP
r/Z9p6kfNY7TurhXU0VUS7F3IhG7aJBVJQ4oHwfHRWtNQOWBwz38MFx71tjCwrPp
X4dJZ1VtZlG0cVijRxHPYNc5rrAw5OrKXndO6SyBoAw5ZKvjXf3zDDS0DUwk6RIS
auU85gk7EksAgwj5me8v/+f0ou7+PW+VH1Y9/YFkbW6++E4/0NdqYyo/glHEnV/b
YAUIQ0OpgolcreGDbD8zkVlQJboqi4fA9n8QDzK7Ar9MaFgod8+uyTaC3a/BUb+u
ZUL8Z0ofmR1JoXPYwRqThe8UED+CYPQzvDz6TqWoeTHPgYbrRHcoescUV2AQ6WqO
GxZMtalIpyss+jBp8uYoi21CV0qUY39KEKq/tsPQhSho7dZpyKdUSfBdxY6e4V0W
701XT69IB1Q2BiIMbfkmyHBxwggTWqAUY2JfIg7c972pfC2VnVw=
=ZoLH
-END PGP SIGNATURE-

Bug#824169: ftp.debian.org: src:chocolate-doom/2.2.1-3 is in both main and contrib

[Jonathan Dowland]

On Thu, Aug 11, 2016 at 10:24:37AM +0100, Jonathan Dowland wrote:
> Could we work around this for chocolate-doom at least by uploading a new
> version in sid/main? Obviously ideally we'll find some other reason to
> update the package too :)

It's not clear to me whether this would work, or not, but it might be
worth a try. Fabian, if we can convince Simon that we should release a
new c-d version from the master branch, we could then upload that, and
see if that newer version string managed to avoid this bug. I don't think
there's anything to lose trying...



-- 
Jonathan Dowland


signature.asc
Description: Digital signature

Bug#824169: ftp.debian.org: src:chocolate-doom/2.2.1-3 is in both main and contrib

[Fabian Greffrath]

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256

Am Sonntag, den 13.11.2016, 17:37 +0100 schrieb Julien Cristau:
> The release team has nothing to do with this, other than being
> impacted
> by the archive breakage.

So, who do I need to contact?

 - Fabian
-BEGIN PGP SIGNATURE-

iQIcBAEBCAAGBQJYKJpHAAoJEMvqjpcMzVnft6kQAJVkeu7h3OZyeWm72zX48qwy
z7vxDYNwkQrKWofdmnO2Pn+gQ4DfiECYnBkleTkPD41ypDgwP4Pl0jWbVr/qHh1O
A1mwUJlJgLQ2TnmupC4p9CSNKOqI1ZxOUMwQU9KtKhJkcK+MleN07WJT5mLJcqIm
N5DfA6ZMVPG2sfH0FezUUo+wPg25wCeUVMoAfIQlhT8E2fqQI1Nwae22UEiVuz2m
XIp4IUyxP+Va0EtypebjUHr76tFvv79Zn+sBVh2YClcnK8kTI87zAQ7uyG3ZCLs0
4kVodQSTd2hY/hvlUMSIzRZSfCo7UV9IzWhZ8KspXt9lKq1D6kB6AOZcb0+cLCeH
M/hHNdIZY7t6DPHpEGshNr0u2cuODqS686tPYA2Y8BZ18RZC/WyIpAaYiCJGxeBp
tI4YYrUfPtgeB1wRqRU9U0QpbvHrxlfFFz29j8FjF30GMaJMKz/oROuiylpnvtD6
jCX3ut3bEsenYfv+pomq97epUs4urZf5FR1+SZrJ6hsuenrSBrwPFLSGBkh4TvRo
hBD1HSJ9y+/ViGGJbwwQ1h5Tn4JqVVC9ryEdupXx37fcEL7+7MybtL2AYDIS6J2k
hwY5JTA88vbYBbjR59gFZfx4LvpWoHuQCrnSinyeTY/qj3gPq1EQWupMsSUzLsta
nf4b4/STIc4qH+IIIN77
=b+sB
-END PGP SIGNATURE-

Bug#824169: ftp.debian.org: src:chocolate-doom/2.2.1-3 is in both main and contrib

[Julien Cristau]

On Sun, Nov 13, 2016 at 17:35:32 +0100, Fabian Greffrath wrote:

> -BEGIN PGP SIGNED MESSAGE-
> Hash: SHA256
> 
> Hello-o?!
> 
> Am Sonntag, den 06.11.2016, 16:16 +0100 schrieb Fabian Greffrath:
> > Now that even the first phase of the freeze has just been announced,
> > could we please finally let src:chocolate-doom migrate to testing?
> 
> What is going on here, release team? Freeze is approaching.
> 
The release team has nothing to do with this, other than being impacted
by the archive breakage.

Cheers,
Julien

Bug#824169: ftp.debian.org: src:chocolate-doom/2.2.1-3 is in both main and contrib

[Fabian Greffrath]

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256

Hello-o?!

Am Sonntag, den 06.11.2016, 16:16 +0100 schrieb Fabian Greffrath:
> Now that even the first phase of the freeze has just been announced,
> could we please finally let src:chocolate-doom migrate to testing?

What is going on here, release team? Freeze is approaching.

What needs to be done to let chocolate-doom migrate to testing?

Thanks!

 - Fabian
-BEGIN PGP SIGNATURE-

iQIcBAEBCAAGBQJYKJZUAAoJEMvqjpcMzVnfDWwQAKmFUo+bVqgpdi3U0eBK4rxb
r5lgls9oFw5XDGbsvwbrbKy+B0xQ75NM0GRg2AzkLvRpaDg8rbuSvNMrNwqcHaxm
k4KNImqD+MX8Wo69Q3qDUN8ayRmrqQLo1wY3sk4VNWI50BjhGorjaTlvpkP+Hxhc
ChOD3igRfZbn18ivaFUbEJgxjeOh5LEUX4LPQNcLRKyRonpm3+OuwN1LTMCG7Ize
EgwoyIGFhLHCUM3MxJb7SSEryxGeXSw84X/7M7GSxLKCw8M0Uz3Jgm/Xy+0BPxMI
kvF81pZg9A3MXd4eLsjAfhrdSdNYyQNIvSDkkR4AAZAxDs4FH1GHRa5fYaWGa7i/
9bwkn1EnyqE55l1ql/pLqwatE8tOWsJdN0JbY92LcErHw2jHUKhWBU9djGGml6Rl
TVcK76UzOqEir1eEH22hNIj/86B5d5D3Rt6rCRr43EVYSk+hmTFLqL/7wVpfYIUs
hQVQBebRr8WpgdTW3RapK+qe51yz1XghlIvCNP3OxKE5uU8j+jHP0xYkQHCTg48f
n0QEGQr6vHunsaXlT8oLZ7XU4fNRZLx1lX/hF0FGvytuQl/rxCoTeucL8v2CPLOR
WtZmz/1CM7PEb8GM7mgougU9VMqW+BPk+OQf7j6gxp+pAs3GB8svj4fwTH1yp+mF
D53VFx4L2OeZn74nrbBM
=qN7O
-END PGP SIGNATURE-

Bug#824169: ftp.debian.org: src:chocolate-doom/2.2.1-3 is in both main and contrib

[Fabian Greffrath]

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256

Am Donnerstag, den 11.08.2016, 10:24 +0100 schrieb Jonathan Dowland:
> Could we work around this for chocolate-doom at least by uploading a
> new
> version in sid/main? Obviously ideally we'll find some other reason to
> update the package too :)

Now that even the first phase of the freeze has just been announced,
could we please finally let src:chocolate-doom migrate to testing?

Thank you!

 - Fabian
-BEGIN PGP SIGNATURE-

iQIcBAEBCAAGBQJYH0lHAAoJEMvqjpcMzVnfgD0QAIyL0ujjO7u7u6liLYLPwZ0z
k2y1TcxOaBKnz2IkhnEyKgR0HO5A9WwiZDBtoDgN2N41dMK8eL7InuHoV6UEuNb/
ScgqWhWWWmJlFzoZRPf7v4uKttwaLnx8Hiskxr4zf7QWOBhLq4ZZdhw1tI3rw6TO
00kGzCUF1Z3T+vZdPnsUUQzyCKA7xIIBZugeFmGmJ3Jf+l9E6MsDybi7uY+2jC9c
22Wp6NJBq8c8T7BrZHCTRPCXVyEWAEJ442AUsmO/PT/ZMS25YzsvaqnIkwMGP0DS
GD+Do7bAz8KyXJwzKDz6muut7A7Z1M/QaHKwyOOqhSyp255NJ0bXO5mU3xjCwHDN
0oeztS56Eav/S7+SOsMJluOxWFbnN1chGX1+fh6Mx9MMEagqO8BVCPOuw9LXlOUZ
5AgY2xS56CmGZSf/NEMMJ+ttNyTIDtBzELJcnCM7gtiaJnN0dQ010Kwps6GrpOUa
GlJYk6bVTRhoaerq6xVyXeJ1usHQGy/bpmbYR4pfzmCw5W0YCqTWEakf/ikjccyh
Kf9Cdwqt24s7q2qeX6DlTIuMJ7IftAWDmSmYYUkyrl123Nuv+ByzwAZAzVWOV+9d
2V8+Kq0/BB0BHwHrYa/ab42tj3OOAtIsTo+EfrPobn97GkqVYgYPPRb25EQJ5lHD
iuN7vy04g8BvcQaT2eLj
=xOnU
-END PGP SIGNATURE-

Bug#824169: ftp.debian.org: src:chocolate-doom/2.2.1-3 is in both main and contrib

[Julien Cristau]

On Wed, Aug 10, 2016 at 15:53:44 +0200, Julien Cristau wrote:

> projectb=> select source.id, source.source, source.version, source.file, 
> component.name from source join files_archive_map fam on source.file = 
> fam.file_id join component on component.id = fam.component_id where 
> source.source = 'chocolate-doom' and source.version = '2.2.1-3';
>id   | source | version |   file   |  name   
> ++-+--+-
>  499556 | chocolate-doom | 2.2.1-3 | 14121338 | main
>  499556 | chocolate-doom | 2.2.1-3 | 14121338 | contrib
> (2 rows)
> 
This now affects a second source package:

projectb=> select source.source, source.version, c1.name, c2.name from source, 
files_archive_map fam1, files_archive_map fam2, component c1, component c2 
where source.file = fam1.file_id and source.file = fam2.file_id and 
fam1.component_id = c1.id and fam2.component_id = c2.id and c1.id < c2.id;
 source |   version| name |  name   
+--+--+-
 linux-wlan-ng  | 0.2.9+dfsg-6 | main | contrib
 chocolate-doom | 2.2.1-3  | main | contrib
(2 rows)

Cheers,
Julien

Bug#824169: ftp.debian.org: src:chocolate-doom/2.2.1-3 is in both main and contrib

[Jonathan Dowland]

On Wed, Aug 10, 2016 at 03:53:44PM +0200, Julien Cristau wrote:
> I think I told Ansgar at the time, but forgot to reopen.  This is still
> broken, there's still a file in both contrib and main:
> 
> projectb=> select source.id, source.source, source.version, source.file, 
> component.name from source join files_archive_map fam on source.file = 
> fam.file_id join component on component.id = fam.component_id where 
> source.source = 'chocolate-doom' and source.version = '2.2.1-3';
>id   | source | version |   file   |  name   
> ++-+--+-
>  499556 | chocolate-doom | 2.2.1-3 | 14121338 | main
>  499556 | chocolate-doom | 2.2.1-3 | 14121338 | contrib

Could we work around this for chocolate-doom at least by uploading a new
version in sid/main? Obviously ideally we'll find some other reason to
update the package too :)


signature.asc
Description: Digital signature

Bug#824169: ftp.debian.org: src:chocolate-doom/2.2.1-3 is in both main and contrib

[Julien Cristau]

Control: reopen -1

On Fri, May 13, 2016 at 11:18:01 +0200, Julien Cristau wrote:

> Package: ftp.debian.org
> Severity: important
> X-Debbugs-Cc: debian-rele...@lists.debian.org
> 
> Hi,
> 
> jcristau@franck:~$ dak ls -a source chocolate-doom -s unstable,unstable-debug
> chocolate-doom | 2.2.1-3   | unstable   | source
> chocolate-doom | 2.2.1-3   | unstable-debug/contrib | source
> 
> This breaks the assumption in control-suite that a file can only be in
> one component, and thus prevents britney from touching this package.
> 
I think I told Ansgar at the time, but forgot to reopen.  This is still
broken, there's still a file in both contrib and main:

projectb=> select source.id, source.source, source.version, source.file, 
component.name from source join files_archive_map fam on source.file = 
fam.file_id join component on component.id = fam.component_id where 
source.source = 'chocolate-doom' and source.version = '2.2.1-3';
   id   | source | version |   file   |  name   
++-+--+-
 499556 | chocolate-doom | 2.2.1-3 | 14121338 | main
 499556 | chocolate-doom | 2.2.1-3 | 14121338 | contrib
(2 rows)

Cheers,
Julien


signature.asc
Description: PGP signature

Bug#824169: ftp.debian.org: src:chocolate-doom/2.2.1-3 is in both main and contrib

[Julien Cristau]

Package: ftp.debian.org
Severity: important
X-Debbugs-Cc: debian-rele...@lists.debian.org

Hi,

jcristau@franck:~$ dak ls -a source chocolate-doom -s unstable,unstable-debug
chocolate-doom | 2.2.1-3   | unstable   | source
chocolate-doom | 2.2.1-3   | unstable-debug/contrib | source

This breaks the assumption in control-suite that a file can only be in
one component, and thus prevents britney from touching this package.

Cheers,
Julien


signature.asc
Description: PGP signature