~ubuntu-branches/ubuntu/jaunty/jockey/jaunty

Viewing all changes in revision 56.

  • Committer: Bazaar Package Importer
  • Author(s): Martin Pitt
  • Date: 2009-03-07 15:34:09 UTC
  • Revision ID: james.westby@ubuntu.com-20090307153409-oq1ks37438f5aztd
Tags: 0.5-0ubuntu3
* data/handlers/broadcom_wl.py: Fix spelling of the b43legacy module.
* data/handlers/broadcom_wl.py: Fix ordering of module loading if b44 is
  needed/loaded as well: Blacklist b44, and load it in the "install wl"
  rule, so that wl always comes first. (LP: #333903)
* Merge bug fixes from trunk:
  - oslib.py: Do not grab lsb-release stderr.
  - oslib.py: Append ".conf" suffix to blacklist file, since current
    modutils deprecates anything else.
* data/handlers/{b43,broadcom_wl}.py: Rename blacklist-bcm43 to
  blacklist-bcm43.conf, for the same reason.
* debian/jockey-common.postinst: Rename blacklist-{bcm43,local} to *.conf on
  upgrades.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: