Stefan,
The merge proposal is correct, all but the version number. There was a incorrectly done merge that reached natty-proposed, and then was taken from the archive.
The changes apply cleanly to the target branch
(lp:ubuntu/natty-proposed/bcmwl). And the white space change corrects the incorrect indentation that the
previous sponsor added.
$ bzr branch natty-proposed.dist/ natty-proposed
Branched 30 revision(s).
$ bzr merge ../fix-793890/
M debian/bcmwl-kernel-source.postinst
M debian/changelog
All changes applied successfully.
The only thing that needs to be fixed is that there are 2 debian changelog entries (5.100.82.38+bdcom-0ubuntu3.1 and 5.100.82.38+bdcom-0ubuntu3.2).
I think that Daniel was likely just not sure what to do about that (merge the 2 into 0ubuntu3.1 or add the 0ubuntu3.2). I think the correct thing to do is to create the single 0ubuntu3.1 entry.
Daniel, or a sponsor could easily make that change and then upload.
Stefan,
The merge proposal is correct, all but the version number. There was a incorrectly done merge that reached natty-proposed, and then was taken from the archive.
The changes apply cleanly to the target branch
(lp:ubuntu/natty-proposed/bcmwl). And the white space change corrects the incorrect indentation that the
previous sponsor added.
$ bzr branch natty-proposed. dist/ natty-proposed bcmwl-kernel- source. postinst
Branched 30 revision(s).
$ bzr merge ../fix-793890/
M debian/
M debian/changelog
All changes applied successfully.
The only thing that needs to be fixed is that there are 2 debian changelog entries (5.100. 82.38+bdcom- 0ubuntu3. 1 and 5.100.82. 38+bdcom- 0ubuntu3. 2).
I think that Daniel was likely just not sure what to do about that (merge the 2 into 0ubuntu3.1 or add the 0ubuntu3.2). I think the correct thing to do is to create the single 0ubuntu3.1 entry.
Daniel, or a sponsor could easily make that change and then upload.