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

45. By Kees Cook on 2007-03-29

* SECURITY UPDATE: arbitrary code execution with root privs via integer
  overflows in MISC-XC.
* Add debian/patches/131_misc_xc_overflows.patch: upstream fixes.
* References

44. By Timo Aaltonen on 2007-03-30

* debian/patches/120_fedora_disable_offscreen_pixmaps.patch
  - update to the latest version from Fedora (rev. 1.6, was 1.1)

43. By Timo Aaltonen on 2007-03-29

* debian/{rules,xsfbs/xsfbs.mk,serverminver,inputabiver}
  - Import changes from current debian package, needed for the new intel
  - Rename serverabiver to videoabiver, value 1.0.
  - Set serverminver as this version.
* debian/patches:
  - Patches from server-1.3 branch, which make probing the monitor more

42. By Timo Aaltonen on 2007-03-27

* debian/patches/120_fedora_disable_offscreen_pixmaps.diff
  - Re-enable. Despite being a hack, it works and is needed for compositing
    managers to work properly. (LP: #89189)

41. By Timo Aaltonen on 2007-03-17

* debian/patches/107_fedora_dont_backfill_bg_none.patch:
  - Re-enable to see if it helps with performance regressions.
* debian/patches/127_check_for_clientgone.patch:
  - A fix from upstream. (LP: #60288)
* debian/patches/128_fix_client_privates_leak.patch
  - Plug a memory leak. (LP: #92882)
* debian/rules
  - Fix a typo in --with-default-font-path.

40. By Timo Aaltonen on 2007-02-28

* debian/patches:
  - Rename 019_ubuntu_enable_composite.diff to 119_* so that it is in line
    with the rest of our patches
  - Re-add 126_debian_always_use_default_font_path.diff. This was dropped
    by Debian but needed by us since we still have legacy fontpaths in
    old configurations, so new paths need to be appended to the list.

39. By Sebastien Bacher on 2007-02-27

* debian/control:
  - xvfb Depends on xauth, xfonts-base

38. By Sebastien Bacher on 2007-02-26

* 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
  - 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.

37. By Kees Cook on 2007-02-10

Add 'debian/patches/38_Fix-pDRIPriv_NULL_deref.patch': NULL-init DRI
screen private data, thanks to Tormod Volden (LP: #60288).

36. By Sebastien Bacher on 2007-01-12

* 19_revert_xkb_change_breaking_XkbGetKeyboard.patch:
  - patch from fedora (with extra Makefile.in change), revert change that
    broke XkbGetKeyboard() (Ubuntu: #58083)
* 37_Fix-__glXDRIbindTexImage-for-32-bpp-on-big-endian-platforms.diff:
  - upstream patch copied from the Debian package, fix blue screen with
    compiz on ppc (Ubuntu: #58373)

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.