~ubuntu-branches/ubuntu/oneiric/jockey/oneiric-proposed

Viewing all changes in revision 134.

  • Committer: Package Import Robot
  • Author(s): Martin Pitt
  • Date: 2011-11-02 14:10:22 UTC
  • Revision ID: package-import@ubuntu.com-20111102141022-i2gvgtoeo7kthm5t
Tags: 0.9.4-0ubuntu10.1
* debian/control: Update Vcs-Bzr: for oneiric branch.
* jockey/xorg_driver.py, tests/handlers.py: Add
  XorgDriverHandler.loaded_drivers(), as a prerequisite for LP#885204. Patch
  cherrypicked from trunk r756.
* data/handlers/nvidia.py: Do not offer this driver if intel X.org driver
  is loaded. On hybrid systems where intel is active, installing the
  proprietary drivers and their libGL breaks intel. (LP: #885204)

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: