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

Branch merges

Related bugs

Related blueprints

Branch information

Ubuntu branches
Review team:
Ubuntu Development Team

Recent revisions

166. By Timo Aaltonen

Merge from Debian unstable.

165. By Bryce Harrington

[Timo Aaltonen]
* Merge from debian unstable
* 50x11-common_determine-startup: Fix a typo in the option name
  (LP: #526532)

[Bryce Harrington]
* debian/apport/source_xorg.py: Fix proprietary module detection logic to
  not send all crash bugs to -nvidia.

164. By Bryce Harrington

* debian/local/Failsafe:
  + udev rules don't have a particular environment set, so we must
    set it up ourselves in order to get $LANG and $LANGUAGE so that
    translations work properly.
    (LP: #528908)
* debian/apport/source_xorg.py:
  + Only file crash bugs with no traceback against nvidia/fglrx

163. By Martin Pitt

* Reapply changes from 1:7.5+1ubuntu6, which got clobbered by a later
  - Introduce an Xsession.d function has_option() to simplify option
    checking. (LP: #530675)
  - Fix $OPTIONFILE parsing to only match keywords on the beginning of

162. By Chris Halse Rogers

* debian/apport/source_xorg.py
  + Fix various small problems which caused the hook to fail.
  + Use root_command_outupt to read gdm log files, as they require root to

161. By Bryce Harrington

[ Bryce Harrington ]
* debian/x11-common.links:
  + Update links for renamed packages
  + Add apport hook for nvidia-graphics-drivers
  + Add apport hook for -vmmouse (LP: #517664)
  + Remove apport hooks for packages now removed from repository
* debian/apport/source_xorg.py:
  + Add tagging of release codename
  + Collect gdm logs as root
  + Remove extraneous checking of $DISPLAY
  + Detect vbox, fglrx, and nvidia and file bugs against the respective
    packages instead.
    (LP: #516264)

[ Timo Aaltonen ]
* debian/x11-common.links: Add xf86-input-evtouch and -wacom.

160. By Luke Yelavich

debian/scripts/vars.powerpc, debian/scripts/vars.ppc64: Remove the
dependency on xserver-xorg-video-nouveau. Xserver-xorg-video-nouveau
depends on linux backport modules packages that are unavailable on
powerpc. (LP: #525683)

159. By Bryce Harrington

* debian/local/Failsafe/failsafeXServer:
  + Actually produce xorg.conf.failsafe with the detected driver.
    Important for failures while running in KMS mode.
    (LP: #496773)
  + Force overwrite of existing xorg.conf.failsafe. Since above
    change produces different xorg.conf.failsafe's depending on
    what driver was selected, we must force it to regen each time.
    (LP: #480747)

158. By Martin Pitt

Fix $OPTIONFILE parsing to only match keywords on the beginning of lines.

157. By Bryce Harrington

debian/scripts/*: Drop -nv from xserver-xorg-video-all

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.