156
|
|
* Merge from Debian experimental. Remaining Ubuntu changes: - debian/rules, debian/control: + Disable SELinux, libaudit-dev is not in main yet (LP 406226). Drop libaudit-dev from build-deps. - debian/rules: Enable xcsecurity (LP 247537). - local/xvfb-run*: Add correct docs about error codes (LP 328205) - local/xvfb-run: Use "-extension Composite" to fix xvfb-run crashing. - debian/patches: + 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 + 157_check_null_modes.patch, 162_null_crtc_in_rotation.patch, 166_nullptr_xinerama_keyrepeat.patch, 167_nullptr_xisbread.patch 169_mipointer_nullptr_checks.patch, 172_cwgetbackingpicture_nullptr_check.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 + 184_virtual_devices_autodetect.patch: Use vesa for qemu device, which is not supported by cirrus + 187_edid_quirk_hp_nc8430.patch: Quirk for another LPL monitor (LP: #380009) + 188_default_primary_to_first_busid.patch: Pick the first device and carry on (LP 459512) + 189_xserver_1.5.0_bg_none_root.patch: Create a root window with no background. + 190_cache-xkbcomp_output_for_fast_start_up.patch: Cache keyboard settings. * debian/control: Drop obsolete Conflicts/Breaks against -psb, -synaptics and -evdev. * debian/local/xserver-xephyr.1: Delete, upstream has Xephyr.1 now. * Dropped patches: - 101_fedora_xserver-1.3.0-document-fontpath-correctly.patch: Upstream dropped it. - 102_ubuntu_sharevts_load_cpu.patch: Upstream. - 103_psb_auto.patch: Fallback to vesa done differently upstream. - 110_fedora_no_move_damage.patch: Upstream dropped it. - 140_quell_acpi_errmsgs.patch: Superseded. - 153_make_dmx_compile.patch: Xdmx is fixed upstream. - 156_exevents_copykeyclass_nullptrcheck.patch: No longer needed. Appropriate checks are done on the pointers prior to CopyKeyClass being called now. - 158_raise_maxclients.patch: Breaks binary drivers. We've had this reverted for some time now, may as well just get rid of it entirely. - 174_set_bg_pixmap_of_cow_to_none.patch: Upstream - 177_animated_cursor_change_master.patch: Different fix upstream. - 180_fedora_no_synaptics_mouse_synthesis.patch: Superseded. - 181_fedora_log_proc_cmdline.patch: Upstream. - 185_dix_badwindow.patch: Upstream. - 186_autoconfig_geode.patch: Upstream. * 189_xserver_1.5.0_bg_none_root.patch: Fetched a new version. * 135_rethrow_signals.patch, 168_glibc_trace_to_stderr.patch: Disabled until fixed to work with the current version. * 160_log_timestamping.patch: Updated and re-enabled for boot speed testing in Lucid. This patch should be disabled by beta2. * 169_mipointer_nullptr_checks.patch: Updated. MIPOINTER() still can return NULL under some circumstances, and its return values are still being dereferenced without checking for NULL. * 188_default_primary_to_first_busid.patch: Updated. Still looks to be relevant for certain multi-card systems. * 190_cache-xkbcomp_output_for_fast_start_up.patch: Updated. * control, local/64-xorg-xkb.rules: Don't depend on keyboard-configuration until we have it. * rules, local/64-xorg-xkb.rules: Use input_id from udev.
|
Timo Aaltonen |
2:1.7.2-2ubuntu1 |
14 years ago
|
|
|