[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

xorg-server: Changes to 'debian-experimental'



 COPYING                                                              |    2 
 ChangeLog                                                            | 3355 ++++
 Xext/geext.c                                                         |    2 
 Xext/security.c                                                      |    2 
 Xext/sync.c                                                          |  172 
 Xext/xf86bigfont.c                                                   |   91 
 Xext/xselinux_ext.c                                                  |    6 
 Xi/exevents.c                                                        |    3 
 Xi/extinit.c                                                         |    1 
 Xi/xigrabdev.c                                                       |    2 
 Xi/xipassivegrab.c                                                   |    2 
 Xi/xiproperty.c                                                      |    2 
 Xi/xiquerypointer.c                                                  |    2 
 Xi/xiselectev.c                                                      |   15 
 Xi/xiwarppointer.c                                                   |    2 
 composite/compalloc.c                                                |   40 
 composite/compext.c                                                  |    2 
 composite/compinit.c                                                 |   64 
 composite/compint.h                                                  |    7 
 composite/compoverlay.c                                              |    2 
 composite/compwindow.c                                               |   36 
 config/hal.c                                                         |   13 
 config/udev.c                                                        |   33 
 configure.ac                                                         |   38 
 cpprules.in                                                          |   49 
 debian/changelog                                                     |   16 
 debian/copyright                                                     | 2126 ++
 debian/patches/16-oot-build.diff                                     |   31 
 debian/patches/series                                                |    1 
 debian/serverminver                                                  |    4 
 debian/xserver-xorg-core.bug.script                                  |    6 
 dix/Xserver-dtrace.h.in                                              |    2 
 dix/Xserver.d                                                        |    2 
 dix/deprecated.c                                                     |   30 
 dix/devices.c                                                        |   17 
 dix/dispatch.c                                                       |    2 
 dix/dixfonts.c                                                       |    6 
 dix/events.c                                                         |  137 
 dix/getevents.c                                                      |   60 
 dix/inpututils.c                                                     |    8 
 dix/property.c                                                       |    3 
 dix/resource.c                                                       |   44 
 dix/window.c                                                         |    4 
 doc/man/Makefile.am                                                  |   16 
 doc/xml/Xserver-spec.xml                                             |    7 
 exa/exa.c                                                            |    3 
 exa/exa_accel.c                                                      |    2 
 exa/exa_driver.c                                                     |    2 
 exa/exa_migration_mixed.c                                            |   17 
 exa/exa_mixed.c                                                      |    2 
 exa/exa_unaccel.c                                                    |    7 
 fb/Makefile.am                                                       |    4 
 fb/fbcmap_mi.c                                                       |    2 
 glx/glxcmds.c                                                        |  188 
 glx/glxcmdsswap.c                                                    |  171 
 glx/glxdri2.c                                                        |    2 
 glx/unpack.h                                                         |    2 
 glx/xfont.c                                                          |    2 
 hw/dmx/Makefile.am                                                   |   32 
 hw/dmx/Xdmx.man                                                      |  741 -
 hw/dmx/config/Makefile.am                                            |   21 
 hw/dmx/config/dmxtodmx.man                                           |   41 
 hw/dmx/config/man/Makefile.am                                        |    2 
 hw/dmx/config/man/dmxtodmx.man                                       |   41 
 hw/dmx/config/man/vdltodmx.man                                       |   95 
 hw/dmx/config/man/xdmxconfig.man                                     |   63 
 hw/dmx/config/vdltodmx.man                                           |   95 
 hw/dmx/config/xdmxconfig.c                                           |    2 
 hw/dmx/config/xdmxconfig.man                                         |   63 
 hw/dmx/dmx.c                                                         |   10 
 hw/dmx/dmxextension.c                                                |   32 
 hw/dmx/dmxgc.c                                                       |    7 
 hw/dmx/dmxgcops.c                                                    |   10 
 hw/dmx/dmxpict.c                                                     |   54 
 hw/dmx/dmxwindow.c                                                   |   10 
 hw/dmx/doc/Makefile.am                                               |    2 
 hw/dmx/glxProxy/glxcmds.c                                            |  182 
 hw/dmx/glxProxy/glxext.c                                             |    6 
 hw/dmx/glxProxy/unpack.h                                             |    2 
 hw/dmx/input/dmxinputinit.c                                          |   40 
 hw/dmx/man/Makefile.am                                               |    2 
 hw/dmx/man/Xdmx.man                                                  |  741 +
 hw/kdrive/ephyr/.gitignore                                           |    2 
 hw/kdrive/ephyr/Makefile.am                                          |   18 
 hw/kdrive/ephyr/Xephyr.man.pre                                       |   89 
 hw/kdrive/ephyr/man/Makefile.am                                      |    2 
 hw/kdrive/ephyr/man/Xephyr.man                                       |   87 
 hw/vfb/.gitignore                                                    |    2 
 hw/vfb/Makefile.am                                                   |   21 
 hw/vfb/Xvfb.man.pre                                                  |  125 
 hw/vfb/man/Makefile.am                                               |    2 
 hw/vfb/man/Xvfb.man                                                  |  125 
 hw/xfree86/.gitignore                                                |    3 
 hw/xfree86/Makefile.am                                               |   18 
 hw/xfree86/common/Makefile.am                                        |    5 
 hw/xfree86/common/compiler.h                                         |   13 
 hw/xfree86/common/scoasm.h                                           |  142 
 hw/xfree86/common/xf86.h                                             |    2 
 hw/xfree86/common/xf86AutoConfig.c                                   |    6 
 hw/xfree86/common/xf86Bus.c                                          |   35 
 hw/xfree86/common/xf86Config.c                                       |   13 
 hw/xfree86/common/xf86Configure.c                                    |   54 
 hw/xfree86/common/xf86Cursor.c                                       |    6 
 hw/xfree86/common/xf86DGA.c                                          |   51 
 hw/xfree86/common/xf86Events.c                                       |   13 
 hw/xfree86/common/xf86Globals.c                                      |    1 
 hw/xfree86/common/xf86Helper.c                                       |   15 
 hw/xfree86/common/xf86Init.c                                         |   30 
 hw/xfree86/common/xf86Module.h                                       |    2 
 hw/xfree86/common/xf86Option.c                                       |    7 
 hw/xfree86/common/xf86PM.c                                           |   23 
 hw/xfree86/common/xf86Priv.h                                         |    1 
 hw/xfree86/common/xf86ShowOpts.c                                     |   10 
 hw/xfree86/common/xf86VGAarbiter.c                                   |    5 
 hw/xfree86/common/xf86VGAarbiterPriv.h                               |    2 
 hw/xfree86/common/xf86VidMode.c                                      |    2 
 hw/xfree86/common/xf86Xinput.c                                       |   52 
 hw/xfree86/common/xf86pciBus.c                                       |    4 
 hw/xfree86/common/xf86sbusBus.c                                      |    6 
 hw/xfree86/common/xf86str.h                                          |    7 
 hw/xfree86/common/xf86xv.c                                           |  210 
 hw/xfree86/common/xf86xv.h                                           |    3 
 hw/xfree86/common/xf86xvpriv.h                                       |    6 
 hw/xfree86/ddc/ddc.c                                                 |   11 
 hw/xfree86/dixmods/extmod/dgaproc.h                                  |    1 
 hw/xfree86/dixmods/extmod/modinit.c                                  |    5 
 hw/xfree86/dixmods/extmod/modinit.h                                  |    4 
 hw/xfree86/doc/Makefile.am                                           |    4 
 hw/xfree86/doc/man/.gitignore                                        |    4 
 hw/xfree86/doc/man/Makefile.am                                       |   27 
 hw/xfree86/doc/man/Xorg.man                                          |  689 
 hw/xfree86/doc/man/Xorg.man.pre                                      |  689 
 hw/xfree86/doc/man/xorg.conf.d.man                                   |    1 
 hw/xfree86/doc/man/xorg.conf.man                                     | 2478 +++
 hw/xfree86/doc/man/xorg.conf.man.pre                                 | 2478 ---
 hw/xfree86/dri/dri.c                                                 |    9 
 hw/xfree86/dri2/dri2.c                                               |   13 
 hw/xfree86/exa/.gitignore                                            |    2 
 hw/xfree86/exa/Makefile.am                                           |   14 
 hw/xfree86/exa/exa.man.pre                                           |   42 
 hw/xfree86/exa/man/Makefile.am                                       |    2 
 hw/xfree86/exa/man/exa.man                                           |   42 
 hw/xfree86/fbdevhw/.gitignore                                        |    2 
 hw/xfree86/fbdevhw/Makefile.am                                       |   14 
 hw/xfree86/fbdevhw/fbdevhw.c                                         |   56 
 hw/xfree86/fbdevhw/fbdevhw.man.pre                                   |   22 
 hw/xfree86/fbdevhw/man/Makefile.am                                   |    2 
 hw/xfree86/fbdevhw/man/fbdevhw.man                                   |   22 
 hw/xfree86/int10/helper_exec.c                                       |    7 
 hw/xfree86/loader/loader.c                                           |   20 
 hw/xfree86/loader/loadmod.c                                          |   20 
 hw/xfree86/loader/os.c                                               |    2 
 hw/xfree86/loader/sdksyms.sh                                         |    7 
 hw/xfree86/modes/xf86Crtc.c                                          |   11 
 hw/xfree86/modes/xf86EdidModes.c                                     |    7 
 hw/xfree86/modes/xf86Modes.c                                         |   37 
 hw/xfree86/modes/xf86cvt.c                                           |   10 
 hw/xfree86/os-support/Makefile.am                                    |    2 
 hw/xfree86/os-support/linux/lnx_agp.c                                |    2 
 hw/xfree86/os-support/linux/lnx_video.c                              |    2 
 hw/xfree86/os-support/sco/Makefile.am                                |    5 
 hw/xfree86/os-support/sco/VTsw_sco.c                                 |  127 
 hw/xfree86/os-support/sco/sco_init.c                                 |  294 
 hw/xfree86/os-support/sco/sco_iop.c                                  |   90 
 hw/xfree86/os-support/sco/sco_video.c                                |  290 
 hw/xfree86/os-support/solaris/solaris-amd64.S                        |    2 
 hw/xfree86/os-support/solaris/solaris-ia32.S                         |    2 
 hw/xfree86/os-support/solaris/solaris-sparcv8plus.S                  |    2 
 hw/xfree86/os-support/solaris/sun_VTsw.c                             |    2 
 hw/xfree86/os-support/solaris/sun_agp.c                              |    2 
 hw/xfree86/os-support/solaris/sun_apm.c                              |    2 
 hw/xfree86/os-support/solaris/sun_bell.c                             |    2 
 hw/xfree86/os-support/solaris/sun_vid.c                              |    2 
 hw/xfree86/os-support/xf86_OSlib.h                                   |   31 
 hw/xfree86/parser/Flags.c                                            |   13 
 hw/xfree86/parser/Makefile.am                                        |    8 
 hw/xfree86/parser/Pointer.c                                          |   16 
 hw/xfree86/ramdac/Makefile.am                                        |    4 
 hw/xfree86/utils/Makefile.am                                         |    3 
 hw/xfree86/utils/cvt/.gitignore                                      |    2 
 hw/xfree86/utils/cvt/Makefile.am                                     |   15 
 hw/xfree86/utils/cvt/cvt.c                                           |   18 
 hw/xfree86/utils/cvt/cvt.man.pre                                     |   42 
 hw/xfree86/utils/gtf/.gitignore                                      |    2 
 hw/xfree86/utils/gtf/Makefile.am                                     |   19 
 hw/xfree86/utils/gtf/gtf.man.pre                                     |   45 
 hw/xfree86/utils/man/Makefile.am                                     |    2 
 hw/xfree86/utils/man/cvt.man                                         |   42 
 hw/xfree86/utils/man/gtf.man                                         |   45 
 hw/xfree86/vbe/vbeModes.c                                            |    4 
 hw/xfree86/x86emu/ops.c                                              |   63 
 hw/xfree86/xaa/Makefile.am                                           |   52 
 hw/xfree86/xaa/xaaBitBlt.c                                           |    6 
 hw/xfree86/xorgconf.cpp                                              |  610 
 hw/xnest/.gitignore                                                  |    2 
 hw/xnest/Makefile.am                                                 |   26 
 hw/xnest/Xnest.man.pre                                               |  428 
 hw/xnest/man/Makefile.am                                             |    2 
 hw/xnest/man/Xnest.man                                               |  428 
 hw/xquartz/GL/Makefile.am                                            |    2 
 hw/xquartz/Makefile.am                                               |    6 
 hw/xquartz/X11Application.h                                          |    1 
 hw/xquartz/X11Application.m                                          |    2 
 hw/xquartz/X11Controller.h                                           |    1 
 hw/xquartz/X11Controller.m                                           |    4 
 hw/xquartz/bundle/Info.plist.cpp                                     |    8 
 hw/xquartz/bundle/Resources/Dutch.lproj/locversion.plist             |    4 
 hw/xquartz/bundle/Resources/Dutch.lproj/main.nib/designable.nib      |  440 
 hw/xquartz/bundle/Resources/Dutch.lproj/main.nib/keyedobjects.nib    |binary
 hw/xquartz/bundle/Resources/English.lproj/main.nib/designable.nib    |  320 
 hw/xquartz/bundle/Resources/English.lproj/main.nib/keyedobjects.nib  |binary
 hw/xquartz/bundle/Resources/German.lproj/locversion.plist            |    4 
 hw/xquartz/bundle/Resources/German.lproj/main.nib/designable.nib     |  208 
 hw/xquartz/bundle/Resources/German.lproj/main.nib/keyedobjects.nib   |binary
 hw/xquartz/bundle/Resources/Italian.lproj/locversion.plist           |    4 
 hw/xquartz/bundle/Resources/Italian.lproj/main.nib/designable.nib    |  434 
 hw/xquartz/bundle/Resources/Italian.lproj/main.nib/keyedobjects.nib  |binary
 hw/xquartz/bundle/Resources/Japanese.lproj/locversion.plist          |    4 
 hw/xquartz/bundle/Resources/Japanese.lproj/main.nib/designable.nib   |  229 
 hw/xquartz/bundle/Resources/Japanese.lproj/main.nib/keyedobjects.nib |binary
 hw/xquartz/bundle/Resources/Spanish.lproj/locversion.plist           |    4 
 hw/xquartz/bundle/Resources/Spanish.lproj/main.nib/designable.nib    |  441 
 hw/xquartz/bundle/Resources/Spanish.lproj/main.nib/keyedobjects.nib  |binary
 hw/xquartz/bundle/Resources/ar.lproj/locversion.plist                |    4 
 hw/xquartz/bundle/Resources/ar.lproj/main.nib/designable.nib         |  441 
 hw/xquartz/bundle/Resources/ar.lproj/main.nib/keyedobjects.nib       |binary
 hw/xquartz/bundle/Resources/da.lproj/locversion.plist                |    4 
 hw/xquartz/bundle/Resources/da.lproj/main.nib/designable.nib         |  402 
 hw/xquartz/bundle/Resources/da.lproj/main.nib/keyedobjects.nib       |binary
 hw/xquartz/bundle/Resources/fi.lproj/locversion.plist                |    4 
 hw/xquartz/bundle/Resources/fi.lproj/main.nib/designable.nib         |  209 
 hw/xquartz/bundle/Resources/fi.lproj/main.nib/keyedobjects.nib       |binary
 hw/xquartz/bundle/Resources/ko.lproj/locversion.plist                |    4 
 hw/xquartz/bundle/Resources/ko.lproj/main.nib/designable.nib         |  411 
 hw/xquartz/bundle/Resources/ko.lproj/main.nib/keyedobjects.nib       |binary
 hw/xquartz/bundle/Resources/no.lproj/locversion.plist                |    4 
 hw/xquartz/bundle/Resources/no.lproj/main.nib/designable.nib         |  448 
 hw/xquartz/bundle/Resources/no.lproj/main.nib/keyedobjects.nib       |binary
 hw/xquartz/bundle/Resources/pl.lproj/locversion.plist                |    4 
 hw/xquartz/bundle/Resources/pl.lproj/main.nib/designable.nib         |  418 
 hw/xquartz/bundle/Resources/pl.lproj/main.nib/keyedobjects.nib       |binary
 hw/xquartz/bundle/Resources/pt.lproj/locversion.plist                |    4 
 hw/xquartz/bundle/Resources/pt.lproj/main.nib/designable.nib         |  459 
 hw/xquartz/bundle/Resources/pt.lproj/main.nib/keyedobjects.nib       |binary
 hw/xquartz/bundle/Resources/pt_PT.lproj/locversion.plist             |    4 
 hw/xquartz/bundle/Resources/pt_PT.lproj/main.nib/designable.nib      |  198 
 hw/xquartz/bundle/Resources/pt_PT.lproj/main.nib/keyedobjects.nib    |binary
 hw/xquartz/bundle/Resources/ru.lproj/locversion.plist                |    4 
 hw/xquartz/bundle/Resources/ru.lproj/main.nib/designable.nib         |  424 
 hw/xquartz/bundle/Resources/ru.lproj/main.nib/keyedobjects.nib       |binary
 hw/xquartz/bundle/Resources/sv.lproj/locversion.plist                |    4 
 hw/xquartz/bundle/Resources/sv.lproj/main.nib/designable.nib         |  421 
 hw/xquartz/bundle/Resources/sv.lproj/main.nib/keyedobjects.nib       |binary
 hw/xquartz/bundle/Resources/zh_CN.lproj/Localizable.strings          |binary
 hw/xquartz/bundle/Resources/zh_CN.lproj/locversion.plist             |    4 
 hw/xquartz/bundle/Resources/zh_CN.lproj/main.nib/designable.nib      | 7106 ++++------
 hw/xquartz/bundle/Resources/zh_CN.lproj/main.nib/keyedobjects.nib    |binary
 hw/xquartz/bundle/Resources/zh_TW.lproj/locversion.plist             |    4 
 hw/xquartz/bundle/Resources/zh_TW.lproj/main.nib/designable.nib      |  447 
 hw/xquartz/bundle/Resources/zh_TW.lproj/main.nib/keyedobjects.nib    |binary
 hw/xquartz/bundle/cpprules.in                                        |   22 
 hw/xquartz/darwinEvents.c                                            |    3 
 hw/xquartz/doc/Makefile.am                                           |   16 
 hw/xquartz/doc/Xquartz.man.pre                                       |  162 
 hw/xquartz/man/Makefile.am                                           |    2 
 hw/xquartz/man/Xquartz.man                                           |  162 
 hw/xquartz/quartz.c                                                  |   35 
 hw/xquartz/quartz.h                                                  |    1 
 hw/xquartz/quartzAudio.c                                             |  329 
 hw/xquartz/quartzAudio.h                                             |   37 
 hw/xquartz/quartzKeyboard.c                                          |    1 
 hw/xquartz/quartzStartup.c                                           |    4 
 hw/xwin/.gitignore                                                   |    3 
 hw/xwin/InitOutput.c                                                 |   13 
 hw/xwin/Makefile.am                                                  |   28 
 hw/xwin/XWin.man.pre                                                 |  346 
 hw/xwin/XWinrc.man.pre                                               |  253 
 hw/xwin/man/Makefile.am                                              |    3 
 hw/xwin/man/XWin.man                                                 |  397 
 hw/xwin/man/XWinrc.man                                               |  253 
 hw/xwin/win.h                                                        |   63 
 hw/xwin/winclipboardxevents.c                                        |    3 
 hw/xwin/winconfig.c                                                  |   77 
 hw/xwin/wincreatewnd.c                                               |   48 
 hw/xwin/windialogs.c                                                 |   18 
 hw/xwin/winerror.c                                                   |   24 
 hw/xwin/winkeybd.c                                                   |    8 
 hw/xwin/winkeybd.h                                                   |   16 
 hw/xwin/winkeyhook.c                                                 |    4 
 hw/xwin/winkeynames.h                                                |   13 
 hw/xwin/winlayouts.h                                                 |    8 
 hw/xwin/winmonitors.c                                                |   92 
 hw/xwin/winmonitors.h                                                |   14 
 hw/xwin/winnativegdi.c                                               |   37 
 hw/xwin/winpfbdd.c                                                   |  108 
 hw/xwin/winprocarg.c                                                 |  131 
 hw/xwin/winrandr.c                                                   |  302 
 hw/xwin/winscrinit.c                                                 |   66 
 hw/xwin/winshaddd.c                                                  |  164 
 hw/xwin/winshadddnl.c                                                |  152 
 hw/xwin/winshadgdi.c                                                 |  124 
 hw/xwin/winvalargs.c                                                 |    8 
 hw/xwin/winwindow.c                                                  |    1 
 hw/xwin/winwndproc.c                                                 |  307 
 include/Makefile.am                                                  |    1 
 include/Xprintf.h                                                    |   69 
 include/dix-config.h.in                                              |    3 
 include/dix.h                                                        |    7 
 include/eventstr.h                                                   |    2 
 include/exevents.h                                                   |    4 
 include/input.h                                                      |   26 
 include/inputstr.h                                                   |   82 
 include/inpututils.h                                                 |    8 
 include/os.h                                                         |   13 
 include/resource.h                                                   |    2 
 include/scrnintstr.h                                                 |    7 
 include/windowstr.h                                                  |    3 
 m4/ax_tls.m4                                                         |   74 
 manpages.am                                                          |   37 
 mi/micmap.c                                                          |    2 
 mi/micopy.c                                                          |    6 
 mi/miinitext.c                                                       |    2 
 mi/misprite.c                                                        |  122 
 miext/damage/Makefile.am                                             |    2 
 miext/damage/damage.c                                                |   20 
 miext/rootless/Makefile.am                                           |    1 
 miext/rootless/rootlessScreen.c                                      |    5 
 miext/shadow/Makefile.am                                             |    2 
 miext/sync/misync.c                                                  |    1 
 os/WaitFor.c                                                         |   12 
 os/access.c                                                          |   36 
 os/connection.c                                                      |    1 
 os/log.c                                                             |   12 
 os/osdep.h                                                           |    4 
 os/osinit.c                                                          |    5 
 os/utils.c                                                           |   16 
 os/xprintf.c                                                         |  172 
 randr/rrdispatch.c                                                   |    2 
 randr/rrmode.c                                                       |    2 
 randr/rrscreen.c                                                     |   12 
 render/animcur.c                                                     |   26 
 render/mipict.c                                                      |    3 
 render/render.c                                                      |   14 
 test/input.c                                                         |   32 
 test/xi2/protocol-eventconvert.c                                     |   12 
 test/xi2/protocol-xiselectevents.c                                   |   18 
 xfixes/cursor.c                                                      |    4 
 xfixes/xfixes.c                                                      |    2 
 xfixes/xfixesint.h                                                   |    2 
 xkb/XKBMisc.c                                                        |   15 
 xkb/ddxList.c                                                        |   43 
 xkb/ddxLoad.c                                                        |   99 
 xkb/xkb.c                                                            |   23 
 xkb/xkbUtils.c                                                       |    9 
 354 files changed, 22151 insertions(+), 16225 deletions(-)

New commits:
commit 07c173452fd1d12613a9dbefe9fbcb382f3199c8
Author: Cyril Brulebois <kibi@debian.org>
Date:   Sat Feb 19 15:30:45 2011 +0100

    Upload to experimental.

diff --git a/debian/changelog b/debian/changelog
index 9179d13..72f6374 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xorg-server (2:1.9.99.902-1) UNRELEASED; urgency=low
+xorg-server (2:1.9.99.902-1) experimental; urgency=low
 
   [ Christopher James Halse Rogers ]
   * New upstream release (1.10 rc1)
@@ -19,7 +19,7 @@ xorg-server (2:1.9.99.902-1) UNRELEASED; urgency=low
   * Update debian/copyright from upstream COPYING.
   * Add patch to work around out-of-tree issues: 16-oot-build.diff
 
- -- Christopher James Halse Rogers <raof@ubuntu.com>  Wed, 19 Jan 2011 10:28:16 +1100
+ -- Cyril Brulebois <kibi@debian.org>  Sat, 19 Feb 2011 15:29:54 +0100
 
 xorg-server (2:1.9.4-2) UNRELEASED; urgency=low
 

commit b22caafbb5bc7d9777fa1e675cdd9d97e72ab349
Author: Cyril Brulebois <kibi@debian.org>
Date:   Sat Feb 19 15:20:21 2011 +0100

    Add patch to work around out-of-tree issues: 16-oot-build.diff

diff --git a/debian/changelog b/debian/changelog
index ddcf964..9179d13 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,7 @@ xorg-server (2:1.9.99.902-1) UNRELEASED; urgency=low
   * Bump serverminver again, since ABI_XINPUT_VERSION was bumped from 12.0
     to 12.2.
   * Update debian/copyright from upstream COPYING.
+  * Add patch to work around out-of-tree issues: 16-oot-build.diff
 
  -- Christopher James Halse Rogers <raof@ubuntu.com>  Wed, 19 Jan 2011 10:28:16 +1100
 
diff --git a/debian/patches/16-oot-build.diff b/debian/patches/16-oot-build.diff
new file mode 100644
index 0000000..76985ee
--- /dev/null
+++ b/debian/patches/16-oot-build.diff
@@ -0,0 +1,31 @@
+Without abs_builddir or builddir, out-of-tree building seems to fail
+since symlinks aren't created. Using builddir didn't seem to work, while
+abs_builddir did the trick. Stick to that until further investigation.
+
+--- a/hw/dmx/doc/Makefile.am
++++ b/hw/dmx/doc/Makefile.am
+@@ -27,7 +27,7 @@ include $(top_srcdir)/doc/xml/xmlrules-n
+ 
+ if HAVE_DOXYGEN
+ 
+-DOXYGEN_SRC=doxygen.head doxygen.foot doxygen.css doxygen.conf
++DOXYGEN_SRC=$(abs_builddir)/doxygen.head $(abs_builddir)/doxygen.foot $(abs_builddir)/doxygen.css $(srcdir)/doxygen.conf
+ 
+ all-local: html/annotated.html
+ 
+@@ -254,12 +254,12 @@ EXTRA_DIST = \
+ 	html/usb-private_8h.html \
+ 	html/usb-private_8h_source.html
+ 
+-$(builddir)/doxygen.head:
++$(abs_builddir)/doxygen.head:
+ 	$(LN_S) $(srcdir)/doxygen.head $@
+ 
+-$(builddir)/doxygen.foot:
++$(abs_builddir)/doxygen.foot:
+ 	$(LN_S) $(srcdir)/doxygen.foot $@
+ 
+-$(builddir)doxygen.css:
++$(abs_builddir)/doxygen.css:
+ 	$(LN_S) $(srcdir)/doxygen.css $@
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 2e0f947..73f5db8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@
 07-xfree86-fix-build-with-xv-disabled.diff
 #13_debian_add_xkbpath_env_variable.diff
 15-nouveau.diff
+16-oot-build.diff

commit e36756749c3240510dc7d5555467a197f05e3661
Author: Cyril Brulebois <kibi@debian.org>
Date:   Sat Feb 19 11:36:11 2011 +0100

    Update debian/copyright from upstream COPYING.

diff --git a/debian/changelog b/debian/changelog
index 9f37d67..ddcf964 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,7 @@ xorg-server (2:1.9.99.902-1) UNRELEASED; urgency=low
   * bug script: Report libGL-related diversions.
   * Bump serverminver again, since ABI_XINPUT_VERSION was bumped from 12.0
     to 12.2.
+  * Update debian/copyright from upstream COPYING.
 
  -- Christopher James Halse Rogers <raof@ubuntu.com>  Wed, 19 Jan 2011 10:28:16 +1100
 
diff --git a/debian/copyright b/debian/copyright
index af52f60..cd9e80a 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,449 +1,1478 @@
-This package was downloaded from
-http://xorg.freedesktop.org/releases/individual/xserver/
+The following is the 'standard copyright' agreed upon by most contributors,
+and is currently the canonical license preferred by the X.Org Foundation.
+This is a slight variant of the common MIT license form published by the
+Open Source Initiative at http://www.opensource.org/licenses/mit-license.php
+
+Copyright holders of new code should use this license statement where
+possible, and insert their name to this list.  Please sort by surname
+for people, and by the full name for other entities (e.g.  Juliusz
+Chroboczek sorts before Intel Corporation sorts before Daniel Stone).
+
+Copyright © 2000-2001 Juliusz Chroboczek
+Copyright © 1998 Egbert Eich
+Copyright © 2006-2007 Intel Corporation
+Copyright © 2006 Nokia Corporation
+Copyright © 2006-2008 Peter Hutterer
+Copyright © 2006 Adam Jackson
+Copyright © 2009-2010 NVIDIA Corporation
+Copyright © 1987, 2003-2006, 2008-2010 Oracle and/or its affiliates.
+Copyright © 1999 Keith Packard
+Copyright © 2007-2009 Red Hat, Inc.
+Copyright © 2005-2008 Daniel Stone
+Copyright © 2006-2009 Simon Thum
+Copyright © 2006 Luc Verhaegen
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice (including the next
+paragraph) shall be included in all copies or substantial portions of the
+Software.
 
-                                  Licenses
-
-                            The X.Org Foundation
-
-                                 March 2004
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
 
-1.  Introduction
 
-The X.org Foundation X Window System distribution is a compilation of code
-and documentation from many sources.  This document is intended primarily as
-a guide to the licenses used in the distribution: you must check each file
-and/or package for precise redistribution terms. None-the-less, this summary
-may be useful to many users.  No software incorporating the XFree86 1.1
-license has been incorporated.
 
-This document is based on the compilation from XFree86.
 
-2.  XFree86 License
+The following licenses are 'legacy': usually MIT/X11 licenses with the name
+of the copyright holder(s) in the license statement, but also some BSD-like
+licenses.
 
-XFree86 code without an explicit copyright is covered by the following copy-
-right/license:
 
 Copyright (C) 1994-2003 The XFree86 Project, Inc.  All Rights Reserved.
+Copyright (C) Colin Harrison 2005-2008
 
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is fur-
-nished to do so, subject to the following conditions:
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do
+so, subject to the following conditions:
 
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
 
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FIT-
 NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-XFREE86 PROJECT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CON-
-NECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+XFREE86 PROJECT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 Except as contained in this notice, the name of the XFree86 Project shall not
-be used in advertising or otherwise to promote the sale, use or other deal-
-ings in this Software without prior written authorization from the XFree86
-Project.
+be used in advertising or otherwise to promote the sale, use or other dealings
+in this Software without prior written authorization from the XFree86 Project.
+
+
+Copyright 1997 by The XFree86 Project, Inc.
 
-3.  Other Licenses
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation, and that the name of the XFree86 Project, Inc.
+not be used in advertising or publicity pertaining to distribution of
+the software without specific, written prior permission.  The Xfree86
+Project, Inc. makes no representations about the suitability of this
+software for any purpose.  It is provided "as is" without express or
+implied warranty.
+
+THE XFREE86 PROJECT, INC. DISCLAIMS ALL WARRANTIES WITH REGARD
+TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS, IN NO EVENT SHALL OREST ZBOROWSKI OR DAVID WEXELBLAT BE LIABLE
+FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+
+Copyright 1985-1998, 2001  The Open Group
+Copyright 2002 Red Hat Inc., Durham, North Carolina.
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation.
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
 
-Portions of code are covered by the following licenses/copyrights.  See indi-
-vidual files for the copyright dates.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-3.1  X/MIT Copyrights
+Except as contained in this notice, the name of The Open Group shall not be
+used in advertising or otherwise to promote the sale, use or other dealings
+in this Software without prior written authorization from The Open Group.
 
-3.1.1  X Consortium
 
-Copyright (C) <date> X Consortium
+Copyright (c) 1987, 1989-1990, 1992-1995  X Consortium
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
 in the Software without restriction, including without limitation the rights
 to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is fur-
-nished to do so, subject to the following conditions:
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
 
 The above copyright notice and this permission notice shall be included in
 all copies or substantial portions of the Software.
 
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FIT-
-NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE X
-CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
-ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 Except as contained in this notice, the name of the X Consortium shall not be
 used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from the X Consortium.
 
-X Window System is a trademark of X Consortium, Inc.
-
-3.1.2  The Open Group
 
-Copyright <date>  The Open Group
+Copyright © 1999-2000 SuSE, Inc.
+Copyright © 2007 Red Hat, Inc.
 
 Permission to use, copy, modify, distribute, and sell this software and its
 documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that copyright
-notice and this permission notice appear in supporting documentation.
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation, and that the name of SuSE not be used in advertising or
+publicity pertaining to distribution of the software without specific,
+written prior permission.  SuSE makes no representations about the
+suitability of this software for any purpose.  It is provided "as is"
+without express or implied warranty.
+
+SuSE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL SuSE
+BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
+OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+
+Copyright 1987-1991, 1993 by Digital Equipment Corporation, Maynard, Massachusetts.
+Copyright 1991 Massachusetts Institute of Technology, Cambridge, Massachusetts.
+Copyright 1991, 1993 Olivetti Research Limited, Cambridge, England.
+
+                        All Rights Reserved
+
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in
+supporting documentation, and that the name of Digital not be
+used in advertising or publicity pertaining to distribution of the
+software without specific, written prior permission.
+
+DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
+ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
+DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
+ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
+ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+SOFTWARE.
+
+
+Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts,
+Copyright 1994 Quarterdeck Office Systems.
+
+                        All Rights Reserved
+
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in
+supporting documentation, and that the names of Digital and
+Quarterdeck not be used in advertising or publicity pertaining to
+distribution of the software without specific, written prior
+permission.
+
+DIGITAL AND QUARTERDECK DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
+SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS, IN NO EVENT SHALL DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT
+OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
+OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE
+OR PERFORMANCE OF THIS SOFTWARE.
+
+
+Copyright 1997 Digital Equipment Corporation.
+All rights reserved.
+
+This software is furnished under license and may be used and copied only in
+accordance with the following terms and conditions.  Subject to these
+conditions, you may download, copy, install, use, modify and distribute
+this software in source and/or binary form. No title or ownership is
+transferred hereby.
+
+1) Any source code used, modified or distributed must reproduce and retain
+   this copyright notice and list of conditions as they appear in the
+   source file.
+
+2) No right is granted to use any trade name, trademark, or logo of Digital
+   Equipment Corporation. Neither the "Digital Equipment Corporation"
+   name nor any trademark or logo of Digital Equipment Corporation may be
+   used to endorse or promote products derived from this software without
+   the prior written permission of Digital Equipment Corporation.
+
+3) This software is provided "AS-IS" and any express or implied warranties,
+   including but not limited to, any implied warranties of merchantability,
+   fitness for a particular purpose, or non-infringement are disclaimed.
+   In no event shall DIGITAL be liable for any damages whatsoever, and in
+   particular, DIGITAL shall not be liable for special, indirect,
+   consequential, or incidental damages or damages for lost profits, loss
+   of revenue or loss of use, whether such damages arise in contract,
+   negligence, tort, under statute, in equity, at law or otherwise, even
+   if advised of the possibility of such damage.
+
+
+Copyright (c) 1991, 1996-1997 Digital Equipment Corporation, Maynard, Massachusetts.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software.
 
 The above copyright notice and this permission notice shall be included in
 all copies or substantial portions of the Software.
 
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FIT-
-NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
-ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+DIGITAL EQUIPMENT CORPORATION BE LIABLE FOR ANY CLAIM, DAMAGES, INCLUDING,
+BUT NOT LIMITED TO CONSEQUENTIAL OR INCIDENTAL DAMAGES, OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
+IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
+Except as contained in this notice, the name of Digital Equipment Corporation
+shall not be used in advertising or otherwise to promote the sale, use or other
+dealings in this Software without prior written authorization from Digital
+Equipment Corporation.
 
-3.2  Berkeley-based copyrights:
 
-o
+SGI FREE SOFTWARE LICENSE B (Version 2.0, Sept. 18, 2008)
+Copyright (C) 1991-2000 Silicon Graphics, Inc. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice including the dates of first publication and
+either this permission notice or a reference to
+http://oss.sgi.com/projects/FreeB/
+shall be included in all copies or substantial portions of the Software.
 
-3.2.1  General
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+SILICON GRAPHICS, INC. BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
+OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+
+Copyright (c) 1994, 1995  Hewlett-Packard Company
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL HEWLETT-PACKARD COMPANY BE LIABLE FOR ANY CLAIM,
+DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
+THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice, the name of the Hewlett-Packard
+Company shall not be used in advertising or otherwise to promote the
+sale, use or other dealings in this Software without prior written
+authorization from the Hewlett-Packard Company.
+
+
+Copyright 1989 by Hewlett-Packard Company, Palo Alto, California.
+All Rights Reserved
+
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in
+supporting documentation, and that the name of Hewlett-Packard not be
+used in advertising or publicity pertaining to distribution of the
+software without specific, written prior permission.
+
+HEWLETT-PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
+ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
+HEWLETT-PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
+ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
+ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+SOFTWARE.
+
+
+Copyright 2001-2004 Red Hat Inc., Durham, North Carolina.
+Copyright (c) 2003 by the XFree86 Project, Inc.
+Copyright 2004-2005 Red Hat Inc., Raleigh, North Carolina.
+All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation on the rights to use, copy, modify, merge,
+publish, distribute, sublicense, and/or sell copies of the Software,
+and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice (including the
+next paragraph) shall be included in all copies or substantial
+portions of the Software.
 
-Redistribution and use in source and binary forms, with or without modifica-
-tion, are permitted provided that the following conditions are met:
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS
+BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+
+Copyright © 2008 Red Hat, Inc.
+Partly based on code Copyright © 2000 SuSE, Inc.
+
+Permission to use, copy, modify, distribute, and sell this software
+and its documentation for any purpose is hereby granted without
+fee, provided that the above copyright notice appear in all copies
+and that both that copyright notice and this permission notice
+appear in supporting documentation, and that the name of Red Hat
+not be used in advertising or publicity pertaining to distribution
+of the software without specific, written prior permission.  Red
+Hat makes no representations about the suitability of this software
+for any purpose.  It is provided "as is" without express or implied
+warranty.
+
+Red Hat DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN
+NO EVENT SHALL Red Hat BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
+OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-  1.  Redistributions of source code must retain the above copyright notice,
-      this list of conditions and the following disclaimer.
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation, and that the name of SuSE not be used in advertising or
+publicity pertaining to distribution of the software without specific,
+written prior permission.  SuSE makes no representations about the
+suitability of this software for any purpose.  It is provided "as is"
+without express or implied warranty.
+
+SuSE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL SuSE
+BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
+OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+
+Copyright © 2006  Red Hat, Inc.
+(C) Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
+All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sub license,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice (including the next
+paragraph) shall be included in all copies or substantial portions of the
+Software.
 
-  2.  Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.  IN NO EVENT SHALL
+RED HAT, INC, OR PRECISION INSIGHT AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT
+OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
+THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-  3.  The name of the author may not be used to endorse or promote products
-      derived from this software without specific prior written permission.
 
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
-WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MER-
-CHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPE-
-CIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTH-
-ERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
-OF THE POSSIBILITY OF SUCH DAMAGE.
+Copyright (c) 1995  X Consortium
+Copyright 2004 Red Hat Inc., Durham, North Carolina.
+All Rights Reserved.
 
-3.2.2  UCB/LBL
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation on the rights to use, copy, modify, merge,
+publish, distribute, sublicense, and/or sell copies of the Software,
+and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
 
-Copyright (c) 1993 The Regents of the University of California.  All rights
-reserved.
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
 


Reply to: