-
Committer:
Bazaar Package Importer
-
Author(s):
Sebastien Bacher, Timo Aaltonen
-
Date:
2007-02-26 09:36:38 UTC
-
mfrom:
(1.1.5 upstream)
-
Revision ID:
james.westby@ubuntu.com-20070226093638-z7nq1i01gcuujj06
Tags: 2:1.2.0-3ubuntu1
* Don't drop 42_build_int10_submodules.diff, it's useful
* 019_ubuntu_enable_composite.diff:
- enable composite
* debian/control:
- fixed Maintainer email
* debian/xserver-xorg-core.install:
- list ioport, gtf, pcitweak and scanpci
and manpages for scanpci, gtf, pcitweak
[ Timo Aaltonen ]
* Merge with Debian, remaining changes:
- debian/rules:
+ build using -fno-stack-protector
+ --with-os-vendor=Ubuntu
- debian/control:
+ don't Conflict with xserver-xorg-video
- refreshed and renamed patches
102_ubuntu_sharevts_load_cpu.patch
104_fedora_init_origins_fix.patch
106_ubuntu_fpic_libxf86config.patch
114_fedora_no_composite_in_xnest.patch
121_only_switch_vt_when_active.diff
124_fix-pdripriv_null_deref.patch
- dropped for now:
42_build_int10_submodules.diff - causes "some regression"
* dropped patches (comments from Michel Daenzer):
- 107_fedora_dont_backfill_bg_none.patch
"Breaks X semantics and thus can't go in upstream. Apps/toolkits
need to be fixed not to use background none windows."
- 108_fedora_gl_include_inferiors.patch
"Breaks GLX semantics and should no longer be necessary now that
the GLX compositing managers default to using the Composite
Overlay Window."
- 120_fedora_disable_offscreen_pixmaps.diff
"Last time I looked at this, it was a gross hack to work around XAA
deficiencies in offscreen pixmap handling, which makes the server
die immediately when trying to use GLX_EXT_texture_from_pixmap
with EXA, due to calling XAA functions without checking it's
active or even loaded."
* debian/control:
- set Conflicts: xkb-data (<< 0.9), since xkb-path is
different from previous releases
* debian/patches/125_randr-version-supported.diff:
- The server supports protocol 1.1, make sure we use it.