Created by James Westby on 2010-02-22 and last modified on 2010-02-22
Get this branch:
bzr branch lp:ubuntu/karmic/xorg-server
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

153. By Bryce Harrington on 2009-10-26

Add 188_default_primary_to_first_busid.patch: X can abort if multiple
video devices are present, and none are marked as primary. This makes
X just pick the first one it sees and carry on.
(LP: #459512)

152. By Bryce Harrington on 2009-10-14

local/xvfb-run: Fix race condition in xvfb-run that can cause
concurrent invocations to fail.
(LP: #348052)

151. By Bryce Harrington on 2009-10-13

Add 187_edid_quirk_hp_nc8430.patch: Quirk for another LPL monitor, to
fix huge font sizes due to invalid EDID from the hardware.
(LP: #380009)

150. By Bryce Harrington on 2009-10-09

* Merge from Debian unstable. (LP: #447010)
  Remaining Ubuntu changes:
  - debian/control:
    + set Conflicts: xkb-data (<< 0.9), since xkb-path is
      different from previous releases
    + do not Conflict with xserver-xorg-video
    + xvfb Depends on xauth, xfonts-base
    + Set Maintainer to Ubuntu Core Developers
  - debian/rules:
    + build using -fno-stack-protector
    + --with-os-vendor=Ubuntu
  - debian/xserver-xorg-core.install:
    + Add ioport, pcitweak, scanpci scripts & man pages
  - debian/patches:
    + 101_fedora_xserver-1.3.0-document-fontpath-correctly.patch:
      Specify correct paths to fonts
    + 102_ubuntu_sharevts_load_cpu.patch:
      close console fd only when ShareVTs
    + 103_psb_auto.patch:
      Autodetect poulsbo devices (but use -vesa since -psb is broken)
    + 110_fedora_no_move_damage.patch:
      further aiglx support
    + 121_only_switch_vt_when_active.diff:
      Add a check to prevent the X server from changing the VT when killing
      GDM from the console.
    + 135_rethrow_signals.patch:
      When aborting, re-raise signals for apport
    + 140_quell_acpi_errmsgs.patch:
      Avoid generating extraneous warnings when acpi is missing
    + 153_make_dmx_compile.patch:
      Change xcalloc -> calloc, so that dmx compiles.
    + 156_exevents_copykeyclass_nullptrcheck.patch,
      157_check_null_modes.patch, 162_null_crtc_in_rotation.patch,
      166_nullptr_xinerama_keyrepeat.patch, 167_nullptr_xisbread.patch
      Fix various segfaults in xserver by checking pointers for NULL
      values before dereferencing them.
    + 164_trap-aspect-ratios.patch:
      Correct monitor EDIDs that have misreported aspect ratios.
    + 165_man_xorg_conf_no_device_ident.patch
      Correct man page
    + 168_glibc_trace_to_stderr.patch:
      Report abort traces to stderr instead of terminal
    + 174_set_bg_pixmap_of_cow_to_none.patch:
      Set background pixmap of composite overlay window to no background
    + 177_animated_cursor_change_master.patch:
      Don't create animated cursors for slave devices
    + 180_fedora_no_synaptics_mouse_synthesis.patch:
      Don't synthesize a mouse section if a synaptics device is found
    + 181_fedora_log_proc_cmdline.patch:
      Dump /proc/cmdline in the log file too
    + 184_virtual_devices_autodetect.patch:
      Use vesa for qemu device, which is not supported by cirrus
    + 185_dix_badwindow.patch:
      Don't return BadMatch from GetProperty if window isn't actually a window
    + 186_autoconfig_geode.patch
      Perform autodetection correctly for various geode devices
* Update 184_virtual_devices_autodetect.patch to only include inserting
  cirrus, since vbox is covered by the new fedora patch.
* Drop patches already included upstream:
  - 187_lastdeviceeventtime-no-reset.patch
  - 178_glx_flush_cache.patch
  - 179_glx_cleanup_drawables.patch
  - 183_dont_reset_event_time.patch
  - 182_negative_sync_transitions.patch
* Ubuntu bugs fixed as of this release:
  - Generate key up event only when key is released. (Fixed previously)
    (LP: #403339)
  - Fix XDPMS change event idle handling
    (LP: #114336, #152999)
  - Don't shutdown the libhal ctx if it failed to initialize. Fixes
    crash if HAL or dbus is not running or is interrupted.
    (LP: #114336)
  - Fix crash if SendCoreEvents is off. Don't send events through
    master in this case.
    (LP: #368135)
  - Fix SWCursor check in xf86CursorSetCursor to prevent cursor image
    showing up on every screen with Xinerama.
    (LP: #357901)

149. By Loïc Minier on 2009-09-28

Add 187_lastdeviceeventtime-no-reset.patch: Avoids resetting IDLETIME on
DPMS events. Cherrypick from upstream.
(LP: #397839)

148. By Bryce Harrington on 2009-09-08

Add 186_autoconfig_geode.patch: Add autoconfiguration support for
older geode cards. Cherrypick from upstream.
(LP: #423866)

147. By Bryce Harrington on 2009-09-03

Add 185_dix_badwindow.patch: dixLookupWindow may return BadMatch if
the window in question isn't actually a window. In this case,
GetProperty needs to return BadWindownot BadMatch. Fixes unexpected
crash in some GNOME applications not expecting to get BadMatch returned
from this function call.
(LP: #321041)

146. By Bryce Harrington on 2009-08-24

Add 184_virtual_devices_autodetect.patch: Automatic driver detection
for vbox and kvm for non-cirrus devices.
(LP: #338219, #348497)

145. By Bryce Harrington on 2009-08-19

Add 183_dont_reset_event_time.patch: Upstream cherrypick.
Fix another random display blanking issue. When we turn off DPMS with
DPMSModeOff and do dixSaveScreens, don't reset the event time else
session clients using IDLETIME will be reset.
See http://blogs.gnome.org/hughsie/2009/08/17/

144. By Bryce Harrington on 2009-08-14

Add 182_negative_sync_transitions.patch: Upstream cherrypick.
Fix random blanking display when system is not idle, caused by
mishandling of negative transition triggers in XSync.
(LP: #397839)

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.