Merge lp:~vanvugt/ubuntu/natty/bcmwl/fix-793890 into lp:ubuntu/natty-proposed/bcmwl

Proposed by Daniel van Vugt
Status: Superseded
Proposed branch: lp:~vanvugt/ubuntu/natty/bcmwl/fix-793890
Merge into: lp:ubuntu/natty-proposed/bcmwl
To merge this branch: bzr merge lp:~vanvugt/ubuntu/natty/bcmwl/fix-793890
Reviewer Review Type Date Requested Status
Ubuntu Development Team Pending
Review via email: mp+67274@code.launchpad.net

Description of the change

debian/bcmwl-kernel-source.postinst: fix merge mistake in the previous revision resulting in failure to install (LP: #793890)

This is holding up the release of fixes for bug 776439 and bug 776165.

P.S. Not my fault. My original merge proposals were correct. It was the person who merged them into natty-proposed who made a mistake :)

To post a comment you must log in.
Revision history for this message
Daniel van Vugt (vanvugt) wrote :

Yes, I know the diff is missing. That is Launchpad bug 807337.

Instead you can look at the proposed branch directly:
lp:~vanvugt/ubuntu/natty/bcmwl/fix-793890

32. By Daniel van Vugt

No need for a new version since the previous one wasn't released. This also
means we don't need to mention bug 793890 in the changelog because bug
793890
also was never released beyond natty-proposed.

Unmerged revisions

32. By Daniel van Vugt

No need for a new version since the previous one wasn't released. This also
means we don't need to mention bug 793890 in the changelog because bug
793890
also was never released beyond natty-proposed.

31. By Daniel van Vugt

debian/bcmwl-kernel-source.postinst: fix merge mistake in the previous
revision resulting in failure to install (LP: #793890)

Subscribers

People subscribed via source and target branches