204
|
|
* Merge from (unreleased) debian-experimental. Remaining Ubuntu changes: - rules: + Disable SELinux, libaudit-dev is not in main yet. (LP: #406226) + Enable xcsecurity. (LP: #247537) + Add --with-extra-module-dir to support GL alternatives. - control: + Xvfb depends on xauth, x11-xkb-utils. (LP: #500102) + Add breaks for incompatible drivers. (LP: #614993) + Drop libaudit-dev from build-deps. - local/xvfb-run*: Add correct docs about error codes. (LP #328205) - debian/patches: + 100_rethrow_signals.patch: When aborting, re-raise signals for apport + 109_fix-swcursor-crash.patch: Avoid dereferencing null pointer while reloading cursors during resume. (LP: #371405) + 111_armel-drv-fallbacks.patch: Add support for armel driver fallbacks. + 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. + 122_xext_fix_card32_overflow_in_xauth.patch: Fix server crash when “xauth generate” is called with large timeout. + 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. + 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 + 188_default_primary_to_first_busid.patch: Pick the first device and carry on (LP: #459512) + 190_cache-xkbcomp_output_for_fast_start_up.patch: + 191-Xorg-add-an-extra-module-path.patch: Add support for the alternatives module path. + 198_nohwaccess.patch: Adds a -nohwaccess argument to make X not access the hardware ports directly. + 200_randr-null.patch: Clarify a pointer initialization. + 206_intel_8xx_default_to_fbdev.patch: Makes 8xx class intel GPUs default to fbdev for stability. (LP: #633593) * Refresh 121_only_switch_vt_when_active.diff for new upstream. * Drop 187_edid_quirk_hp_nc8430.patch; upstream. * Drop 189_xserver_1.5.0_bg_none_root.patch; functionality now upstream. * Refresh 190_cache-xkbcomp_output_for_fast_start_up.patch for new upstream. * Drop 197_xvfb-randr.patch: - miRandR, which this used, has been removed from the server. * Drop 204_fix-neg-sync-transition.patch; upstream. * Drop 207_dga_master_device.patch; upstream. * Drop 208_switch_on_release.diff; upstream. * debian/patches/209_add_legacy_bgnone_option.patch: - Add "-nr" as a synonym for "-background none" to ease the transition from the old 189_xserver_1.5.0_bg_none_root.patch patch. Can be dropped once all the ?DM have been updated to use the new option. * debian/control: - Add Breaks: to xserver-xorg-video-8 and current fglrx. These proprietary drivers don't yet have appropriate dependency information, so manually handle them here to prevent broken upgrades.
|
Christopher James Ha... |
2:1.9.99.901+git20110131.be3be758-0ubuntu1 |
13 years ago
|
|
|
187
|
|
[ Timo Aaltonen ] * Merged from Debian experimental, remaining changes: - rules, control: + Disable SELinux, libaudit-dev is not in main yet (LP 406226). Drop libaudit-dev from build-deps. - rules: Enable xcsecurity (LP 247537). - local/xvfb-run*: Add correct docs about error codes (LP 328205) - rules: Add --with-extra-module-dir to support GL alternatives. - control: Xvfb depends on xauth, x11-xkb-utils, recommends libgl1-mesa-dri. (LP 500102) - rules, local/64-xorg-xkb.rules: Don't use keyboard-configuration until it's available. - debian/patches: + 100_rethrow_signals.patch: When aborting, re-raise signals for apport + 109_fix-swcursor-crash.patch: Avoid dereferencing null pointer while reloading cursors during resume. (LP 371405) + 111_armel-drv-fallbacks.patch: Add support for armel driver fallbacks. + 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. + 122_xext_fix_card32_overflow_in_xauth.patch: + 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. + 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. + 191-Xorg-add-an-extra-module-path.patch: Add support for the alternatives module path. + 196_xvfb-fbscreeninit-handling.patch, 197_xvfb-randr.patch: Adds xrandr support to xvfb. (LP 516123) + 198_nohwaccess.patch: Adds a -nohwaccess argument to make X not access the hardware ports directly. + 200_randr-null.patch: Clarify a pointer initialization. * Dropped patches: - 106_nouveau_autodetect.patch: obsoleted by 15-nouveau.diff - 112_xaa-fbcomposite-fix-negative-size.patch: adopted by Debian - 113_quell_nouveau_aiglx.patch: obsoleted by 15-nouveau.diff - 115_xext_fix_cursor_ref_counting.patch: merged upstream - 116_fix_typos_in_swap_functions.patch: merged upstream - 118_xkb_fix_garbage_init.patch: merged upstream - 123_exa_sys_ptr_nullpointer_check.patch: merged upstream - 199_xfvb-help-typo.patch: merged upstream * debian/xserver-xorg-core.preinst.in: Drop the removal of the wrong alternative, obsolete by now. * debian/control: Build the udeb and bump the relaxed build-deps. * debian/local/xvfb-run: Don't disable composite, seems to run fine with it nowadays.
[ Robert Hooker ] * Fix 190_cache-xkbcomp_output_for_fast_start_up.patch so it works. * Drop 164_trap-aspect-ratios.patch: obsolete. * debian/rules: Adjust confflag targets so xcsecurity isn't enabled for udeb with disabled xace. * Drop 184_virtual_devices_autodetect.patch: It's a noop with todays autoconfig.
[ Bryce Harrington ] * debian/rules: Don't reference the package uploader for support; instead point users to the standard Ubuntu support page. (LP: #589811)
[ Christopher James Halse Rogers ] * Add debian/gbp.conf pointing at ubuntu branch. * Drop 109_fix-swcursor-crash.patch; merged upstream in 3a3edb2c. * 122_xext_fix_card32_overflow_in_xauth.patch: Update to most recent patch on patchwork. This patch actually works! (tested with “xauth generate :0 . trusted timeout 99999999) (LP: #519049)
|
Bryce Harrington |
2:1.8.1.901-1ubuntu1 |
13 years ago
|
|
|
162
|
|
|
Timo Aaltonen |
2:1.7.3.902-1ubuntu1 |
14 years ago
|
|
|
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
|
|
|
140
|
|
|
Timo Aaltonen |
2:1.6.2.901-1ubuntu1 |
14 years ago
|
|
|
123
|
|
|
Bryce Harrington |
2:1.6.0-0ubuntu1 |
15 years ago
|
|
|
110
|
|
|
Timo Aaltonen |
2:1.5.99.3-0ubuntu1 |
15 years ago
|
|
|
83
|
|
* Merge with Debian experimental, remaining changes: * debian/control: - Change maintainer address. - xvfb Depends on xauth, xfonts-base. * debian/patches: - 100_xserver_exa_force_greedy.patch Provide a mechanism for drivers to force greedy mode on. - 101_fedora_xserver-1.3.0-document-fontpath-correctly.patch Fixes document fontpaths shown in the man page. - 102_ubuntu_sharevts_load_cpu.patch Close console fd only when using --sharevts. - 104_psb_auto.patch Add automatic detection of Poulsbo hardware when running without a Device definition. - 107_fedora_dont_backfill_bg_none.patch Disable backfilling of windows created with bg=none, which would otherwise force a framebuffer readback. - 110_fedora_no_move_damage.patch Disable damage notifications on move for manually redirected windows. - 120_fedora_xserver-xaa-evict-pixmaps.patch A hack to evict XAA pixmaps and disable the pixmap cache when the first texture is bound. - 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. - 123_no_composite_for_xvfb_run.patch Use "-extension Composite" to fix xvfb-run crashing. * Cleaned up patches: - upstream, either directly or otherwise implemented: 103_fedora_openchrome.patch, 105_reduce_wakeups_from_smart_scheduler.diff 108_fedora_honor_displaysize.patch, 109_glx_fail_if_no_texture_bound.diff 144_fedora_xserver-1.3.0-xnest-exposures.patch, 146_X86EMU-added-blacklist-for-I-O-port-in-0-0xFF-range.patch, 147_X86EMU-pass-the-correct-bus-dev-fn-tag-to-pci-emula.patch, 148_dix_touchscreen_fixes.diff, 149_add_quirks_for_physical_screen_size_issues.patch, 150_edid_quirk_lp154w01.patch, 151_x86emu_handle_cpuid.patch, 153_exa_skip_empty_glyphs.diff, 154_fix_rotation_for_multimon.diff, 155_exa_fix_off-by-one.diff, 156_resize_composite_overlay.diff, 157_fix_exa_pixmap_width.diff, 158_xkb_wrapping.diff, 159_xkb_default_to_null.diff, 160_default_to_intel.diff, 161_fix_big_endian_cursor.diff, 162_cve-2007-6429.diff, 163_fix_untrusted_access.diff, 164_fix_context_sharing.diff, 165_fedora_xserver-1.5.0-xaa-option-inversion.patch, 166_fix_lpl_monitors.diff, 167_xf86AutoConfig_geode_addition.diff, 168_closedir.patch, 170_xorg-xserver-1.4-cve-2008-1377.diff, 171_xorg-xserver-1.4-cve-2008-1379.diff, 172_xorg-xserver-1.4-cve-2008-2360.diff, 173_xorg-xserver-1.4-cve-2008-2361.diff, 174_xorg-xserver-1.4-cve-2008-2362.diff - obsolete: 101_fedora-apm-typedefs.patch 104_fedora_init_origins_fix.patch 142_fedora_xserver-1.3.0-no-pseudocolor-composite.patch 169_xf86AutoConfig_choose_default_driver_if_no_pci.patch - unnecessary: 106_ubuntu_fpic_libxf86config.patch (the lib is not shipped)
|
Timo Aaltonen |
2:1.4.99.905-0ubuntu1 |
15 years ago
|
|
|
59
|
|
* Merge from debian unstable, remaining changes: - debian/control: + set Conflicts: xkb-data (<< 0.9), since xkb-path is different from previous releases + xvfb Depends on xauth, xfonts-base + Set Maintainer to Ubuntu Core Developers - debian/rules: + --with-os-vendor=Ubuntu - debian/xserver-xorg-core.install: + Add ioport, pcitweak, scanpci scripts & man pages - debian/patches: + 102_ubuntu_sharevts_load_cpu.patch: close console fd only when ShareVTs + 104_fedora_init_origins_fix.patch: multihead initialization + 106_ubuntu_fpic_libxf86config.patch: Add -fPIC to makefiles for xfree86/parser + 107_fedora_dont_backfill_bg_none.patch: Disable backfilling of windows created with bg=none, which otherwise would force a framebuffer readback. + 110_fedora_no_move_damage.patch: Disable damage notifications on move for manually redirected windows. + 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. + 123_no_composite_for_xvfb_run.patch: use "-extension Composite" to fix xvfb-run crashing + 133_psb_auto.patch: Add automatic detection of Poulsbo hardware when running without a Device definition. + 138_fedora_xserver-1.3.0-default-dpi.patch: Changes default dpi to 100. + 139_fedora_xserver-1.3.0-document-fontpath-correctly.patch: Fixes document fontpaths shown in the man page. + 142_fedora_xserver-1.3.0-no-pseudocolor-composite.patch: Composite on 8bpp pseudocolor root windows appears to fail, so just disable it on anything pseudocolor for safety. + 144_fedora_xserver-1.3.0-xnest-exposures.patch: Only collect xnest exposures for xexposes with non-zero height and width. * debian/patches: - 100, 114, 119, 132, 134, 135, 136, 137, 140, 141, 145, 2xx: + removed, applied upstream or otherwise obsolete. - 106_ubuntu_fpic_libxf86config.patch: + rebased - 120_fedora_disable_offscreen_pixmaps.diff: + disabled, will probably be dropped later. * debian/control: - don't Conflict with xserver-xorg-video anymore, nvidia-glx and xorg-driver-fglrx should Provide: xserver-xorg-video-ABIVERSION.
|
Timo Aaltonen |
2:1.4-3ubuntu1 |
16 years ago
|
|
|
4
|
|
|
Daniel Stone |
1:1.0.1-0ubuntu1 |
18 years ago
|
|
|