Merge branch 'ubuntu'

Conflicts:
	debian/changelog
	debian/patches/series

diff --combined debian/changelog
index ee955d4bc7648d9b1c5cf8e4f635ea2524d4b8a5,c6ef57c1bba68e686472c1926bb5705ce027938d..13e5a5e0c5a9f09522bcc4ac2155a2230868ff79
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,17 -1,11 +1,11 @@@
- xorg-server (2:1.11.4-0ubuntu10.4+ti1.0) precise; urgency=low
+ xorg-server (2:1.11.4-0ubuntu10.5) precise-security; urgency=low
  
-   * Rebased dri2video support on 0ubuntu10.3
-   * Add patches for driver to handle the transform
+   * SECURITY UPDATE: do not use input device names in logging format
+     strings (LP: #996250):
+     - debian/patches/509_log-format-fix.patch: backported upstream changes.
+     - CVE-2012-2118
  
-  -- Xavier Boudet <x-boudet@ti.com>  Tue, 10 Jul 2012 13:30:45 +0200
- 
- xorg-server (2:1.11.4-0ubuntu10.4) precise-proposed; urgency=low
- 
-   * Add 516-dix-dont-emulate-scroll-events-for-non-existing-axes.patch
-     from upstream 1.12.2. Fixes the server from entering in an infinite
-     loop in certain situations. (LP: #921236)
- 
-  -- Timo Aaltonen <tjaalton@ubuntu.com>  Thu, 05 Jul 2012 23:07:06 +0300
+  -- Steve Beattie <sbeattie@ubuntu.com>  Mon, 09 Jul 2012 15:24:55 -0700
  
  xorg-server (2:1.11.4-0ubuntu10.3) precise-proposed; urgency=low
  
@@@ -98,12 -92,6 +92,12 @@@ xorg-server (2:1.11.4-0ubuntu7) precise
  
   -- Ricardo Salveti de Araujo <ricardo.salveti@linaro.org>  Tue, 20 Mar 2012 02:09:18 -0300
  
 +xorg-server (2:1.11.4-0ubuntu6+ti1.0) precise; urgency=low
 +
 +  * Rebased dri2video support on 0ubuntu6
 +
 + -- Xavier Boudet <x-boudet@ti.com>  Thu, 15 Mar 2012 11:18:25 +0000
 +
  xorg-server (2:1.11.4-0ubuntu6) precise; urgency=low
  
    * debian/patches/500_pointer_barrier_thresholds.diff:
@@@ -139,12 -127,6 +133,12 @@@ xorg-server (2:1.11.4-0ubuntu5) precise
  
   -- Chase Douglas <chase.douglas@ubuntu.com>  Wed, 07 Mar 2012 15:36:20 -0800
  
 +xorg-server (2:1.11.4-0ubuntu4+ti1.0) precise; urgency=low
 +
 +  * Rebased dri2video support on 0ubuntu4 patch
 +
 + -- David Bercovitz <d-bercovitz@ti.com>  Fri, 02 Mar 2012 12:59:02 +0000
 +
  xorg-server (2:1.11.4-0ubuntu4) precise; urgency=low
  
    * debian/patches/500_pointer_barrier_thresholds.diff:
@@@ -154,12 -136,6 +148,12 @@@
  
   -- Christopher James Halse Rogers <raof@ubuntu.com>  Tue, 21 Feb 2012 17:04:41 +1100
  
 +xorg-server (2:1.11.4-0ubuntu3+ti1.0) precise; urgency=low
 +
 +  * Added dri2video support
 +
 + -- David Bercovitz <d-bercovitz@ti.com>  Wed, 22 Feb 2012 16:43:17 +0100
 +
  xorg-server (2:1.11.4-0ubuntu3) precise; urgency=low
  
    * Fix touch class memory corruption

diff --combined debian/patches/series
index 6d6a64cad121b1f19894756006e6de2292794051,833c0a32668e811ac4c14e0767939b65fcd4fbac..123855fbbc1b9e40c2afbddacf7b0a25e90f092d
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -1,6 -1,5 +1,6 @@@
  ## Patches with a number < 100 are applied in debian.
  ## Ubuntu patches start with 100.
 +0001-add-dri2video.patch
  001_fedora_extramodes.patch
  02_Add-libnettle-as-option-for-sha1.diff
  07-xfree86-fix-build-with-xv-disabled.diff
@@@ -38,6 -37,7 +38,7 @@@
  506_touchscreen_pointer_emulation_checks.patch
  507_touchscreen_fixes.patch
  508_device_off_release_buttons.patch
+ 509_log-format-fix.patch
  
  # Upstream patches
  510-dix-return-early-from-DisableDevice-if-the-device-is.patch
@@@ -46,8 -46,3 +47,7 @@@
  513-dix-disable-non-sprite-owners-first-when-disabling-p.patch
  514-Xi-drop-forced-unpairing-when-changing-the-hierarchy.patch
  515-dix-disable-all-devices-before-shutdown.patch
- 516-dix-dont-emulate-scroll-events-for-non-existing-axes.patch
 +
- #Rotation patches
++# Rotation patches
 +1001-xfree86-modes-Let-the-driver-handle-the-transform.patch
 +1002-xfree86-modes-Make-cursor-position-transform-a-helpe.patch