Created by James Westby and last modified
Get this branch:
bzr branch lp:ubuntu/natty/jockey
Members of Ubuntu branches can upload to this branch. Log in for directions.

Related bugs

Related blueprints

Branch information

Ubuntu branches

Recent revisions

119. By Martin Pitt

[ Martin Pitt ]
* data/handlers/nvidia.py: Fix broken condition in used(), which would be
  True already if the package was merely installed. (LP: #759804)
* jockey/oslib.py, ignored_modules(): Drop linux-ubuntu-modules, gone long
* Cherry-pick r720 from trunk to support a new --kernel option on the
  backend and frontend with --no-dbus. This allows ubiquity to install a PAE
  kernel on the target system and tell jockey to install kernel headers for
  that one instead for the running one. Based on a patch from Evan Dandrea,
  thanks! (LP: #759804)
* Cherry-pick r721 from trunk: OpenPrintingDriverDB: Use the actual package
  version as "version" attribute instead of the driver name. This was a bit
  of a thinko back then. Update test cases accordingly. (LP: #744751)

[ Evan Dandrea ]
* jockey/oslib.py: Disconnect from Debconf before installing packages.
  (LP: #759804)

118. By Martin Pitt

[ Martin Pitt ]
* data/handlers/nvidia.py: Some cleanup:
  - Drop obsolete add_modules=['glx'].
  - Drop setting DefaultDepth=24, X.org does that by default now.
  - Move version 96 specific code to NvidiaDriver96 class.
  - Remove some dead code.
* Merge from trunk:
  - XorgDriverHandler: Support None X.org driver to avoid changing the
    Driver setting. This is appropriate for drivers which X.org conf
  - Add new flag Handler.needs_kernel_headers and install kernel headers if
* data/handlers/{nvidia,fglrx}.py: Stop setting the X.org driver and
  alternate free driver. Natty's X.org now prefers the proprietary drivers
  over the free ones when available (105_nvidia_fglrx_autodetect.patch).
  This allows X.org to fall back to the free driver if the proprietary one
  gets broken or out of sync. (LP: #522061)
* jockey/oslib.py: Set kernel header metapackage name from currently running
  kernel flavour, and add a small test case that it is a valid package.
* data/handlers/{nvidia,fglrx}.py: Replace custom code to install kernel
  headers with setting the needs_kernel_headers flag.
* data/handlers/broadcom_wl.py: Set needs_kernel_headers flag. (LP: #567699)
* jockey/oslib.py, install_packages(): python-apt recently changed
  "architecture" field of a candidate Version; where it used to say "all"
  it now has the platform name. So switch to
  candidate.record['Architecture'] to check if a package is Arch: all. This
  unbreaks installation of unsigned third-party PPD packages.

[ Alberto Milone ]
* data/handlers/fglrx.py:
  - Re-enable fglrx.
  - Replace tabs with whitespaces.
* data/handlers/nvidia.py:
  - Replace tabs with whitespaces.

117. By Martin Pitt

* Merge from trunk:
  - OSLib.import_gpg_key(): Respect $http_proxy. Thanks Olaf Meeuwissen.
    (LP: #733023)
  - oslib.py: Switch to default keyserver on port 80 to be more proxy
    friendly. (LP: #733029)

116. By Martin Pitt

* Merge from trunk:
  - Reintroduce __fix_stdouterr(); we need it for proper -l unicode support.
    However, delay it until after OptParser, as an already encoded
    sys.stderr causes that to crash. (LP: #728744)

115. By Martin Pitt

* New upstream bug fix release:
  - Add X.org video driver ABI checking. (This was already cherrypicked
    in an earlier upload)
  - Drop our own verified_https.py and implement GPG fingerprint SSL
    checking with pycurl, which gets along with proxies. (LP: #729185)
  - Some code cleanup and more test cases.
* debian/control: Add python-pycurl dependency.

114. By Martin Pitt

gtk/jockey-gtk: Update require_version() call to current pygobject API.
Bump python-gobject dependency accordingly.

113. By Martin Pitt

debian/control: Move nvidia-common back to Recommends, as this is only
available on i386/amd64, and we can't do arch specific dependencies for
arch:all packages. (Reopens #704597)

112. By Martin Pitt

* Merge from trunk:
  - Add X.org video driver ABI checking
* jockey/oslib.py: Implement current_xorg_video_abi() and
  video_driver_abi() for Ubuntu.
* data/handlers/nvidia.py: Drop (already commented out) disabling due to ABI
  mismatch. With above code, this check now happens dynamically, also works
  for third-party repos, and we can stop having to update the handler each
  time the ABIs get out of sync.

111. By Alberto Milone

* data/handlers/nvidia.py:
  - Re-enable nvidia-current now that we have an ABI compatible driver.

110. By Martin Pitt

* New upstream bug fix release. Changes since our previous trunk snapshot:
  - Do not create standard drivers for disabled custom drivers. This caused
    NVidia/FGLRX to still be offered in Jockey, causing a lot of damage.
    (LP: #716363)

Branch metadata

Branch format:
Branch format 7
Repository format:
Bazaar repository format 2a (needs bzr 1.16 or later)
Stacked on:
This branch contains Public information 
Everyone can see this information.