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

[Daniel van Vugt]

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 :)

[Scott Moser (smoser)]

The fix is good, resulting in good shell syntax on
debian/bcmwl-kernel-source.postinst . previously a simple 'bash -n debian/bcmwl-kernel-source.postinst' would fail.

review: Approve

[Stéphane Graber (stgraber)]

Hmm, that merge proposal is to be applied on top of something that doesn't exist.

As 3.1 failed validation, it got removed from the archive. Therefore the new fix should be stacked on top of:
     bcmwl | 5.100.82.38+bdcom-0ubuntu3 | natty/restricted | source

Also, the diff below contains (unless I missed something) an indentation change that makes it harder to understand what the actual change is.

Reviewing as Needs fixing and marking the merge proposal back to Work in progress.

review: Needs Fixing

[Scott Moser (smoser)]

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.

review: Approve

[Daniel van Vugt (vanvugt)]

Yes I half expected someone to complain about the changelog entry since 3.1 was never released. But didn't know what the correct policy was. Simple to fix...

[Stéphane Graber (stgraber)]

3.2 has been sponsored as-is by Daniel T Chen and it's currently in natty-proposed waiting for review.

Please test and confirm the fix in the mentioned bug reports.

I'm removing this merge request from the review queue.

Thanks for your work and patience!

=== modified file 'debian/bcmwl-kernel-source.postinst'
--- debian/bcmwl-kernel-source.postinst	2011-06-03 11:45:25 +0000
+++ debian/bcmwl-kernel-source.postinst	2011-07-28 02:58:28 +0000
@@ -43,13 +43,12 @@
 blacklist bcm43xx
 blacklist brcm80211
 EOF
-		# If b44 is loaded, append these additional lines
-		if lsmod | grep b44 > /dev/null; then
-			cat >> $BLACKLIST_FILE <<EOF
+	# If b44 is loaded, append these additional lines
+	if lsmod | grep b44 > /dev/null; then
+		cat >> $BLACKLIST_FILE <<EOF
 blacklist b44
 install wl modprobe -r b43 b44 b43legacy ssb; modprobe --ignore-install wl $CMDLINE_OPTS; modprobe --ignore-install b44
 EOF
-		fi
 	fi
 	
 	# Update initramfs

=== modified file 'debian/changelog'
--- debian/changelog	2011-06-03 11:45:25 +0000
+++ debian/changelog	2011-07-28 02:58:28 +0000
@@ -2,12 +2,12 @@
 
   [ Daniel van Vugt ]
   * debian/bcmwl-kernel-source.prerm:
-    - Don't error out if we can't remove bcmwl module.  LP: #776439
+    - Don't error out if we can't remove bcmwl module. (LP: #776439)
   * debian/bcmwl-kernel-source.postinst:
     - Unconditionally update the blacklist (i.e. even on upgrade).
-      LP: #776165
+      (LP: #776165)
 
- -- Luke Yelavich <[e-mail]>  Fri, 03 Jun 2011 11:45:25 +1000
+ -- Daniel van Vugt <[e-mail]>  Thu, 28 Jul 2011 10:52:48 +0800
 
 bcmwl (5.100.82.38+bdcom-0ubuntu3) natty; urgency=low