[xorg-x11-server/f15/master: 3/3] Merge branch 'master' into f15

[Adam Jackson]

commit f71c405a3fef04b4645a95d0581d50df398647ba
Merge: 188d999 2c6c5a5
Author: Adam Jackson <ajax at redhat.com>
Date:   Wed Mar 9 10:59:50 2011 -0500

    Merge branch 'master' into f15
    
    Conflicts:
    	xorg-x11-server.spec

 .gitignore                             |    1 +
 sources                                |    2 +-
 xorg-x11-server.spec                   |   50 +++++++++++++---------------
 xserver-1.4.99-pic-libxf86config.patch |   25 --------------
 xserver-1.6.99-default-modes.patch     |   26 ---------------
 xserver-1.6.99-right-of.patch          |   24 +++++++-------
 xserver-1.7.1-multilib.patch           |   55 --------------------------------
 7 files changed, 37 insertions(+), 146 deletions(-)
---
diff --cc xorg-x11-server.spec
index 9f46282,8f006c4..6ced687
--- a/xorg-x11-server.spec
+++ b/xorg-x11-server.spec
@@@ -77,11 -75,9 +75,8 @@@ Patch6016: xserver-1.6.1-nouveau.patc
  # ajax needs to upstream this
  Patch6027: xserver-1.6.0-displayfd.patch
  Patch6030: xserver-1.6.99-right-of.patch
- Patch6033: xserver-1.6.99-default-modes.patch
  #Patch6044: xserver-1.6.99-hush-prerelease-warning.patch
  
- Patch6049: xserver-1.7.1-multilib.patch
--
  # Use vesa for VirtualBox, since we don't ship vboxvideo and the
  # fallback to vesa when module is missing seems broken
  Patch6053: xserver-1.8-disable-vboxvideo.patch
@@@ -562,15 -545,16 +544,29 @@@ rm -rf $RPM_BUILD_ROO
  %{xserver_source_dir}
  
  %changelog
+ * Wed Mar 09 2011 Adam Jackson <ajax at redhat.com> 1.10.0-2
 -- Disable filesystem caps in paranoia until module loading is audited
 -
 -* Fri Feb 25 2011 Peter Hutterer <peter.hutterer at redhat.com> 1.9.99.902-1
 -- xserver 1.10.0
 -- server-1.9-99.901-xkb-repeat-issues.patch: drop, merged
 -- xserver-1.4.99-pic-libxf86config.patch: drop, see 60801ff8
 -- xserver-1.6.99-default-modes.patch: drop, see dc498b4
 -- xserver-1.7.1-multilib.patch: drop, see a16e282
 -- ABI bumps: xinput to 12.2, extension to 5.0, video to 10.0
++- Merge from F16:
++
++    * Wed Mar 09 2011 Adam Jackson <ajax at redhat.com> 1.10.0-2
++    - Disable filesystem caps in paranoia until module loading is audited
++
++    * Fri Feb 25 2011 Peter Hutterer <peter.hutterer at redhat.com> 1.9.99.902-1
++    - xserver 1.10.0
++    - server-1.9-99.901-xkb-repeat-issues.patch: drop, merged
++    - xserver-1.4.99-pic-libxf86config.patch: drop, see 60801ff8
++    - xserver-1.6.99-default-modes.patch: drop, see dc498b4
++    - xserver-1.7.1-multilib.patch: drop, see a16e282
++    - ABI bumps: xinput to 12.2, extension to 5.0, video to 10.0
++
 +* Fri Feb 25 2011 Peter Hutterer <peter.hutterer at redhat.com> 1.9.99.1-6.20101201
 +- xserver-1.9.99.1-xfree86-don-t-overwrite-option-list-32115.patch (#676827)
 +- xserver-1.9.99.1-xfree86-swap-the-order-to-be-merged-lists-in-xf86Col.patch
 +  (#676827)
 +
 +* Thu Feb 24 2011 Peter Hutterer <peter.hutterer at redhat.com> 1.9.99.1-5.20101201
 +- xserver-1.9.99.1-xkb-split-out-keymap-compilation.patch (#676827 prep work)
 +- xserver-1.9.99.1-xkb-if-the-keymap-failed-to-compile-load-the-default.patch
 +  (#676827 fix)
  
  * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.9.99.1-4.20101201
  - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild