diff -pruN 2:21.1.3-2/debian/changelog 2:21.1.3-2ubuntu2/debian/changelog
--- 2:21.1.3-2/debian/changelog	2022-04-01 18:07:43.000000000 +0000
+++ 2:21.1.3-2ubuntu2/debian/changelog	2022-04-01 18:07:44.000000000 +0000
@@ -1,3 +1,17 @@
+xorg-server (2:21.1.3-2ubuntu2) jammy; urgency=medium
+
+  * rules: Drop special case for i386, dmx is gone.
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Tue, 01 Mar 2022 16:33:35 +0200
+
+xorg-server (2:21.1.3-2ubuntu1) jammy; urgency=medium
+
+  * Merge from Debian.
+  * patches: Drop upstreamed patches.
+  * patches: Refreshed.
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Wed, 23 Feb 2022 17:20:53 +0200
+
 xorg-server (2:21.1.3-2) unstable; urgency=medium
 
   * present-Check-for-NULL-to-prevent-crash.patch: Fix a crash with
@@ -32,6 +46,13 @@ xorg-server (2:21.1.1-1) experimental; u
 
  -- Timo Aaltonen <tjaalton@debian.org>  Wed, 17 Nov 2021 16:31:46 +0200
 
+xorg-server (2:1.20.14-1ubuntu1) jammy; urgency=medium
+
+  * Merge from Debian.
+  * CVE patches dropped, upstream.
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Tue, 11 Jan 2022 16:51:48 +0200
+
 xorg-server (2:1.20.14-1) unstable; urgency=medium
 
   * New upstream release.
@@ -55,12 +76,50 @@ xorg-server (2:1.20.13-2) unstable; urge
 
  -- Timo Aaltonen <tjaalton@debian.org>  Sat, 27 Nov 2021 13:03:35 +0200
 
+xorg-server (2:1.20.13-1ubuntu2) jammy; urgency=medium
+
+  * SECURITY UPDATE: SProcRenderCompositeGlyphs out-of-bounds access
+    - debian/patches/CVE-2021-4008.patch: check lengths in render/render.c.
+    - CVE-2021-4008
+  * SECURITY UPDATE: SProcXFixesCreatePointerBarrier out-of-bounds access
+    - debian/patches/CVE-2021-4009.patch: use sizes in xfixes/cursor.c.
+    - CVE-2021-4009
+  * SECURITY UPDATE: SProcScreenSaverSuspend out-of-bounds access
+    - debian/patches/CVE-2021-4010.patch: fix logic in Xext/saver.c.
+    - CVE-2021-4010
+  * SECURITY UPDATE: SwapCreateRegister out-of-bounds access
+    - debian/patches/CVE-2021-4011.patch: fix length in record/record.c.
+    - CVE-2021-4011
+
+ -- Marc Deslauriers <marc.deslauriers@ubuntu.com>  Tue, 14 Dec 2021 11:11:36 -0500
+
+xorg-server (2:1.20.13-1ubuntu1) impish; urgency=medium
+
+  * Merge from Debian.
+  * modesetting-disable-reverse-prime-offload-udl.diff: Dropped,
+    upstream.
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Tue, 10 Aug 2021 12:32:48 +0300
+
 xorg-server (2:1.20.13-1) experimental; urgency=medium
 
   * New upstream release.
 
  -- Timo Aaltonen <tjaalton@debian.org>  Tue, 10 Aug 2021 12:27:00 +0300
 
+xorg-server (2:1.20.11-1ubuntu2) impish; urgency=medium
+
+  * modesetting-disable-reverse-prime-offload-udl.diff: Fix a regression
+    on displaylink devices after mesa update. (LP: #1931547)
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Tue, 06 Jul 2021 13:17:51 +0300
+
+xorg-server (2:1.20.11-1ubuntu1) hirsute; urgency=medium
+
+  * Merge from Debian.
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Tue, 13 Apr 2021 19:15:17 +0300
+
 xorg-server (2:1.20.11-1) unstable; urgency=medium
 
   * New upstream release.
@@ -69,6 +128,45 @@ xorg-server (2:1.20.11-1) unstable; urge
 
  -- Timo Aaltonen <tjaalton@debian.org>  Tue, 13 Apr 2021 19:07:31 +0300
 
+xorg-server (2:1.20.10-3ubuntu7) hirsute; urgency=medium
+
+  * 300-mi-sprite-SaveUnderCursor2.patch: Drop duplicate entries.
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Fri, 09 Apr 2021 13:30:53 +0300
+
+xorg-server (2:1.20.10-3ubuntu6) hirsute; urgency=medium
+
+  * 300-mi-sprite-SaveUnderCursor2.patch: Fix cursor bleeding issue
+    (LP: #1911479).
+    The new function, miDCSaveUnderCursor2, is required by Xilinx armsoc driver
+
+ -- Ethan Hsieh <ethan.hsieh@canonical.com>  Fri, 19 Mar 2021 12:55:11 +0000
+
+xorg-server (2:1.20.10-3ubuntu5) hirsute; urgency=medium
+
+  * Disable building xwayland.
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Fri, 26 Mar 2021 15:16:17 +0200
+
+xorg-server (2:1.20.10-3ubuntu4) hirsute; urgency=medium
+
+  * Disable building with lto, it's a 20+GB link not yet investigated.
+
+ -- Matthias Klose <doko@ubuntu.com>  Fri, 26 Mar 2021 13:37:55 +0100
+
+xorg-server (2:1.20.10-3ubuntu3) hirsute; urgency=medium
+
+  * Stop building the udeb on request.
+
+ -- Matthias Klose <doko@ubuntu.com>  Mon, 22 Feb 2021 11:54:42 +0100
+
+xorg-server (2:1.20.10-3ubuntu1) hirsute; urgency=medium
+
+  * Merge from Debian.
+  * patches: Drop upstreamed patches.
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Wed, 17 Feb 2021 12:30:29 +0200
+
 xorg-server (2:1.20.10-3) unstable; urgency=medium
 
   [ Julien Cristau ]
@@ -113,6 +211,35 @@ xorg-server (2:1.20.10-1) unstable; urge
 
  -- Timo Aaltonen <tjaalton@debian.org>  Wed, 02 Dec 2020 12:41:35 +0200
 
+xorg-server (2:1.20.9-2ubuntu3) hirsute; urgency=medium
+
+  * SECURITY UPDATE: out of bounds memory accesses on too short request
+    - debian/patches/CVE-2020-14360.patch: check SetMap request length
+      carefully in xkb/xkb.c.
+    - CVE-2020-14360
+  * SECURITY UPDATE: multiple heap overflows
+    - debian/patches/CVE-2020-25712.patch: add bounds checks in xkb/xkb.c.
+    - CVE-2020-25712
+
+ -- Marc Deslauriers <marc.deslauriers@ubuntu.com>  Wed, 02 Dec 2020 09:16:47 -0500
+
+xorg-server (2:1.20.9-2ubuntu2) hirsute; urgency=medium
+
+  * fix-gtf-detection-for-edid-14.diff: Fix a regression in detecting
+    modes of an EDID 1.4 monitor. (LP: #1897530)
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Mon, 30 Nov 2020 13:53:47 +0200
+
+xorg-server (2:1.20.9-2ubuntu1) groovy; urgency=medium
+
+  * Merge from Debian.
+    - xfree86-add-drm-modes-on-non-GTF-panels.patch: Dropped, upstream
+    - CVE patches dropped, upstream
+  * modesetting-do-not-stop-on-entervt.diff: Dropped in favor of two
+    upstream commits that got merged. (LP: #1897530)
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Wed, 07 Oct 2020 08:46:52 +0300
+
 xorg-server (2:1.20.9-2) unstable; urgency=medium
 
   * fix-pci-probing-segfault.diff: Dropped and revert three commits
@@ -133,6 +260,66 @@ xorg-server (2:1.20.9-1) unstable; urgen
 
  -- Timo Aaltonen <tjaalton@debian.org>  Mon, 31 Aug 2020 18:49:48 +0300
 
+xorg-server (2:1.20.8-2ubuntu6) groovy; urgency=medium
+
+  * SECURITY UPDATE: Out-Of-Bounds access in XkbSetNames function
+    - debian/patches/CVE-2020-14345.patch: correct bounds checking in
+      xkb/xkb.c.
+    - CVE-2020-14345
+
+ -- Marc Deslauriers <marc.deslauriers@ubuntu.com>  Fri, 04 Sep 2020 09:32:36 -0400
+
+xorg-server (2:1.20.8-2ubuntu5) groovy; urgency=medium
+
+  * SECURITY UPDATE: Integer underflow in the X input extension protocol
+    - debian/patches/CVE-2020-14346.patch: properly calculate length in
+      Xi/xichangehierarchy.c.
+    - CVE-2020-14346
+  * SECURITY UPDATE: server memory leak
+    - debian/patches/CVE-2020-14347.patch: initialize memory in
+      dix/pixmap.c.
+    - CVE-2020-14347
+  * SECURITY UPDATE: Integer Underflow Privilege Escalation
+    - debian/patches/CVE-2020-14361.patch: fix dataLeft calculation in
+      xkb/xkbSwap.c.
+    - CVE-2020-14361
+  * SECURITY UPDATE: Integer Underflow Privilege Escalation
+    - debian/patches/CVE-2020-14362.patch: properly calculate lengths in
+      record/record.c.
+    - CVE-2020-14362
+  * debian/control: add libffi-dev to Build-Depends to fix FTBFS.
+
+ -- Marc Deslauriers <marc.deslauriers@ubuntu.com>  Wed, 02 Sep 2020 09:55:00 -0400
+
+xorg-server (2:1.20.8-2ubuntu4) groovy; urgency=medium
+
+  * xfree86-add-drm-modes-on-non-GTF-panels.patch: Add GTF modes on
+    continuous-frequency monitors. (LP: #1883497)
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Wed, 24 Jun 2020 08:50:33 +0300
+
+xorg-server (2:1.20.8-2ubuntu3) groovy; urgency=medium
+
+  * modesetting-do-not-stop-on-entervt.diff: Don't crash if connectors
+    go missing. (LP: #1879893)
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Thu, 21 May 2020 11:22:15 +0300
+
+xorg-server (2:1.20.8-2ubuntu2) focal; urgency=medium
+
+  * randr-auto-bind-of-gpu-is-a-config-change.diff: Backport GPU hotplug
+    RandR fix. (LP: #1862753)
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Mon, 06 Apr 2020 12:39:29 +0300
+
+xorg-server (2:1.20.8-2ubuntu1) focal; urgency=medium
+
+  * Merge from Debian.
+  * modesetting-Disable-atomic-support-by-default.patch: Dropped,
+    upstream.
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Sun, 05 Apr 2020 07:19:23 +0300
+
 xorg-server (2:1.20.8-2) unstable; urgency=medium
 
   * rules: Exclude udeb/ from indep dh_missing. (Closes: #955399)
@@ -166,6 +353,19 @@ xorg-server (2:1.20.7-3) unstable; urgen
 
  -- Timo Aaltonen <tjaalton@debian.org>  Wed, 05 Feb 2020 18:27:36 +0200
 
+xorg-server (2:1.20.7-2ubuntu2) focal; urgency=medium
+
+  * No-change rebuild with fixed binutils on arm64.
+
+ -- Matthias Klose <doko@ubuntu.com>  Sat, 08 Feb 2020 11:21:37 +0000
+
+xorg-server (2:1.20.7-2ubuntu1) focal; urgency=medium
+
+  * Merge from debian.
+  * use-EGL_MESA_query_driver.diff: Dropped, upstream.
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Tue, 14 Jan 2020 15:43:13 +0200
+
 xorg-server (2:1.20.7-2) unstable; urgency=medium
 
   * add-EGL_QUERY_DRIVER-check.diff: Add a check for EGL_QUERY_DRIVER to
@@ -185,6 +385,23 @@ xorg-server (2:1.20.7-1) unstable; urgen
 
  -- Timo Aaltonen <tjaalton@debian.org>  Tue, 14 Jan 2020 10:50:19 +0200
 
+xorg-server (2:1.20.6-1ubuntu2) UNRELEASED; urgency=medium
+
+  * use-EGL_MESA_query_driver.diff: Bypass pci-id's when selecting the
+    DRI2 driver, allows loading 'iris' on Tiger Lake. Bump libepoxy
+    build-dep to 1.5.4, and bump d/serverminver.
+  * rules: Skip building xdmx-tools on i386.
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Wed, 04 Dec 2019 19:24:25 +0200
+
+xorg-server (2:1.20.6-1ubuntu1) focal; urgency=medium
+
+  * Merge from Debian.
+  * compiler.h-Do-not-include-sys-io.h-on-ARM-with-glibc.patch:
+    Dropped, upstream.
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Tue, 26 Nov 2019 11:25:06 +0200
+
 xorg-server (2:1.20.6-1) unstable; urgency=medium
 
   [ Sven Joachim ]
@@ -209,6 +426,73 @@ xorg-server (2:1.20.6-1) unstable; urgen
 
  -- Timo Aaltonen <tjaalton@debian.org>  Mon, 25 Nov 2019 11:49:09 +0200
 
+xorg-server (2:1.20.5+git20191008-0ubuntu1) eoan; urgency=medium
+
+  * Sync with current server-1.20-branch.
+    - includes Xwayland, abi fixes
+    - fix-abi-for-1.20.diff: Dropped, upstream
+  * rules: Fix ftbfs, remove the explicit build and build-indep targets.
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Tue, 08 Oct 2019 12:43:30 +0300
+
+xorg-server (2:1.20.5+git20190820-0ubuntu4) eoan; urgency=medium
+
+  * dri2-set-fallback-names-amd-intel.diff: Use a fallback driver for
+    AMD and Intel. (LP: #1845149)
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Tue, 24 Sep 2019 12:31:21 +0300
+
+xorg-server (2:1.20.5+git20190820-0ubuntu3) eoan; urgency=medium
+
+  * modesetting-Disable-atomic-support-by-default.patch: Disable atomic
+    modesetting support by default.
+  * compiler.h-Do-not-include-sys-io.h-on-ARM-with-glibc.patch: Fix
+    build on armhf.
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Thu, 05 Sep 2019 17:23:31 +0300
+
+xorg-server (2:1.20.5+git20190820-0ubuntu2) eoan; urgency=medium
+
+  * No-change upload with strops.h and sys/strops.h removed in glibc.
+
+ -- Matthias Klose <doko@ubuntu.com>  Thu, 05 Sep 2019 11:17:11 +0000
+
+xorg-server (2:1.20.5+git20190820-0ubuntu1) eoan; urgency=medium
+
+  * Sync with upstream server-1.20-branch to gain support for GLX vendor
+    selection. (LP: #1839555)
+  * sync-i965-pciids.diff, dix-ensure-work-queues-are-cleared-on-reset.diff:
+    Dropped, upstream.
+  * fix-abi-for-1.20.diff: Fix ABI after merging GLX vendor selection.
+  * dri2-use-va-gl-for-intel.diff: Use va_gl as VDPAU driver for Intel
+    GPUs.
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Tue, 20 Aug 2019 10:57:08 +0300
+
+xorg-server (2:1.20.4-1ubuntu3) disco; urgency=medium
+
+  * sync-i965-pciids.diff: Sync with mesa, add support for CML. (LP:
+    #1821863)
+  * dix-ensure-work-queues-are-cleared-on-reset.diff: Fix a race
+    condition that might crash the server.
+  * reset-transforms-in-closescreen.diff: Fix a crash when resuming a
+    scale transformation after closing the screen. (LP: #1820850)
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Wed, 03 Apr 2019 12:03:57 +0300
+
+xorg-server (2:1.20.4-1ubuntu2) disco; urgency=medium
+
+  * Rebuild against fixed dri.pc. (LP: #1818972)
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Fri, 08 Mar 2019 10:31:56 +0200
+
+xorg-server (2:1.20.4-1ubuntu1) disco; urgency=medium
+
+  * Merge from Debian.
+  * sync-i965-pciids.diff: Synced with mesa 19.0~.
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Wed, 06 Mar 2019 09:27:31 +0200
+
 xorg-server (2:1.20.4-1) unstable; urgency=medium
 
   [ Timo Aaltonen ]
@@ -223,6 +507,14 @@ xorg-server (2:1.20.4-1) unstable; urgen
 
  -- Andreas Boll <aboll@debian.org>  Tue, 05 Mar 2019 21:11:12 +0100
 
+xorg-server (2:1.20.3-1ubuntu1) disco; urgency=medium
+
+  * Merge from Debian.
+    - CVE-2018-14665.patch, dont-init-glamor-on-llvmpipe.diff,
+      prime-sync-refactor.diff: Dropped, upstream.
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Thu, 22 Nov 2018 15:47:34 +0200
+
 xorg-server (2:1.20.3-1) unstable; urgency=medium
 
   * New upstream release.
@@ -261,6 +553,30 @@ xorg-server (2:1.20.1-4) unstable; urgen
 
  -- Timo Aaltonen <tjaalton@debian.org>  Wed, 26 Sep 2018 13:20:47 +0300
 
+xorg-server (2:1.20.1-3ubuntu2.1) cosmic-security; urgency=medium
+
+  * SECURITY UPDATE: Privilege escalation and file overwrite
+    - debian/patches/CVE-2018-14665.patch: disable -logfile and -modulepath
+      when running with elevated privileges in
+      hw/xfree86/common/xf86Init.c.
+    - CVE-2018-14665
+
+ -- Marc Deslauriers <marc.deslauriers@ubuntu.com>  Thu, 25 Oct 2018 10:53:34 -0400
+
+xorg-server (2:1.20.1-3ubuntu2) cosmic; urgency=medium
+
+  * dont-init-glamor-on-llvmpipe.diff: Glamor shouldn't be used on
+    llvmpipe, as it might end up crashing the server on a racy bootup.
+    (LP: #1792932)
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Tue, 02 Oct 2018 21:40:03 +0300
+
+xorg-server (2:1.20.1-3ubuntu1) cosmic; urgency=medium
+
+  * Merge from Debian.
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Fri, 21 Sep 2018 11:22:03 +0300
+
 xorg-server (2:1.20.1-3) unstable; urgency=medium
 
   * xvfb-run*: Update default resolution and bitdepth to match upstream
@@ -269,6 +585,12 @@ xorg-server (2:1.20.1-3) unstable; urgen
 
  -- Timo Aaltonen <tjaalton@debian.org>  Thu, 20 Sep 2018 11:26:11 +0300
 
+xorg-server (2:1.20.1-2ubuntu1) cosmic; urgency=medium
+
+  * Merge from Debian.
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Wed, 19 Sep 2018 12:11:14 +0300
+
 xorg-server (2:1.20.1-2) unstable; urgency=medium
 
   * control, rules: Use libunwind for backtracing.
@@ -277,6 +599,20 @@ xorg-server (2:1.20.1-2) unstable; urgen
 
  -- Timo Aaltonen <tjaalton@debian.org>  Tue, 18 Sep 2018 17:27:28 +0300
 
+xorg-server (2:1.20.1-1ubuntu2) cosmic; urgency=medium
+
+  * prime-sync-refactor.diff: Fix crash on modesetting+amdgpu hybrid.
+    (LP: #1789913)
+  * sync-i965-pciids.diff: Update intel pci-id's. (LP: #1789924)
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Wed, 05 Sep 2018 14:13:19 +0300
+
+xorg-server (2:1.20.1-1ubuntu1) cosmic; urgency=medium
+
+  * Merge from Debian.
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Wed, 22 Aug 2018 11:01:28 +0300
+
 xorg-server (2:1.20.1-1) unstable; urgency=medium
 
   [ Julien Cristau ]
@@ -300,6 +636,12 @@ xorg-server (2:1.20.1-1) unstable; urgen
 
  -- Andreas Boll <aboll@debian.org>  Fri, 17 Aug 2018 22:05:00 +0200
 
+xorg-server (2:1.20.0-3ubuntu1) cosmic; urgency=medium
+
+  * Merge from Debian.
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Mon, 02 Jul 2018 11:36:12 +0300
+
 xorg-server (2:1.20.0-3) unstable; urgency=medium
 
   [ Timo Aaltonen ]
@@ -311,6 +653,14 @@ xorg-server (2:1.20.0-3) unstable; urgen
 
  -- Timo Aaltonen <tjaalton@debian.org>  Sun, 01 Jul 2018 20:07:24 +0300
 
+xorg-server (2:1.20.0-2ubuntu1) cosmic; urgency=medium
+
+  * Merge from Debian unstable.
+    - patches: Refreshed, drop upstream patches
+  * Drop Xmir.
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Mon, 21 May 2018 15:44:37 +0300
+
 xorg-server (2:1.20.0-2) unstable; urgency=medium
 
   * Bump some minimum (build) dependencies.
@@ -339,6 +689,40 @@ xorg-server (2:1.19.99.901-1) experiment
 
  -- Timo Aaltonen <tjaalton@debian.org>  Fri, 23 Mar 2018 18:18:38 +0200
 
+xorg-server (2:1.19.6-1ubuntu4) bionic; urgency=medium
+
+  * debian/patches/fix-default-permissions.patch: fix default permissions
+    when creating the log directory. (LP: #1735929)
+
+ -- Marc Deslauriers <marc.deslauriers@ubuntu.com>  Fri, 13 Apr 2018 11:31:45 -0400
+
+xorg-server (2:1.19.6-1ubuntu3) bionic; urgency=medium
+
+  * dri2-Sync-i965_pci_ids.h-from-Mesa.patch: Update i965_pci_ids.h to
+    include latest CFL. (LP: #1753954)
+  * server-1.19.diff: Pull fixes from upstream stable branch.
+    (LP: #1748926)
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Tue, 13 Mar 2018 11:59:01 +0200
+
+xorg-server (2:1.19.6-1ubuntu2) bionic; urgency=medium
+
+  * improve-outputclass.diff: Backport commits from upstream to improve
+    OutputClass to support options and overriding primary GPU.
+  * 191-Xorg-add-an-extra-module-path.patch, rules.flags: Drop adding
+    extra-modules dir, not necessary anymore with outputclass additions.
+  * 105_nvidia_autodetect.patch: Dropped, obsolete now.
+  * 188_default_primary_to_first_busid.patch: Dropped, obsolete now.
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Thu, 22 Feb 2018 15:45:57 +0200
+
+xorg-server (2:1.19.6-1ubuntu1) bionic; urgency=medium
+
+  * Merge with Debian.
+  * XShmGetImage_fix_censoring.patch: Dropped, upstream.
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Fri, 26 Jan 2018 17:27:50 +0200
+
 xorg-server (2:1.19.6-1) unstable; urgency=medium
 
   [ Emilio Pozuelo Monfort ]
@@ -378,6 +762,37 @@ xorg-server (2:1.19.5-1) unstable; urgen
 
  -- Julien Cristau <jcristau@debian.org>  Fri, 13 Oct 2017 11:28:05 +0200
 
+xorg-server (2:1.19.5-0ubuntu2) artful; urgency=medium
+
+  * Backport upstream patch to fix cropping in XShmGetImage (LP: #1723732).
+
+ -- Dmitry Shachnev <mitya57@ubuntu.com>  Sun, 15 Oct 2017 14:59:53 +0300
+
+xorg-server (2:1.19.5-0ubuntu1) artful; urgency=medium
+
+  * New upstream release
+    - Fix CVE's:
+      CVE-2017-12176, CVE-2017-12177, CVE-2017-12178, CVE-2017-12179,
+      CVE-2017-12180, CVE-2017-12181, CVE-2017-12182, CVE-2017-12183,
+      CVE-2017-12184, CVE-2017-12185, CVE-2017-12186, CVE-2017-12187
+    - Revert a commit that regressed PRIME sync
+    - os: Make sure big requests have sufficient length.
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Fri, 13 Oct 2017 08:46:24 +0300
+
+xorg-server (2:1.19.4-1ubuntu2) artful; urgency=medium
+
+  * xvfb-run: Keep redirecting stderr to stdout, autopkgtests need it.
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Wed, 11 Oct 2017 11:12:57 +0300
+
+xorg-server (2:1.19.4-1ubuntu1) artful; urgency=medium
+
+  * Merge from Debian.
+    - new bugfix release
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Tue, 10 Oct 2017 11:13:48 +0300
+
 xorg-server (2:1.19.4-1) unstable; urgency=medium
 
   [ Sven Joachim ]
@@ -411,6 +826,102 @@ xorg-server (2:1.19.3-2) unstable; urgen
 
  -- Julien Cristau <jcristau@debian.org>  Fri, 07 Jul 2017 07:31:11 +0200
 
+xorg-server (2:1.19.3-1ubuntu7) artful; urgency=medium
+
+  * Sync from xserver-1.19-branch, drop upstreamed patches:
+    CVE-2017-10971-{1,2,3}.patch,
+    CVE-2017-10972.patch,
+    add-cfl-cnl-ids.diff,
+    sync-i965-ids.diff,
+    xwayland-pointer-confine.diff
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Tue, 03 Oct 2017 00:24:32 +0300
+
+xorg-server (2:1.19.3-1ubuntu6) artful; urgency=medium
+
+  * xwayland-add-grab-protocol-support.diff: Dropped, causes issues with
+    kvm. (LP: #1713981)
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Wed, 30 Aug 2017 14:42:05 +0300
+
+xorg-server (2:1.19.3-1ubuntu5) artful; urgency=medium
+
+  * add-cfl-cnl-ids.diff: Add Coffee Lake and Cannonlake pci-ids.
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Mon, 28 Aug 2017 18:44:04 +0300
+
+xorg-server (2:1.19.3-1ubuntu4) artful; urgency=medium
+
+  * xwayland-tablet.diff: Add support for Wacom tablets in xwayland.
+    (LP: #1712571)
+  * xwayland-pointer-confine.diff: Add pointer locking/confinement fixes
+    to xwayland.
+  * xwayland-add-grab-protocol-support.diff: Add support for keyboard
+    grabbing to xwayland. Bump wayland-protocols build-dependency to 1.9.
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Fri, 25 Aug 2017 08:32:17 +0300
+
+xorg-server (2:1.19.3-1ubuntu3) artful; urgency=medium
+
+  * SECURITY UPDATE: DoS and possible code execution in endianness
+    conversion of X Events
+    - debian/patches/CVE-2017-10971-1.patch: do not try to swap
+      GenericEvent in Xi/sendexev.c.
+    - debian/patches/CVE-2017-10971-2.patch: verify all events in
+      ProcXSendExtensionEvent in Xi/sendexev.c.
+    - debian/patches/CVE-2017-10971-3.patch: disallow GenericEvent in
+      SendEvent request in dix/events.c, dix/swapreq.c.
+    - CVE-2017-10971
+  * SECURITY UPDATE: information leak in XEvent handling
+    - debian/patches/CVE-2017-10972.patch: zero target buffer in
+      SProcXSendExtensionEvent in Xi/sendexev.c.
+    - CVE-2017-10972
+
+ -- Marc Deslauriers <marc.deslauriers@ubuntu.com>  Mon, 17 Jul 2017 09:34:04 -0400
+
+xorg-server (2:1.19.3-1ubuntu2) artful; urgency=medium
+
+  * sync-i965-ids.diff: Sync i965 pci-id's from mesa.
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Wed, 10 May 2017 13:03:42 +0300
+
+xorg-server (2:1.19.3-1ubuntu1) zesty; urgency=medium
+
+  [ Timo Aaltonen ]
+  * Merge from Debian experimental. (LP: #1671799)
+    - Patches refreshed
+    - randr-adjust-masters-last-set-time.diff,
+      modesetting-unifdef-slave-support.diff: Dropped, upstream
+    - config-add-no-removal.patch, xf86-inactive-gpuscreen.patch,
+      fix-detach-gpu.patch: Dropped, more or less obsolete
+  * 190_cache-xkbcomp_output_for_fast_start_up.patch: Cleaned up from
+    the package as it wasn't used.
+  * 111_armel-drv-fallbacks.patch: Dropped, we don't ship these drivers
+    anymore.
+  * rules: Drop the workaround that adds lt_cv_prog_compiler_static_works=no
+    to confflags.
+  * 232-xf86compatoutput-valgrind.patch: This was added upstream
+    already, no need to carry a duplicate check.
+  * 208_switch_on_release.diff: Dropped, doesn't work with 1.19.
+  * 228_autobind_gpu.patch: Update from Fedora, fixes nvidia.
+  * disable-rotation-transform-gpuscreens.patch: Dropped, nvidia
+    supports rotation now.
+  * 122_xext_fix_card32_overflow_in_xauth.patch: Dropped, upstream
+    review found issues and it never got applied.
+  * xfree86-no-xv-for-gpuscreens.patch: Drop bogus buglink.
+  * 227_null_ptr_midispcur.patch: Dropped, upstream didn't accept it.
+  * randr-do-not-check-the-screen-size.diff: Dropped, can't reproduce
+    #1586260 anymore without the patch.
+
+  [ Robert Ancell ]
+  * debian/patches/xmir.patch:
+    - Refresh
+    - Fix warnings when built against lp:mir/0.25
+    - Support both Mir 0.24, 0.25 and 0.26 client APIs
+    - Fix crashing on arm64 (LP: #1642297)
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Mon, 27 Mar 2017 19:43:08 +0300
+
 xorg-server (2:1.19.3-1) unstable; urgency=medium
 
   * New upstream release.
@@ -537,6 +1048,80 @@ xorg-server (2:1.18.4-2) unstable; urgen
 
  -- Timo Aaltonen <tjaalton@debian.org>  Tue, 06 Sep 2016 16:09:04 +0300
 
+xorg-server (2:1.18.4-1ubuntu9) zesty; urgency=medium
+
+  * control: Depend on libxfont1-dev.
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Thu, 15 Dec 2016 13:44:15 +0200
+
+xorg-server (2:1.18.4-1ubuntu8) zesty; urgency=medium
+
+  * xvfb-run: Bump default bitdepth to 16 so that GLX works.
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Thu, 15 Dec 2016 12:33:01 +0200
+
+xorg-server (2:1.18.4-1ubuntu7) zesty; urgency=medium
+
+  * modesetting-unifdef-slave-support.diff: Fix modesetting slave output
+    names. (LP: #1636397)
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Tue, 25 Oct 2016 10:48:45 +0300
+
+xorg-server (2:1.18.4-1ubuntu6) yakkety; urgency=medium
+
+  * debian/patches/xmir.patch:
+    - Don't call epoxy every frame (LP: #1617932)
+    - Ignore 'unknown 11 event' (LP: #1617925)
+    - Improve root window resizing code
+    - Make randr mode names simpler
+
+ -- Robert Ancell <robert.ancell@canonical.com>  Wed, 07 Sep 2016 15:50:30 +1200
+
+xorg-server (2:1.18.4-1ubuntu5) yakkety; urgency=medium
+
+  * drm_device_keep_trying.patch: Dropped, shouldn't be needed anymore, and
+    causes issues on non-x86 archs. (LP: #1581076)
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Fri, 02 Sep 2016 13:59:52 +0300
+
+xorg-server (2:1.18.4-1ubuntu4) yakkety; urgency=medium
+
+  * debian/patches/xmir.patch:
+    - Fix button/menu focus failures (LP: #1590553)
+    - Implement XWMHints properly
+    - Add smooth touchpad scroll support (LP: #1603917)
+    - Fix key repeat order
+    - Remove links to Unity8 bugs that are now fixed.
+
+ -- Robert Ancell <robert.ancell@canonical.com>  Thu, 28 Jul 2016 14:31:22 +1200
+
+xorg-server (2:1.18.4-1ubuntu3) yakkety; urgency=medium
+
+  * debian/patches/xmir.patch:
+    - Fix bottom/right edge corruption. (LP: #1510849)
+    - Fix key repeat. (LP: #1591356)
+    - Don't delete outputs without replacing them. (LP: #1504422) (LP: #1602561)
+    - Xmir -debug: Log WM types by name and number.
+    - Implement fake GLX frame notification/timing.
+    - Improve focus tracking.
+
+ -- Robert Ancell <robert.ancell@canonical.com>  Thu, 21 Jul 2016 11:42:03 +0200
+
+xorg-server (2:1.18.4-1ubuntu2) yakkety; urgency=medium
+
+  * debian/control, debian/rules:
+    - Build xmir for arm64 (LP: #1604851).
+
+ -- Łukasz 'sil2100' Zemczak <lukasz.zemczak@ubuntu.com>  Wed, 20 Jul 2016 18:55:21 +0200
+
+xorg-server (2:1.18.4-1ubuntu1) yakkety; urgency=medium
+
+  * Merge from debian.
+  * glamor-disable-logic-ops-when-doing-compositing.diff: Dropped,
+    upstream.
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Wed, 20 Jul 2016 08:22:32 +0300
+
 xorg-server (2:1.18.4-1) unstable; urgency=medium
 
   * New upstream stable release.
@@ -556,6 +1141,65 @@ xorg-server (2:1.18.3-2) unstable; urgen
 
  -- Timo Aaltonen <tjaalton@debian.org>  Tue, 19 Jul 2016 05:59:24 +0300
 
+xorg-server (2:1.18.3-1ubuntu7) yakkety; urgency=medium
+
+  * glamor-disable-logic-ops-when-doing-compositing.diff: Fix
+    libreoffice with glamor. (LP: #1575000)
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Tue, 05 Jul 2016 02:08:01 +0300
+
+xorg-server (2:1.18.3-1ubuntu6) yakkety; urgency=medium
+
+  * debian/patches/xmir.patch:
+    - Add focus/unfocus event passing (LP: #1582471)
+
+ -- Robert Ancell <robert.ancell@canonical.com>  Wed, 01 Jun 2016 11:07:46 +1200
+
+xorg-server (2:1.18.3-1ubuntu5) yakkety; urgency=medium
+
+  * randr-adjust-masters-last-set-time.diff,
+    randr-do-not-check-the-screen-size.diff:
+    Fix issues changing display mode on prime setups. (LP: #1586260)
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Fri, 27 May 2016 11:51:56 +0300
+
+xorg-server (2:1.18.3-1ubuntu4) yakkety; urgency=medium
+
+  * debian/patches/xmir.patch:
+    - Fix recently added keymap code
+
+ -- Robert Ancell <robert.ancell@canonical.com>  Wed, 04 May 2016 09:11:32 +1200
+
+xorg-server (2:1.18.3-1ubuntu3) yakkety; urgency=medium
+
+  * debian/patches/xmir.patch:
+    - Pass keymap from Mir to Xkb (LP: #1566487)
+  * debian/patches/xmir-fixes.diff:
+    - Merged into xmir.patch
+
+ -- Robert Ancell <robert.ancell@canonical.com>  Fri, 29 Apr 2016 14:36:49 +0200
+
+xorg-server (2:1.18.3-1ubuntu2) xenial; urgency=medium
+
+  * Disable 190_cache-xkbcomp_output_for_fast_start_up.patch for now,
+    compiling the keymap fails in current xenial for some reason.
+    (LP: #1566878)
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Thu, 07 Apr 2016 12:10:12 +0300
+
+xorg-server (2:1.18.3-1ubuntu1) xenial; urgency=medium
+
+  * Merge from Debian.
+  * fix-xineramaqueryscreens-for-reverse-prime.diff,
+    glamor-factor-out-glamor-set-color.diff,
+    glamor-source-pictures-are-always-depth-32.diff:
+    Deleted, upstream.
+  * xmir-fixes.diff: Updated for glamor changes.
+  * 105_nvidia_autodetect.patch: Modified and renamed since it doesn't
+    need to handle fglrx anymore.
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Sat, 12 Mar 2016 08:59:43 +0200
+
 xorg-server (2:1.18.3-1) unstable; urgency=medium
 
   * New upstream release.
@@ -589,6 +1233,35 @@ xorg-server (2:1.18.2-1) unstable; urgen
 
  -- Timo Aaltonen <tjaalton@debian.org>  Sat, 12 Mar 2016 08:49:55 +0200
 
+xorg-server (2:1.18.1-1ubuntu4) xenial; urgency=medium
+
+  * glamor: Fix font rendering issue. (LP: #1555960)
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Fri, 11 Mar 2016 09:36:40 +0200
+
+xorg-server (2:1.18.1-1ubuntu3) xenial; urgency=medium
+
+  * Merge xmir changes from 2:1.17.3-2ubuntu4.
+  * fix-xineramaqueryscreens-for-reverse-prime.diff: Fix unity-greeter
+    crash with nvidia prime.
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Thu, 25 Feb 2016 11:49:23 +0200
+
+xorg-server (2:1.18.1-1ubuntu2) xenial; urgency=medium
+
+  * Merge xmir changes from 2:1.17.3-2ubuntu3.
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Tue, 16 Feb 2016 10:02:03 +0200
+
+xorg-server (2:1.18.1-1ubuntu1) xenial; urgency=medium
+
+  * Merge from Debian experimental
+  * patches: Refreshed, dropped what's upstream.
+  * xmir-fixes.diff: Port xmir to 1.18.
+  * fix-ftbfs-ppc64el.patch: Dropped, not needed anymore.
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Tue, 08 Dec 2015 19:47:06 +0200
+
 xorg-server (2:1.18.1-1) unstable; urgency=medium
 
   * New upstream release.
@@ -636,23 +1309,61 @@ xorg-server (2:1.17.99.902-1) experiment
 
  -- Julien Cristau <jcristau@debian.org>  Thu, 29 Oct 2015 09:58:55 +0000
 
-xorg-server (2:1.17.3-2) unstable; urgency=medium
+xorg-server (2:1.17.3-2ubuntu4) xenial; urgency=medium
 
-  * Finalize xserver-xorg-core.NEWS.  Thanks, Michael Biebl!
+  * debian/patches/xmir.patch:
+    - Revert swapinterval 0 change
 
- -- Julien Cristau <jcristau@debian.org>  Tue, 27 Oct 2015 22:55:25 +0000
+ -- Robert Ancell <robert.ancell@canonical.com>  Tue, 16 Feb 2016 09:35:17 -0800
 
-xorg-server (2:1.17.3-1) unstable; urgency=medium
+xorg-server (2:1.17.3-2ubuntu3) xenial; urgency=medium
 
-  [ Julien Cristau ]
-  * New upstream release
-    - mi: fix typo in warning about overflowing queue (closes: #726041)
-  * Refresh 02_kbsd-input-devd.diff and 03_static-nettle.diff.
-  * Replace xorg-wrapper-envp.diff with a cherry-pick from master.
-  * New patch xext-fix-udeb-build.diff to fix build regression in 1.17.3.
-  * Add NEWS file for xserver-xorg-core with info about the -legacy split
-    (closes: #801487).
-  * Recommend libpam-systemd (closes:  #802544, #802618, #802327, #802566,
+  * debian/patches/xmir.patch:
+    - Add ability to set title for XMir (LP: #1542028)
+    - Use swapinterval 0 (LP: #1502738)
+    - Add sufficient traversal hacks for Matchbox
+
+ -- Robert Ancell <robert.ancell@canonical.com>  Mon, 15 Feb 2016 17:32:21 -0800
+
+xorg-server (2:1.17.3-2ubuntu2) xenial; urgency=medium
+
+  * Disable mir on s390x.
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Wed, 25 Nov 2015 16:11:38 +0000
+
+xorg-server (2:1.17.3-2ubuntu1) xenial; urgency=medium
+
+  [ Robert Ancell ]
+  * debian/patches/xmir.patch:
+    - Update to latest version
+  * debian/patches/xmir-rootless.patch:
+    - Merged into xmir.patch
+
+  [ Timo Aaltonen ]
+  * Merge from Debian. (LP: #1511649)
+  * glamor-make-current-in-prepare-paths.diff,
+    linux-Do-not-call-FatalError-from-xf86CloseConsole.patch:
+    Dropped, upstream.
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Tue, 10 Nov 2015 18:20:55 +0200
+
+xorg-server (2:1.17.3-2) unstable; urgency=medium
+
+  * Finalize xserver-xorg-core.NEWS.  Thanks, Michael Biebl!
+
+ -- Julien Cristau <jcristau@debian.org>  Tue, 27 Oct 2015 22:55:25 +0000
+
+xorg-server (2:1.17.3-1) unstable; urgency=medium
+
+  [ Julien Cristau ]
+  * New upstream release
+    - mi: fix typo in warning about overflowing queue (closes: #726041)
+  * Refresh 02_kbsd-input-devd.diff and 03_static-nettle.diff.
+  * Replace xorg-wrapper-envp.diff with a cherry-pick from master.
+  * New patch xext-fix-udeb-build.diff to fix build regression in 1.17.3.
+  * Add NEWS file for xserver-xorg-core with info about the -legacy split
+    (closes: #801487).
+  * Recommend libpam-systemd (closes:  #802544, #802618, #802327, #802566,
     probably others)
 
   [ Andreas Boll ]
@@ -710,6 +1421,90 @@ xorg-server (2:1.17.2-1.1) unstable; urg
 
  -- Samuel Thibault <sthibault@debian.org>  Tue, 11 Aug 2015 10:45:35 +0200
 
+xorg-server (2:1.17.2-1ubuntu10) xenial; urgency=medium
+
+  * debian/patches:
+    - linux-Do-not-call-FatalError-from-xf86CloseConsole.patch: Fix crashers
+      often occuring on shutdown (LP: #1237904) 
+    - xmir.patch: Fix typo causing FTBFS
+
+ -- Tim Lunn <tim@feathertop.org>  Mon, 26 Oct 2015 12:24:30 +1100
+
+xorg-server (2:1.17.2-1ubuntu9) wily; urgency=medium
+
+  * debian/patches/xmir.patch:
+    - Fix FTBFS due to change in Mir headers
+
+ -- Robert Ancell <robert.ancell@canonical.com>  Wed, 30 Sep 2015 16:15:39 +1300
+
+xorg-server (2:1.17.2-1ubuntu8) wily; urgency=medium
+
+  * debian/control:
+    - xmir depends on xserver-common (LP: #1500848)
+
+ -- Robert Ancell <robert.ancell@canonical.com>  Wed, 30 Sep 2015 14:56:38 +1300
+
+xorg-server (2:1.17.2-1ubuntu7) wily; urgency=medium
+
+  * glamor-make-current-in-prepare-paths.diff: Fix LO crashing the
+    server. (LP: #1443456)
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Thu, 17 Sep 2015 12:04:08 +0300
+
+xorg-server (2:1.17.2-1ubuntu6) wily; urgency=medium
+
+  * os-make-sure-the-clientswritable-fd-set-is-initialized.diff: Fix
+    crashers caused by newer xproto bumping XFD_SETSIZE. (LP: #1484380)
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Tue, 08 Sep 2015 10:30:31 +0300
+
+xorg-server (2:1.17.2-1ubuntu5) wily; urgency=medium
+
+  * disable-rotation-transform-gpuscreens.patch: Revert back to disabling
+    rotations on GPU screens. It won't work before 1.18. (LP: #1489696)
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Wed, 02 Sep 2015 15:56:03 +0300
+
+xorg-server (2:1.17.2-1ubuntu4) wily; urgency=medium
+
+  * debian/patches/xmir-rootless.patch:
+    - Fix crash when running XMir in rootless mode (LP: #1472097)
+
+ -- Robert Ancell <robert.ancell@canonical.com>  Thu, 20 Aug 2015 16:31:37 +1200
+
+xorg-server (2:1.17.2-1ubuntu3) wily; urgency=medium
+
+  * debian/patches/xmir.patch:
+    - Fix red and blue channels being swapped on Android drivers (LP: #1471146)
+
+ -- Robert Ancell <robert.ancell@canonical.com>  Thu, 30 Jul 2015 15:31:29 +1200
+
+xorg-server (2:1.17.2-1ubuntu2) wily; urgency=medium
+
+  * debian/patches/xmir.patch:
+    - Fix cursor crash
+  * debian/patches/xmir-desktop-file-hint-flag.patch:
+    - Split Unity8 hack out from xmir.patch
+
+ -- Robert Ancell <robert.ancell@canonical.com>  Wed, 29 Jul 2015 14:18:31 +1200
+
+xorg-server (2:1.17.2-1ubuntu1) wily; urgency=medium
+
+  [ Timo Aaltonen ]
+  * Merge from Debian unstable. (LP: #1471185)
+  * fix-int10.patch: Dropped, upstream.
+  * pixman-validate.patch: Dropped, not upstream and not needed since
+    pixman got fixed.
+  * mi-dont-process-disabled.patch: This has been upstream for some time
+    now, drop it.
+
+  [ Robert Ancell ]
+  * Add patch headers
+  * debian/xserver-xorg-core.install:
+    - Simplify man page install
+
+ -- Robert Ancell <robert.ancell@canonical.com>  Thu, 23 Jul 2015 11:04:33 +1200
+
 xorg-server (2:1.17.2-1) unstable; urgency=medium
 
   [ Sven Joachim ]
@@ -736,6 +1531,56 @@ xorg-server (2:1.17.1-2) unstable; urgen
 
  -- Julien Cristau <jcristau@debian.org>  Mon, 04 May 2015 22:04:01 +0200
 
+xorg-server (2:1.17.1-0ubuntu6) wily; urgency=medium
+
+  * No change rebuild against Mir 0.14.0
+
+ -- Robert Ancell <robert.ancell@canonical.com>  Thu, 16 Jul 2015 10:37:45 +1200
+
+xorg-server (2:1.17.1-0ubuntu5) wily; urgency=medium
+
+  * debain/patches/xmir.patch:
+    - Update from git branch, now builds against Mir 0.14.0
+  * debian/patches/xmir-rootless.patch:
+    - Split out rootless support which requires more extensive changes to
+      existing X code.
+  * debian/control:
+    - Add build-depends on mir-client-platform-mesa-dev
+
+ -- Robert Ancell <robert.ancell@canonical.com>  Mon, 13 Jul 2015 11:33:23 +1200
+
+xorg-server (2:1.17.1-0ubuntu4) wily; urgency=medium
+
+  * debian/control:
+    - Rename xserver-xorg-xmir to xmir
+    - Build build-depends on libmirclient to 0.13.1
+  * debian/xmir.install:
+  * debian/patches/xmir.patch:
+    - Use new XMir implementation
+
+ -- Robert Ancell <robert.ancell@canonical.com>  Wed, 03 Jun 2015 14:21:10 +1200
+
+xorg-server (2:1.17.1-0ubuntu3) vivid; urgency=medium
+
+  * Add a patch to fix vesa int10 failure. (LP: #1433198)
+
+ -- Maarten Lankhorst <maarten.lankhorst@ubuntu.com>  Thu, 19 Mar 2015 10:13:08 +0100
+
+xorg-server (2:1.17.1-0ubuntu2) vivid; urgency=medium
+
+  * Use conflicts/replaces on modesetting.
+
+ -- Maarten Lankhorst <maarten.lankhorst@ubuntu.com>  Thu, 12 Mar 2015 16:56:38 +0100
+
+xorg-server (2:1.17.1-0ubuntu1) vivid; urgency=medium
+
+  * Merge with 1.17 branch.
+    - ABI bumped.
+    - Patches refreshed.
+    - Modesetting moved to xorg-server.
+
+ -- Maarten Lankhorst <maarten.lankhorst@ubuntu.com>  Thu, 12 Mar 2015 13:26:04 +0100
+
 xorg-server (2:1.17.1-1) experimental; urgency=medium
 
   [ Maarten Lankhorst ]
@@ -767,6 +1612,24 @@ xorg-server (2:1.16.4-1) unstable; urgen
 
  -- Julien Cristau <jcristau@debian.org>  Wed, 11 Feb 2015 01:26:07 +0100
 
+xorg-server (2:1.16.2.901-1ubuntu3) vivid; urgency=medium
+
+  * Fix FTBFS caused by the previous patch.
+
+ -- Maarten Lankhorst <maarten.lankhorst@ubuntu.com>  Mon, 15 Dec 2014 16:11:00 +0100
+
+xorg-server (2:1.16.2.901-1ubuntu2) vivid; urgency=medium
+
+  * Fix FTBFS with the bool redefinition by undef'ing it after including mir.
+
+ -- Maarten Lankhorst <maarten.lankhorst@ubuntu.com>  Sat, 13 Dec 2014 14:13:17 +0100
+
+xorg-server (2:1.16.2.901-1ubuntu1) vivid; urgency=medium
+
+  * Merge from released debian-unstable.
+
+ -- Maarten Lankhorst <maarten.lankhorst@ubuntu.com>  Thu, 11 Dec 2014 16:17:07 +0100
+
 xorg-server (2:1.16.2.901-1) unstable; urgency=medium
 
   * New upstream release
@@ -787,6 +1650,18 @@ xorg-server (2:1.16.2.901-1) unstable; u
 
  -- Julien Cristau <jcristau@debian.org>  Tue, 09 Dec 2014 22:04:20 +0100
 
+xorg-server (2:1.16.1.901-1ubuntu2) vivid; urgency=medium
+
+  * Re-enable rotation in optimus mode with SNA. (LP: #1386620)
+
+ -- Maarten Lankhorst <maarten.lankhorst@ubuntu.com>  Thu, 06 Nov 2014 12:19:07 +0100
+
+xorg-server (2:1.16.1.901-1ubuntu1) vivid; urgency=medium
+
+  * Merge from released debian-unstable.
+
+ -- Maarten Lankhorst <maarten.lankhorst@ubuntu.com>  Wed, 05 Nov 2014 15:38:44 +0100
+
 xorg-server (2:1.16.1.901-1) unstable; urgency=medium
 
   * New upstream release.
@@ -798,6 +1673,18 @@ xorg-server (2:1.16.1.901-1) unstable; u
 
  -- Julien Cristau <jcristau@debian.org>  Mon, 03 Nov 2014 21:36:14 +0100
 
+xorg-server (2:1.16.1-1ubuntu1) vivid; urgency=medium
+
+  * Merge from released debian-unstable.
+  * New upstream micro release.
+    - Import another patch from the 1.16 branch to fix KVM terminals.
+      This is an alternative, better, fix for (LP: #1318119).
+  * Remove outdated breaks/replaces, only affects the lts.
+  * Refresh patch series for 1.16.1
+    - Drop parts of the series for primary platform devices, upstream.
+
+ -- Maarten Lankhorst <maarten.lankhorst@ubuntu.com>  Mon, 27 Oct 2014 11:05:40 +0100
+
 xorg-server (2:1.16.1-1) unstable; urgency=medium
 
   * Add my key to debian/upstream/signing-key.asc.
@@ -822,6 +1709,18 @@ xorg-server (2:1.16.0-2) unstable; urgen
 
  -- Julien Cristau <jcristau@debian.org>  Sun, 31 Aug 2014 11:58:36 -0700
 
+xorg-server (2:1.16.0-1ubuntu1) utopic; urgency=medium
+
+  [ Maarten Lankhorst ]
+  * New upstream release.
+    - Refresh patches.
+  * Merge from released debian sid.
+
+  [ Christopher James Halse Rogers ]
+  * Refresh XMir patch
+
+ -- Maarten Lankhorst <maarten.lankhorst@ubuntu.com>  Wed, 10 Sep 2014 12:30:55 +0200
+
 xorg-server (2:1.16.0-1) unstable; urgency=medium
 
   * New upstream release
@@ -879,6 +1778,76 @@ xorg-server (2:1.15.99.902-1) experiment
 
  -- Julien Cristau <jcristau@debian.org>  Tue, 15 Apr 2014 08:35:26 +0200
 
+xorg-server (2:1.15.1-0ubuntu9) utopic; urgency=medium
+
+  * xserver-xorg-dev: /usr/share/xserver-xorg/configure_flags.mk
+    Provide the flags how the xserver was configured.
+
+ -- Matthias Klose <doko@ubuntu.com>  Wed, 30 Jul 2014 22:49:51 +0200
+
+xorg-server (2:1.15.1-0ubuntu8) utopic; urgency=medium
+
+  * debian/patches/xfree86-pci-bus-probe-non-seat0.patch
+    - Upstream patch to fix "No devices detected" error for seats
+      other than seat0. (LP: #1209008)
+
+ -- Alberts Muktupāvels <alberts.muktupavels@gmail.com>  Tue, 01 Jul 2014 17:12:51 +0300
+
+xorg-server (2:1.15.1-0ubuntu7) utopic; urgency=medium
+
+  * Rebuild against Mir 0.4.0.
+
+ -- Łukasz 'sil2100' Zemczak <lukasz.zemczak@canonical.com>  Wed, 02 Jul 2014 12:33:10 +0200
+
+xorg-server (2:1.15.1-0ubuntu6) utopic; urgency=medium
+
+  * ppc64el-endian-fix.patch: Fix PPC endian assumptions (LP: #1333422)
+
+ -- Adam Conrad <adconrad@ubuntu.com>  Mon, 23 Jun 2014 23:47:15 -0600
+
+xorg-server (2:1.15.1-0ubuntu5) utopic; urgency=low
+
+  * Add upstream patch to fix some valgrind issues.
+    - xi-dont-copy-too-much.patch
+  * Fix crash related to suspend/shutdown. (LP: #1208473)
+    - mi-dont-process-disabled.patch
+
+ -- Maarten Lankhorst <maarten.lankhorst@ubuntu.com>  Tue, 20 May 2014 11:32:41 +0200
+
+xorg-server (2:1.15.1-0ubuntu4) utopic; urgency=low
+
+  * Resize touch event history if the array is filled up.
+    - xi2-resize-touch.patch
+
+ -- Maarten Lankhorst <maarten.lankhorst@ubuntu.com>  Wed, 07 May 2014 13:52:59 +0200
+
+xorg-server (2:1.15.1-0ubuntu3) utopic; urgency=medium
+
+  * Revive the old drm_device_keep_trying.patch.
+    - Removing the call to get_drm_info fixes switching to guest sessions.
+
+ -- Maarten Lankhorst <maarten.lankhorst@ubuntu.com>  Mon, 28 Apr 2014 10:06:21 +0200
+
+xorg-server (2:1.15.1-0ubuntu2) trusty; urgency=medium
+
+  * Disable support for rotations and transforms
+    on gpu screens for now. (LP: #1308515)
+
+ -- Maarten Lankhorst <maarten.lankhorst@ubuntu.com>  Wed, 16 Apr 2014 10:14:39 +0200
+
+xorg-server (2:1.15.1-0ubuntu1) trusty; urgency=medium
+
+  * Merge from unreleased debian unstable.
+    - Unbreaks KDE desktop effects on IVB+. (LP: #1294666)
+
+ -- Maarten Lankhorst <maarten.lankhorst@ubuntu.com>  Mon, 14 Apr 2014 12:57:12 +0200
+
+xorg-server (2:1.15.1-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+
+ -- Maarten Lankhorst <maarten.lankhorst@ubuntu.com>  Mon, 14 Apr 2014 12:52:18 +0200
+
 xorg-server (2:1.15.0.901-1) unstable; urgency=medium
 
   [ Robert Millan ]
@@ -890,6 +1859,49 @@ xorg-server (2:1.15.0.901-1) unstable; u
 
  -- Julien Cristau <jcristau@debian.org>  Mon, 31 Mar 2014 12:19:57 +0200
 
+xorg-server (2:1.15.0-1ubuntu7) trusty; urgency=medium
+
+  * Fix crash in RRCrtcDetachScanoutPixmap. (LP: #1280743)
+
+ -- Maarten Lankhorst <maarten.lankhorst@ubuntu.com>  Thu, 13 Mar 2014 13:10:52 +0100
+
+xorg-server (2:1.15.0-1ubuntu6) trusty; urgency=low
+
+  * Add a small patch to hopefully fix FTBFS on ppc64el.
+  * Add breaks/replaces on xserver-common-lts-* to fix upgrades from precise.
+
+ -- Maarten Lankhorst <maarten.lankhorst@ubuntu.com>  Thu, 13 Feb 2014 14:06:11 +0100
+
+xorg-server (2:1.15.0-1ubuntu5) trusty; urgency=medium
+
+  * Another no-change rebuild against latest Mir
+
+ -- Łukasz 'sil2100' Zemczak <lukasz.zemczak@canonical.com>  Wed, 12 Feb 2014 18:33:20 +0100
+
+xorg-server (2:1.15.0-1ubuntu4) trusty; urgency=low
+
+  * Only set RR caps that are appropriate to main/gpu screen. (LP: #1277014)
+
+ -- Maarten Lankhorst <maarten.lankhorst@ubuntu.com>  Mon, 10 Feb 2014 18:51:19 +0100
+
+xorg-server (2:1.15.0-1ubuntu3) trusty; urgency=low
+
+  * No-change rebuild against correct libgcrypt.
+
+ -- Maarten Lankhorst <maarten.lankhorst@ubuntu.com>  Thu, 06 Feb 2014 09:38:39 +0000
+
+xorg-server (2:1.15.0-1ubuntu2) trusty; urgency=medium
+
+  * No-change rebuild against latest Mir
+
+ -- Ricardo Salveti de Araujo <ricardo.salveti@canonical.com>  Tue, 04 Feb 2014 20:35:47 -0200
+
+xorg-server (2:1.15.0-1ubuntu1) trusty; urgency=low
+
+  * New upstream release.
+
+ -- Maarten Lankhorst <maarten.lankhorst@ubuntu.com>  Tue, 04 Feb 2014 15:45:00 +0000
+
 xorg-server (2:1.15.0-2) unstable; urgency=medium
 
   [ Julien Cristau ]
@@ -952,119 +1964,738 @@ xorg-server (2:1.14.99.3-1) experimental
   * Run abibumpcheck on build instead of clean so it's done on a patched tree.
   * Remove Drew and Cyril from Uploaders.
 
- -- Julien Cristau <jcristau@debian.org>  Mon, 21 Oct 2013 23:46:34 +0200
+ -- Julien Cristau <jcristau@debian.org>  Mon, 21 Oct 2013 23:46:34 +0200
+
+xorg-server (2:1.14.5-1ubuntu4) trusty; urgency=medium
+
+  * Build xserver-xorg-core-udeb on arm64 and ppc64el.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Mon, 03 Feb 2014 15:44:50 +0000
+
+xorg-server (2:1.14.5-1ubuntu3) trusty; urgency=low
+
+  * Add a workaround for a linker crash bug. (LP: #1266492)
+
+ -- Maarten Lankhorst <maarten.lankhorst@ubuntu.com>  Wed, 29 Jan 2014 16:13:36 +0100
+
+xorg-server (2:1.14.5-1ubuntu2) trusty; urgency=medium
+
+  * Don't build XMir on ppc64el.
+
+ -- Matthias Klose <doko@ubuntu.com>  Sun, 15 Dec 2013 22:42:40 +0100
+
+xorg-server (2:1.14.5-1ubuntu1) trusty; urgency=low
+
+  * Merge from released debian-unstable.
+  * Refresh xrandr-rroutputchanged-main.patch.
+
+ -- Maarten Lankhorst <maarten.lankhorst@ubuntu.com>  Fri, 13 Dec 2013 11:24:16 +0100
+
+xorg-server (2:1.14.5-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Maarten Lankhorst <maarten.lankhorst@ubuntu.com>  Fri, 13 Dec 2013 11:10:46 +0100
+
+xorg-server (2:1.14.4.901-0ubuntu2) trusty; urgency=low
+
+  * Re-apply security update again.
+
+ -- Maarten Lankhorst <maarten.lankhorst@ubuntu.com>  Tue, 10 Dec 2013 15:25:04 +0100
+
+xorg-server (2:1.14.4.901-0ubuntu1) trusty; urgency=low
+
+  * New upstream release with some optimus fixes.
+  * Include a patch to fix gpu screen output hotplugging. (LP: #1259561)
+
+ -- Maarten Lankhorst <maarten.lankhorst@ubuntu.com>  Tue, 10 Dec 2013 15:09:07 +0100
+
+xorg-server (2:1.14.4-1ubuntu2) trusty; urgency=low
+
+  * SECURITY UPDATE: unsafe use of xkb cache files
+    - debian/patches/190_cache-xkbcomp_output_for_fast_start_up.patch:
+      updated to not use xkb cache files in /tmp when running a non-root
+      server.
+    - CVE-2013-1056
+
+ -- Marc Deslauriers <marc.deslauriers@ubuntu.com>  Fri, 06 Dec 2013 11:15:23 -0500
+
+xorg-server (2:1.14.4-1ubuntu1) trusty; urgency=low
+
+  * Merge released debian-unstable.
+  * Cherry-pick fix to sync code. (LP: #1238410)
+
+ -- Maarten Lankhorst <maarten.lankhorst@ubuntu.com>  Wed, 04 Dec 2013 13:54:02 +0100
+
+xorg-server (2:1.14.4-1) unstable; urgency=low
+
+  * New upstream release.
+  * Drop upstreamed patches.
+    - 02_improve-posix-saved-ids-check.diff
+    - 04_hashtabletest-s390x.diff
+    - 10_Include-missing-selection-h.diff
+
+ -- Maarten Lankhorst <maarten.lankhorst@ubuntu.com>  Wed, 04 Dec 2013 13:09:36 +0100
+
+xorg-server (2:1.14.3-5ubuntu1) trusty; urgency=low
+
+  * Merge released debian-unstable to fix mesa-10 loading.
+  * Drop avoid-use-after-free.diff, upstreamed.
+
+ -- Maarten Lankhorst <maarten.lankhorst@ubuntu.com>  Mon, 25 Nov 2013 16:17:49 +0100
+
+xorg-server (2:1.14.3-5) unstable; urgency=low
+
+  * Cherry-pick a upstream commit to fix mesa-10 driver loading.
+
+ -- Maarten Lankhorst <maarten.lankhorst@ubuntu.com>  Mon, 25 Nov 2013 14:52:54 +0100
+
+xorg-server (2:1.14.3-3ubuntu4) trusty; urgency=low
+
+  * No-change rebuild for xmir to use the new Mir ABI.
+
+ -- Mathieu Trudel-Lapierre <mathieu-tl@ubuntu.com>  Mon, 28 Oct 2013 13:36:02 -0400
+
+xorg-server (2:1.14.3-3ubuntu3) trusty; urgency=low
+
+  * pixman-validate.patch: Do not render invalid trapezoids. (LP: #1197921)
+
+ -- Maarten Lankhorst <maarten.lankhorst@ubuntu.com>  Wed, 23 Oct 2013 12:11:27 +0200
+
+xorg-server (2:1.14.3-3ubuntu2) saucy-proposed; urgency=low
+
+  * avoid-use-after-free.diff: Fix CVE-2013-4396.
+
+ -- Timo Aaltonen <tjaalton@ubuntu.com>  Tue, 15 Oct 2013 12:05:48 +0300
+
+xorg-server (2:1.14.3-3ubuntu1) saucy; urgency=low
+
+  * Merge from unreleased debian git.
+  * rrcrtc-brackets-are-hard.patch: Replace xf86-detach-scanout.patch
+    with this patch from Fedora. Should fix crashers on hybrid systems
+    (LP: #1210025)
+  * Drop include-selection-h.patch, not needed anymore.
+
+ -- Timo Aaltonen <tjaalton@ubuntu.com>  Thu, 03 Oct 2013 15:30:22 +0300
+
+xorg-server (2:1.14.3-4) unstable; urgency=high
+
+  [ Timo Aaltonen ]
+  * rules: Drop defoma support from the font path. (Closes: #689233,
+    LP: #986061)
+
+  [ Julien Cristau ]
+  * Avoid use-after-free in dix/dixfonts.c: doImageText().  Addresses
+    CVE-2013-4396.
+
+ -- Julien Cristau <jcristau@debian.org>  Sat, 05 Oct 2013 15:57:55 +0200
+
+xorg-server (2:1.14.3-3) unstable; urgency=low
+
+  * Upload to unstable.
+
+ -- Julien Cristau <jcristau@debian.org>  Sun, 22 Sep 2013 16:32:19 +0200
+
+xorg-server (2:1.14.3-2) experimental; urgency=low
+
+  * Delete test-driver on clean.
+  * Add a couple patches to fix FTBFS on hurd (closes: #720736).  Thanks, Pino
+    Toscano!
+
+ -- Julien Cristau <jcristau@debian.org>  Fri, 20 Sep 2013 00:21:41 +0200
+
+xorg-server (2:1.14.3-1) experimental; urgency=low
+
+  [ Julien Cristau ]
+  * Remove the Replaces: xdmx from xdmx-tools, that was before lenny.  That
+    change was done in the 1.10.x timeframe and then lost when moving to
+    1.11.x.
+
+  [ Michele Cane ]
+  * New upstream release.
+
+ -- Julien Cristau <jcristau@debian.org>  Sun, 15 Sep 2013 23:57:26 +0200
+
+xorg-server (2:1.14.2.901-2ubuntu7) saucy; urgency=low
+
+  * Make glx link against glapi for the dispatch table symbols. (LP: #1232000)
+  * Cherry pick a few related glx fixes from upstream.
+
+ -- Maarten Lankhorst <maarten.lankhorst@ubuntu.com>  Tue, 01 Oct 2013 13:30:59 +0200
+
+xorg-server (2:1.14.2.901-2ubuntu6) saucy; urgency=low
+
+  * xmir.patch: Drop vestigial libatomic-ops dependency, fixing
+    driver FTBFS.
+
+ -- Christopher James Halse Rogers <raof@ubuntu.com>  Thu, 26 Sep 2013 08:29:44 -0700
+
+xorg-server (2:1.14.2.901-2ubuntu5) saucy; urgency=low
+
+  * xmir.patch: Drop input on loss of focus. Fixes "I'm sending all my
+    passwords to IRC when I switch to a VT" with associated 
+    unity-system-compositor change. (LP: #1192843)
+  * xmir.patch: Add DPMS support (LP: #1193222)
+  * Drop os-use-libunwind-to-generate-backtraces.patch; this was not enabled
+    due to libunwind8-dev not shipping a pkg-config file. Now that it does,
+    this causes FTBFS on armhf.
+
+ -- Christopher James Halse Rogers <raof@ubuntu.com>  Tue, 24 Sep 2013 08:58:45 -0700
+
+xorg-server (2:1.14.2.901-2ubuntu4) saucy; urgency=low
+
+  * xmir.patch: Add XRandR support
+  * Bump serverminver for XMir API changes
+
+ -- Christopher James Halse Rogers <raof@ubuntu.com>  Thu, 29 Aug 2013 19:42:41 +1000
+
+xorg-server (2:1.14.2.901-2ubuntu3) saucy; urgency=low
+
+  * xmir.patch: Use the API we have, not the API we've documented
+
+ -- Christopher James Halse Rogers <raof@ubuntu.com>  Thu, 22 Aug 2013 15:18:55 +1000
+
+xorg-server (2:1.14.2.901-2ubuntu2) saucy; urgency=low
+
+  * xmir.patch: Update for new API
+
+ -- Christopher James Halse Rogers <raof@ubuntu.com>  Thu, 22 Aug 2013 14:23:40 +1000
+
+xorg-server (2:1.14.2.901-2ubuntu1) saucy; urgency=low
+
+  * Merge from released debian-experimental.
+  * Drop upstreamed prime patches.
+  * Refresh 228_autobind_gpu.patch.
+  * Pick up some more input fixes from upstream.
+
+ -- Maarten Lankhorst <maarten.lankhorst@ubuntu.com>  Wed, 14 Aug 2013 10:52:17 +0200
+
+xorg-server (2:1.14.2.901-2) experimental; urgency=low
+
+  * Use libbsd-overlay to get missing declarations on kfreebsd and fix FTBFS.
+    Require dpkg-dev 1.16.1.
+  * Also improve POSIX_SAVED_IDS check to work on kbsd.
+  * Link against libnettle.a, to unbreak the udeb (there's no libnettle udeb).
+  * Fix a test failure on 64bit big-endian (s390x, ppc64, sparc64).
+
+ -- Julien Cristau <jcristau@debian.org>  Sat, 03 Aug 2013 18:17:30 +0200
+
+xorg-server (2:1.14.2.901-1) experimental; urgency=low
+
+  * New upstream release
+
+  [ Maarten Lankhorst ]
+  * Bump minimum required abi, randr, dri2 and gl protos.
+  * Remove upstreamed patches.
+    - 02_Add-libnettle-as-option-for-sha1.diff
+    - 04_int10-fix-pci_device_read_rom-usage.diff
+    - 07_Revert-kinput-allocate-enough-space-for-null-charact.diff
+  * Bump x11proto-input-dev and libpixman-1-dev minimum versions.
+
+  [ Timo Aaltonen ]
+  * Refresh 02_Add-libnettle-as-option-for-sha1.diff.
+  * Remove 03_fix-panning.diff, upstream
+  * Refresh 04_int10-fix-pci_device_read_rom-usage.diff.
+  * Drop 09_EXA-Track...diff, upstream.
+  * control: Mark xvfb as M-A: foreign.
+  * control: Bump inputproto build-dep to 2.3.
+
+  [ Robert Hooker ]
+  * Update to a newer git snapshot, 7fe5e6dfa5c1e71
+  * Bump input ABI version in serverminver
+  * Bump libxi-dev build requirement to 2:1.6.99.1
+
+  [ Julien Cristau ]
+  * Merge sid branch up to 2:1.12.4-6.1.
+  * Drop old --disable-builddocs, --disable-xcalibrate configure options from
+    d/rules.
+  * Make build-deps match xserver-xorg-dev dependencies and configure checks.
+
+ -- Julien Cristau <jcristau@debian.org>  Sat, 27 Jul 2013 13:18:28 +0200
+
+xorg-server (2:1.14.2-0ubuntu9) saucy; urgency=low
+
+  [ Maarten Lankhorst ]
+  * Fix crash in RRCrtcDetachScanoutPixmap.
+  * Add xmir module to xserver-xorg-core-dbg.
+  * Fix xf86DeleteDriver infinite loop. (LP: 1208715)
+
+  [ Christopher James Halse Rogers ]
+  * Fix damage reporting (LP: 1206744)
+
+ -- Christopher James Halse Rogers <raof@ubuntu.com>  Tue, 06 Aug 2013 16:11:47 +1000
+
+xorg-server (2:1.14.2-0ubuntu8) saucy; urgency=low
+
+  * Don't build XMir on AArch64.
+
+ -- Matthias Klose <doko@ubuntu.com>  Mon, 05 Aug 2013 15:51:01 +0200
+
+xorg-server (2:1.14.2-0ubuntu7) saucy; urgency=low
+
+  * Don't have the -dev package depending on libmirclient-dev on powerpc
+    as unavailable
+
+ -- Didier Roche <didrocks@ubuntu.com>  Mon, 05 Aug 2013 12:33:48 +0200
+
+xorg-server (2:1.14.2-0ubuntu6) saucy; urgency=low
+
+  * As we don't build XMir on PPC we should not try to build the
+    xserver-xorg-xmir package, either.
+
+ -- Christopher James Halse Rogers <raof@ubuntu.com>  Mon, 05 Aug 2013 19:09:47 +1000
+
+xorg-server (2:1.14.2-0ubuntu5) saucy; urgency=low
+
+  * rules,control: Restrict XMir build to !powerpc, as we don't build Mir there
+
+ -- Christopher James Halse Rogers <raof@ubuntu.com>  Mon, 05 Aug 2013 18:46:43 +1000
+
+xorg-server (2:1.14.2-0ubuntu4) saucy; urgency=low
+
+  * Add xmir.patch; First upload with XMir support.
+
+ -- Christopher James Halse Rogers <raof@ubuntu.com>  Thu, 01 Aug 2013 13:00:41 +1000
+
+xorg-server (2:1.14.2-0ubuntu3) saucy; urgency=low
+
+  * Oops, refresh xf86-detach-scanout, embarassing bug in the for check.
+
+ -- Maarten Lankhorst <maarten.lankhorst@ubuntu.com>  Tue, 30 Jul 2013 12:51:40 +0200
+
+xorg-server (2:1.14.2-0ubuntu2) saucy; urgency=low
+
+  * Add support for Aarch64.
+
+ -- Matthias Klose <doko@ubuntu.com>  Wed, 24 Jul 2013 14:24:25 +0200
+
+xorg-server (2:1.14.2-0ubuntu1) saucy; urgency=low
+
+  * New upstream release. (LP: #1156498)
+  * Remove upstreamed patch.
+    - xf86setdesired-hybrid.patch
+
+ -- Maarten Lankhorst <maarten.lankhorst@ubuntu.com>  Tue, 16 Jul 2013 09:36:06 +0200
+
+xorg-server (2:1.14.1-0ubuntu1) saucy; urgency=low
+
+  * Fix null pointer deref on logout. (LP: #1194343)
+
+ -- Maarten Lankhorst <maarten.lankhorst@ubuntu.com>  Thu, 11 Jul 2013 16:52:28 +0200
+
+xorg-server (2:1.14.1-0ubuntu0.8) saucy; urgency=low
+
+  * Use correct version for libxfixes3.
+
+ -- Maarten Lankhorst <maarten.lankhorst@ubuntu.com>  Wed, 03 Jul 2013 12:03:57 +0200
+
+xorg-server (2:1.14.1-0ubuntu0.7) saucy; urgency=low
+
+  * Add build-depends on recent enough libxi-dev and libxfixes-dev
+    for the new pointer barriers.
+  * Add breaks on old libxi6, libxfixes3, unity.
+
+ -- Maarten Lankhorst <maarten.lankhorst@ubuntu.com>  Wed, 03 Jul 2013 10:37:30 +0200
+
+xorg-server (2:1.14.1-0ubuntu0.6) saucy; urgency=low
+
+  * Add patch to fix nvidia regression.
+    - xf86-inactive-gpuscreen.patch
+
+ -- Maarten Lankhorst <maarten.lankhorst@ubuntu.com>  Mon, 17 Jun 2013 14:18:35 +0200
+
+xorg-server (2:1.14.1-0ubuntu0.5) saucy; urgency=low
+
+  * Add patch to fix device enumeration with nvidia drivers. (LP: #1190546)
+    - xf86-fixup-detection.patch
+
+ -- Maarten Lankhorst <maarten.lankhorst@ubuntu.com>  Thu, 13 Jun 2013 13:03:17 +0200
+
+xorg-server (2:1.14.1-0ubuntu0.4) raring; urgency=low
+
+  * Add patch to fix crash on hybrid systems during shutdown. (LP: #1185035)
+    - xf86-detach-scanout.patch
+  * Add patch to fix build error on saucy.
+    - include-selection-h.patch
+
+ -- Maarten Lankhorst <maarten.lankhorst@ubuntu.com>  Tue, 28 May 2013 16:13:24 +0200
+
+xorg-server (2:1.14.1-0ubuntu0.3) raring; urgency=low
+
+  * Add patch to fixup optimus again.
+    - xf86-dont-enable-gpuscreens.patch
+
+ -- Maarten Lankhorst <maarten.lankhorst@ubuntu.com>  Wed, 01 May 2013 09:38:59 +0200
+
+xorg-server (2:1.14.1-0ubuntu0.2) raring; urgency=low
+
+  * Add patch to run on outputless hybrid systems again.
+    - xf86setdesired-hybrid.patch
+
+ -- Maarten Lankhorst <maarten.lankhorst@ubuntu.com>  Mon, 29 Apr 2013 11:29:10 +0200
+
+xorg-server (2:1.14.1-0ubuntu0.1) raring; urgency=low
+
+  [ Timo Aaltonen ]
+  * Merge from unreleased debian git.
+  * 500_pointer_barrier_thresholds.diff: Dropped, implemented upstream.
+  * Dropped upstreamed patches:
+    165_man_xorg_conf_no_device_ident.patch
+    233-xf86events-valgrind.patch
+    236-use-fbdev-for-poulsbo-oaktrail-medfield.patch
+  * Dropped drm_device_keep_trying.patch, not needed anymore.
+
+  [ Bryce Harrington ]
+  * 157_check_null_modes.patch: Dropped, patch included upstream.
+  * 162_null_crtc_in_rotation.patch: Dropped, no longer relevant
+    (see LP: 139990)
+  * 167_nullptr_xisbread.patch: Dropped, fixed differently upstream.
+
+  [ Maarten Lankhorst ]
+  * Update to 1.14.0 release.
+
+ -- Maarten Lankhorst <maarten.lankhorst@ubuntu.com>  Wed, 06 Mar 2013 14:49:21 +0100
+
+xorg-server (2:1.13.3-0ubuntu13) saucy; urgency=low
+
+  * Re-enable xf86-fixup-detection.patch.
+  * Add patch to fix nvidia regression.
+    - xf86-inactive-gpuscreen.patch
+
+ -- Maarten Lankhorst <maarten.lankhorst@ubuntu.com>  Mon, 17 Jun 2013 14:16:05 +0200
+
+xorg-server (2:1.13.3-0ubuntu12) saucy; urgency=low
+
+  * Disable xf86-fixup-detection.patch for now as it breaks PRIME
+    with nvidia.
+
+ -- Alberto Milone <alberto.milone@canonical.com>  Fri, 14 Jun 2013 17:21:16 +0200
+
+xorg-server (2:1.13.3-0ubuntu11) saucy; urgency=low
+
+  * Add patch to fix device enumeration with nvidia drivers. (LP: #1190546)
+    - xf86-fixup-detection.patch
+
+ -- Maarten Lankhorst <maarten.lankhorst@ubuntu.com>  Thu, 13 Jun 2013 13:00:58 +0200
+
+xorg-server (2:1.13.3-0ubuntu10) saucy; urgency=low
+
+  * Add patch to fix DPMS. (LP: #1184999)
+    - include-GPU-screens-in-DPMS-code.patch
+  * Add patch to fix crash on hybrid systems during shutdown. (LP: #1185035)
+    - xf86-detach-scanout.patch
+
+ -- Maarten Lankhorst <maarten.lankhorst@ubuntu.com>  Tue, 28 May 2013 16:12:12 +0200
+
+xorg-server (2:1.13.3-0ubuntu9) saucy; urgency=low
+
+  * Cherry-pick patch from 1.14 to fix DRI1 regression. (LP: #1083032)
+    - dri1-fix-dri1-startup-since-459c6da0f907ba33d733c7e6.patch
+
+ -- Tormod Volden <debian.tormod@gmail.com>  Sun, 12 May 2013 11:30:46 +0200
+
+xorg-server (2:1.13.3-0ubuntu8) saucy; urgency=low
+
+  * Fixup build error on saucy.
+
+ -- Maarten Lankhorst <maarten.lankhorst@ubuntu.com>  Wed, 08 May 2013 14:02:12 +0200
+
+xorg-server (2:1.13.3-0ubuntu7) saucy; urgency=low
+
+  * Add patch to fixup optimus again.
+    - xf86-dont-enable-gpuscreens.patch
+
+ -- Maarten Lankhorst <maarten.lankhorst@ubuntu.com>  Wed, 01 May 2013 10:35:55 +0200
+
+xorg-server (2:1.13.3-0ubuntu6) raring; urgency=low
+
+  * SECURITY UPDATE: input event leak via inactive VT
+    - debian/patches/CVE-2013-1940.patch: fix flush input to work with
+      Linux evdev devices in hw/xfree86/os-support/shared/posix_tty.c.
+    - CVE-2013-1940
+
+ -- Jamie Strandboge <jamie@ubuntu.com>  Wed, 17 Apr 2013 09:41:17 -0500
+
+xorg-server (2:1.13.3-0ubuntu5) raring; urgency=low
+
+  [ Bryce Harrington ]
+  * Add no-nv.patch:  Don't autoprobe -nv on linux.
+  * Refresh drm_device_keep_trying.patch (LP: #1161981)
+    - Set empty busid for usb devices
+    - Parse pci path more strictly.
+    - Make platform devices work correctly, try to obtain busid from
+      path if possible.
+    - Fallback if not possible (tegra).
+
+ -- Maarten Lankhorst <maarten.lankhorst@ubuntu.com>  Mon, 08 Apr 2013 11:40:26 +0200
+
+xorg-server (2:1.13.3-0ubuntu4) raring; urgency=low
+
+  * Do not bother registering xv/xvmc on gpu screens.
+    - xfree86-no-xv-for-gpuscreens.patch
+  * Re-enable GLX on Xephyr. (LP: #1079096)
+    - xephyr-glx-register.patch
+
+ -- Maarten Lankhorst <maarten.lankhorst@ubuntu.com>  Tue, 26 Mar 2013 16:16:14 +0100
+
+xorg-server (2:1.13.3-0ubuntu3) raring; urgency=low
+
+  * Refresh autoconfig-fixup-tell-changed-so-randr-clients-can-t.patch
+    - Unbind offload sink and render slave simultaneously.
+      This prevents a use-after-free bug.
+  * Add config-add-no-removal.patch (LP: #1157614)
+    - Do not call device_remove when a device is hotplugged.
+  * Refresh drm_device_keep_trying.patch
+    - There is no need for drm master here. This might
+      reopen LP #982889, but I do not think spinning here
+     :is the correct answer.
+
+ -- Maarten Lankhorst <maarten.lankhorst@ubuntu.com>  Thu, 21 Mar 2013 15:40:42 +0100
+
+xorg-server (2:1.13.3-0ubuntu2) raring; urgency=low
+
+  * Add patch to improve backtraces in the Xorg log.
+    - os-use-libunwind-to-generate-backtraces.patch
+
+ -- Maarten Lankhorst <maarten.lankhorst@ubuntu.com>  Thu, 14 Mar 2013 16:12:16 +0100
+
+xorg-server (2:1.13.3-0ubuntu1) raring; urgency=low
+
+  * New upstream release.
+  * Drop patches applied upstream.
+    - 237_dix_save_touchpoint_last_coords_before_transform.patch
+    - randr-cleanup-provider-properly.patch
+  * Rework drm_device_keep_trying.patch (LP: #982889)
+
+ -- Maarten Lankhorst <maarten.lankhorst@ubuntu.com>  Thu, 14 Mar 2013 08:41:51 +0100
+
+xorg-server (2:1.13.2-0ubuntu3) raring; urgency=low
+
+  * Add drm_device_keep_trying.patch: When kernel reports drm device is
+    not available, don't give up immediately, but keep retrying for a
+    little bit.  Fixes boot failures due to a race condition with plymouth
+    or the kernel.  Typical symptom is xserver error exit, "Cannot run in
+    framebuffer mode" and Xorg.0.log messages about "setversion 1.4
+    failed".
+    (LP: #982889)
+
+ -- Bryce Harrington <bryce@ubuntu.com>  Tue, 19 Feb 2013 07:58:24 -0800
+
+xorg-server (2:1.13.2-0ubuntu2) raring; urgency=low
+
+  * Restore selinux support now that audit has been promoted to main.
+
+ -- Adam Conrad <adconrad@ubuntu.com>  Sat, 09 Feb 2013 00:03:45 -0700
+
+xorg-server (2:1.13.2-0ubuntu1) raring; urgency=low
+
+  * New upstream release.
+  * control: Mark xvfb M-A: foreign.
+  * Refresh autobind patch from fedora, and cherry-pick some fixes from them for
+    reverse-optimus and hotplugging.
+
+ -- Timo Aaltonen <tjaalton@ubuntu.com>  Tue, 29 Jan 2013 17:23:44 +0200
+
+xorg-server (2:1.13.1.901-0ubuntu2) raring; urgency=low
+
+  * Add 237_dix_save_touchpoint_last_coords_before_transform.patch:
+    Fix sensitive touch settings on Nexus 7 when input is transformed.
+    (LP: #1075415, #1076567, #1076627)
+
+ -- Bryce Harrington <bryce@ubuntu.com>  Tue, 22 Jan 2013 13:51:16 -0800
+
+xorg-server (2:1.13.1.901-0ubuntu1) raring; urgency=low
+
+  * Merge from unreleased debian git.
+
+ -- Timo Aaltonen <tjaalton@ubuntu.com>  Tue, 08 Jan 2013 16:40:30 +0200
+
+xorg-server (2:1.13.0.902-0ubuntu1) raring; urgency=low
+
+  [ Timo Aaltonen ]
+  * Merge from unreleased debian git.
+  * Dropped upstream patches:
+    - 229_udev-fix.diff
+    - 231-scan-pci-after-probing-devices.patch
+    - 235-composite-tracking.patch
+    - 237-dix-set-the-device-transformation-matrix.patch
+
+  [ Maarten Lankhorst ]
+  * Dropped upstream patches:
+    - 230-fix-compat-output-selection.patch
+  * Merge 1.13.1.rc2 from unreleased debian git.
+  * Bump ABI_VIDEODRV_VERSION to 13.1
+    - xf86UpdateDesktopDimensions is newly exported for nvidia blob
+
+ -- Maarten Lankhorst <maarten.lankhorst@ubuntu.com>  Fri, 07 Dec 2012 09:14:37 +0100
+
+xorg-server (2:1.13.0-0ubuntu8) raring; urgency=low
+
+  * Revert the change to 500_pointer_barrier_thresholds.diff, causes
+    issues with unity launcher.
+
+ -- Timo Aaltonen <tjaalton@ubuntu.com>  Mon, 19 Nov 2012 12:15:49 +0200
+
+xorg-server (2:1.13.0-0ubuntu7) raring; urgency=low
+
+  [ Maarten Lankhorst ]
+  * Add 233-xf86events-valgrind.patch to fix a xserver corruption
+    when acpid is stopped before Xorg is.
+    (LP: #1070481)
+  * Add 235-composite-tracking.patch to fix exa corruption.
+    (LP: #1010794)
+
+  [ Bryce Harrington ]
+  * Add 236-use-fbdev-for-poulsbo-oaktrail-medfield.patch: Never use Intel
+    driver on Poulsbo/Oaktrail/Medfield.  Thanks to Matthias Klumpp.
+    (LP: #1069031)
+  * Add 237-dix-set-the-device-transformation-matrix.patch: Fix pointer
+    jumping with absolute pointing device.  Initializes device
+    transformation matrix to an identity matrix.  Thanks to a7x.
+    (LP: #1041063)
+
+  [ Tim Lunn ]
+  * 500_pointer_barrier_thresholds.diff: Update to fix gaps above
+    barriers at edge of screen
+    (LP: #1073724)
+
+ -- Bryce Harrington <bryce@ubuntu.com>  Fri, 16 Nov 2012 11:37:26 -0800
+
+xorg-server (2:1.13.0-0ubuntu6) quantal; urgency=low
+
+  [ Timo Aaltonen ]
+  * patches/series: Reorganize our patches in categories in order to
+    make reviewing and rebasing easier.
+
+  [ Maarten Lankhorst ]
+  * add 232-xf86compatoutput-valgrind.patch to silence a valgrind error
 
-xorg-server (2:1.14.5-1) unstable; urgency=low
+ -- Timo Aaltonen <tjaalton@ubuntu.com>  Mon, 08 Oct 2012 17:58:54 +0300
 
-  * New upstream release.
+xorg-server (2:1.13.0-0ubuntu5) quantal; urgency=low
 
- -- Maarten Lankhorst <maarten.lankhorst@ubuntu.com>  Fri, 13 Dec 2013 11:10:46 +0100
+  * Update 228_autobind_gpu.patch to not crash when the device has no
+    randr provider. (LP: #1054051)
 
-xorg-server (2:1.14.4-1) unstable; urgency=low
+ -- Timo Aaltonen <tjaalton@ubuntu.com>  Tue, 25 Sep 2012 09:46:44 +0300
 
-  * New upstream release.
-  * Drop upstreamed patches.
-    - 02_improve-posix-saved-ids-check.diff
-    - 04_hashtabletest-s390x.diff
-    - 10_Include-missing-selection-h.diff
+xorg-server (2:1.13.0-0ubuntu4) quantal; urgency=low
 
- -- Maarten Lankhorst <maarten.lankhorst@ubuntu.com>  Wed, 04 Dec 2013 13:09:36 +0100
+  * Add patches to fix issues with hybrid graphics:
+    - 230-fix-compat-output-selection.patch
+      Fix compat output selection when the GPU has no outputs
+      (LP: #1043458)
+    - 231-scan-pci-after-probing-devices.patch
+      Fix a race condition when dynamically powering off secondary GPU's
 
-xorg-server (2:1.14.3-5) unstable; urgency=low
+ -- Timo Aaltonen <tjaalton@ubuntu.com>  Thu, 20 Sep 2012 14:34:45 +0300
 
-  * Cherry-pick a upstream commit to fix mesa-10 driver loading.
+xorg-server (2:1.13.0-0ubuntu3) quantal; urgency=low
 
- -- Maarten Lankhorst <maarten.lankhorst@ubuntu.com>  Mon, 25 Nov 2013 14:52:54 +0100
+  * Try again with the right hotplug patch.
 
-xorg-server (2:1.14.3-4) unstable; urgency=high
+ -- Timo Aaltonen <tjaalton@ubuntu.com>  Mon, 17 Sep 2012 16:24:29 +0300
+
+xorg-server (2:1.13.0-0ubuntu2) quantal; urgency=low
+
+  [ Maarten Lankhorst ]
+  * Add patch to autobind gpu's
 
   [ Timo Aaltonen ]
-  * rules: Drop defoma support from the font path. (Closes: #689233,
-    LP: #986061)
+  * Add a patch to fix drm device hotplugging.
 
-  [ Julien Cristau ]
-  * Avoid use-after-free in dix/dixfonts.c: doImageText().  Addresses
-    CVE-2013-4396.
+ -- Timo Aaltonen <tjaalton@ubuntu.com>  Mon, 17 Sep 2012 15:58:32 +0300
 
- -- Julien Cristau <jcristau@debian.org>  Sat, 05 Oct 2013 15:57:55 +0200
+xorg-server (2:1.13.0-0ubuntu1) quantal; urgency=low
 
-xorg-server (2:1.14.3-3) unstable; urgency=low
+  * Merge from unreleased debian git.
 
-  * Upload to unstable.
+ -- Timo Aaltonen <tjaalton@ubuntu.com>  Thu, 06 Sep 2012 12:25:51 +0300
 
- -- Julien Cristau <jcristau@debian.org>  Sun, 22 Sep 2013 16:32:19 +0200
+xorg-server (2:1.12.99.905-0ubuntu3) quantal; urgency=low
 
-xorg-server (2:1.14.3-2) experimental; urgency=low
+  * debian/patches/111_armel-drv-fallbacks.patch:
+    - Now that the modesetting is part of xserver-xorg-video-all, enable the
+      arm specific drivers before modesetting is included, otherwise it'll
+      always be the default, even if we have arm-compatible drivers available
+      at the system (LP: #1041686)
 
-  * Delete test-driver on clean.
-  * Add a couple patches to fix FTBFS on hurd (closes: #720736).  Thanks, Pino
-    Toscano!
+ -- Ricardo Salveti de Araujo <ricardo.salveti@linaro.org>  Sat, 25 Aug 2012 19:19:16 -0300
 
- -- Julien Cristau <jcristau@debian.org>  Fri, 20 Sep 2013 00:21:41 +0200
+xorg-server (2:1.12.99.905-0ubuntu2) quantal; urgency=low
 
-xorg-server (2:1.14.3-1) experimental; urgency=low
+  * debian/patches/111_armel-drv-fallbacks.patch:
+    - Adding support for omapdrm based devices (using the omap xorg driver),
+      and make xorg to use the recently added platform probe functions, by
+      trying to probe the driver in case there's only one platform device
+      available and without a valid busID (case of Omap3 and Omap4 based
+      devices) (LP: #1040405)
 
-  [ Julien Cristau ]
-  * Remove the Replaces: xdmx from xdmx-tools, that was before lenny.  That
-    change was done in the 1.10.x timeframe and then lost when moving to
-    1.11.x.
+ -- Ricardo Salveti de Araujo <ricardo.salveti@linaro.org>  Thu, 23 Aug 2012 01:20:03 -0300
 
-  [ Michele Cane ]
-  * New upstream release.
+xorg-server (2:1.12.99.905-0ubuntu1) quantal; urgency=low
 
- -- Julien Cristau <jcristau@debian.org>  Sun, 15 Sep 2013 23:57:26 +0200
+  [ Robert Hooker ]
+  * New upstream release snapshot (1.13-rc5)
 
-xorg-server (2:1.14.2.901-2) experimental; urgency=low
+ -- Timo Aaltonen <tjaalton@ubuntu.com>  Wed, 22 Aug 2012 18:29:26 +0300
 
-  * Use libbsd-overlay to get missing declarations on kfreebsd and fix FTBFS.
-    Require dpkg-dev 1.16.1.
-  * Also improve POSIX_SAVED_IDS check to work on kbsd.
-  * Link against libnettle.a, to unbreak the udeb (there's no libnettle udeb).
-  * Fix a test failure on 64bit big-endian (s390x, ppc64, sparc64).
+xorg-server (2:1.12.99.904-0ubuntu2) quantal; urgency=low
 
- -- Julien Cristau <jcristau@debian.org>  Sat, 03 Aug 2013 18:17:30 +0200
+  [ Maarten Lankhorst ]
+  * Remove disabled and unwanted patches
+    - 13_debian_add_xkbpath_env_variable.diff
+    - 200_randr-null.patch
+    - 217_revert_bgnonevisitwindow.patch
+    - 219_fedora-pointer-barriers.diff
 
-xorg-server (2:1.14.2.901-1) experimental; urgency=low
+  [ Christopher James Halse Rogers ]
+  * Bump build-dep on libdrm to 2.4.38-0ubuntu2 and rebuild to pick up correct
+    libdrm2-udeb dependencies on xserver-xorg-core-udeb
 
-  * New upstream release
+ -- Christopher James Halse Rogers <raof@ubuntu.com>  Tue, 21 Aug 2012 16:07:00 +1000
+
+xorg-server (2:1.12.99.904-0ubuntu1) quantal-proposed; urgency=low
 
   [ Maarten Lankhorst ]
-  * Bump minimum required abi, randr, dri2 and gl protos.
-  * Remove upstreamed patches.
-    - 02_Add-libnettle-as-option-for-sha1.diff
-    - 04_int10-fix-pci_device_read_rom-usage.diff
-    - 07_Revert-kinput-allocate-enough-space-for-null-charact.diff
-  * Bump x11proto-input-dev and libpixman-1-dev minimum versions.
+  * New upstream release snapshot (on the way to 1.13).
+  * Remove 172_cwgetbackingpicture_nullptr_check.patch:
+    - Code is removed now that XAA is gone.
 
-  [ Timo Aaltonen ]
-  * Refresh 02_Add-libnettle-as-option-for-sha1.diff.
-  * Remove 03_fix-panning.diff, upstream
-  * Refresh 04_int10-fix-pci_device_read_rom-usage.diff.
-  * Drop 09_EXA-Track...diff, upstream.
-  * control: Mark xvfb as M-A: foreign.
-  * control: Bump inputproto build-dep to 2.3.
+ -- Timo Aaltonen <tjaalton@ubuntu.com>  Wed, 08 Aug 2012 14:35:03 +0300
 
-  [ Robert Hooker ]
-  * Update to a newer git snapshot, 7fe5e6dfa5c1e71
-  * Bump input ABI version in serverminver
-  * Bump libxi-dev build requirement to 2:1.6.99.1
+xorg-server (2:1.12.99.904-1) UNRELEASED; urgency=low
 
-  [ Julien Cristau ]
-  * Merge sid branch up to 2:1.12.4-6.1.
-  * Drop old --disable-builddocs, --disable-xcalibrate configure options from
-    d/rules.
-  * Make build-deps match xserver-xorg-dev dependencies and configure checks.
+  * New upstream release snapshot (on the way to 1.13).
+  * Bump minimum required abi, randr, dri2 and gl protos.
 
- -- Julien Cristau <jcristau@debian.org>  Sat, 27 Jul 2013 13:18:28 +0200
+ -- Maarten Lankhorst <maarten.lankhorst@canonical.com>  Thu, 12 Jul 2012 13:54:50 +0200
 
-xorg-server (2:1.12.4-6.2) unstable; urgency=low
+xorg-server (2:1.12.99.902-0ubuntu1) quantal-proposed; urgency=low
 
-  * Non-maintainer upload.
-  * Cherry-pick Julien Cristau’s commits from debian-experimental:
-    Use libbsd-overlay to get missing declarations on kfreebsd and fix FTBFS.
-    02_improve-posix-saved-ids-check.diff
+  [ Maarten Lankhorst ]
+  * New upstream release snapshot (on the way to 1.13).
+    - Fixes QT5 app segfaults (LP: #1015292)
+  * Bump minimum required abi, randr, dri2 and gl protos.
+  * Refreshed patches to apply on x1.13
+  * Remove patches merged upstream:
+    - 508_device_off_release_buttons.patch
+    - 510-dix-return-early-from-DisableDevice-if-the-device-is.patch
+    - 511-dix-move-freeing-the-sprite-into-a-function.patch
+    - 512-dix-free-the-sprite-when-disabling-the-device.patch
+    - 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
+
+  [ Christopher James Halse Rogers ]
+  * debian/patches/100_rethrow_signals.patch:
+    - Drop, in favour of getting LightDM to pass -core to the server. This
+      upstream mechanism is significantly more reliable at dumping core in
+      my testing. We may later wish to improve this with some processing in
+      the apport hook.
+
+ -- Julien Cristau <jcristau@debian.org>  Sat, 27 Jul 2013 13:18:28 +0200
 
- -- Michael Stapelberg <stapelberg@debian.org>  Thu, 22 Aug 2013 18:34:21 +0200
 
 xorg-server (2:1.12.4-6.1) unstable; urgency=low
 
@@ -1159,6 +2790,41 @@ xorg-server (2:1.12.3-1) unstable; urgen
 
  -- Julien Cristau <jcristau@debian.org>  Wed, 18 Jul 2012 08:36:57 +0200
 
+xorg-server (2:1.12.1.902-1ubuntu1) quantal-proposed; urgency=medium
+
+  [ Maarten Lankhorst ]
+  * Refresh patches to apply on x-server 1.12
+    - patch-x-indent.sh from xorg-pkg-tools was used to redo coding style
+  * Deleted following patches because they have been committed upstream
+    - 224_return_BadWindow_not_BadMatch.diff
+    - 225_non-root_config_paths.patch
+    - 505_query_pointer_touchscreen.patch
+    - 506_touchscreen_pointer_emulation_checks.patch
+    - 507_touchscreen_fixes.patch
+  * Non-trivial refresh of 500_pointer_barrier_thresholds.diff, based on 
+    xorg-edgers
+  * Rest was refreshed with patch-x-indent.sh to survive coding style changes
+  * Add upstream patches for proper device disabling:
+    - 510-dix-return-early-from-DisableDevice-if-the-device-is.patch
+    - 511-dix-move-freeing-the-sprite-into-a-function.patch
+    - 512-dix-free-the-sprite-when-disabling-the-device.patch
+    - 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
+
+  [ Bryce Harrington ]
+  * Drop 209_add_legacy_bgnone_option.patch: lightdm and other *dm's have
+    switched to the new standard -background option.  No need to continue
+    providing the legacy -nr synonym.
+  * Drop 201_report-real-dpi.patch:  Commented out in series.
+  * Drop 198_nohwaccess.patch: Rootless-X no longer a development focus
+    for us; the patch would need reworked anyway to provide proper
+    support.
+  * Drop 166_nullptr_xinerama_keyrepeat.patch: Fixed differently upstream
+    in commit 24e682d0, as verified by original reporter.
+
+ -- Bryce Harrington <bryce@ubuntu.com>  Mon, 04 Jun 2012 19:12:23 -0700
+
 xorg-server (2:1.12.1.902-1) unstable; urgency=medium
 
   [ Julien Cristau ]
@@ -1250,6 +2916,273 @@ xorg-server (2:1.11.99.1-1) experimental
 
  -- Cyril Brulebois <kibi@debian.org>  Thu, 15 Dec 2011 18:49:10 +0100
 
+xorg-server (2:1.11.4-0ubuntu11) quantal; urgency=low
+
+  * Release buttons when device is disabled on suspend (LP: #968845)
+    - Add temporary patch 508_device_off_release_buttons.patch from upstream
+
+ -- Chase Douglas <chase.douglas@ubuntu.com>  Sat, 05 May 2012 13:17:34 -0700
+
+xorg-server (2:1.11.4-0ubuntu10.1) precise-proposed; urgency=low
+
+  [ Bryce Harrington ]
+  * Enable 227_null_ptr_midispcur.patch to apply
+
+  [ Chase Douglas ]
+  * Update to xserver 1.12.1 for the input stack
+  * Drop patches merged upstream in 1.12.1:
+    - 501_touch_accept_end.patch
+    - 502_indirect_touch_window_set.patch
+    - 503_fix_mouse_warp.patch
+    - 504_implement_passive_touch_ungrab.patch
+  * Fix patch 506_touchscreen_pointer_emulation_checks.patch after upstream
+    review
+  * Fix various touchscreen issues (LP: #974887)
+    - Add temporary patch 506_touchscreen_fixes.patch, which is a combination of
+      multiple upstream patches
+
+ -- Chase Douglas <chase.douglas@ubuntu.com>  Thu, 19 Apr 2012 12:34:54 -0700
+
+xorg-server (2:1.11.4-0ubuntu10) precise; urgency=low
+
+  * Fix touchscreen pointer emulation (LP: #949791)
+    - Add temporary patch 506_touchscreen_pointer_emulation_checks.patch
+
+ -- Chase Douglas <chase.douglas@ubuntu.com>  Wed, 04 Apr 2012 16:53:33 -0700
+
+xorg-server (2:1.11.4-0ubuntu9) precise; urgency=low
+
+  * Report button press when touchscreen touch is active (LP: #972985)
+    - Add temporary patch 505_query_pointer_touchscreen.patch
+    - Fixes some compiz/unity touchscreen issues
+
+ -- Chase Douglas <chase.douglas@ubuntu.com>  Tue, 03 Apr 2012 19:04:01 -0700
+
+xorg-server (2:1.11.4-0ubuntu8) precise; urgency=low
+
+  [ Chase Douglas ]
+  * Fix crash at startup due to input option abi break (LP: #931397)
+    - Revert two commits from upstream 1.12 input stack
+
+  [ Bryce Harrington ]
+  * debian/patches/227_null_ptr_midispcur.patch:
+    - Check for NULL pointer before dereferencing pointer from
+      miGetDCDevice.  Fixes crash after connecting a bluetooth keyboard.
+      (LP: #930936)
+
+  [ Chase Douglas ]
+  * Fix mouse warping and clipping (LP: #948938)
+    - Add temporary patch 503_fix_mouse_warp.patch
+  * Implement passive touch ungrab (LP: #968726)
+    - Add temporary patch 503_implement_passive_touch_ungrab.patch
+  * Bump lintian standards to 3.9.3
+
+ -- Chase Douglas <chase.douglas@ubuntu.com>  Thu, 29 Mar 2012 18:09:19 -0700
+
+xorg-server (2:1.11.4-0ubuntu7) precise; urgency=low
+
+  * debian/patches/111_armel-drv-fallbacks.patch:
+    - Avoid loading the driver to test if it's available. Xorg will later load
+      and validate the module, and if it's already loaded it'll trigger an
+      error and invalidate the driver (LP: #959928)
+
+ -- Ricardo Salveti de Araujo <ricardo.salveti@linaro.org>  Tue, 20 Mar 2012 02:09:18 -0300
+
+xorg-server (2:1.11.4-0ubuntu6) precise; urgency=low
+
+  * debian/patches/500_pointer_barrier_thresholds.diff:
+    - Don't try to send events from the context of the SIGIO handler.  That
+      leads to the dark side, or at least to server freezes when trying to
+      reveal the launcher in Unity (LP: #946954).  May also fix other seemingly
+      random X server crashes.
+    - Add build-time tests to make check for barrier behaviour.  These are
+      disabled, pending gtest, xorg-gtest, and xserver-xorg-video-dummy MIRs.
+
+ -- Christopher James Halse Rogers <raof@ubuntu.com>  Fri, 09 Mar 2012 19:16:02 +1100
+
+xorg-server (2:1.11.4-0ubuntu5) precise; urgency=low
+  * Update to 1.12 input stack 
+  * Drop input patches that have been merged upstream:
+    - 600-Revert-dix-deduplicate-callers-of-DeliverDeviceEvent.patch
+    - 601-Store-window-pointer-in-touch-listener-record.patch
+    - 602-Factor-out-TouchEnd-generation-and-delivery.patch
+    - 603-Export-TouchEventRejected-as-TouchRejected.patch
+    - 604-Move-AllowTouch-to-dix-touch.c-and-rename-to-TouchAc.patch
+    - 605-Check-for-proper-window-ID-when-processing-touch-all.patch
+    - 606-Implement-early-touch-reject.patch
+    - 607-Implement-touch-early-accept.patch
+    - 608-dix-fix-an-out-of-memory-crash.patch
+    - 609-Xi-handle-new-XIAllowEvents-request-in-inputproto-2..patch
+    - 610-Fix-scrolling.patch
+    - 611-Fix-touch-punt-crash.patch
+    - 612-Fix-vcp-touches-corruption.patch
+    - 613-Keep-vcp-touch-class.patch
+  * Fix indirect touch grab handling (LP: #929408)
+    - Add temporary patch 501_touch_accept_end.patch
+    - Add temporary patch 502_indirect_touch_window_set.patch
+
+ -- Chase Douglas <chase.douglas@ubuntu.com>  Wed, 07 Mar 2012 15:36:20 -0800
+
+xorg-server (2:1.11.4-0ubuntu4) precise; urgency=low
+
+  * debian/patches/500_pointer_barrier_thresholds.diff:
+    - Make the velocity calculation more robust on screen edges.  Fixes reveal
+      behaviour on nVidia 295.20 driver, which now clamps the pointer to the
+      visible screen area. (LP: #937792)
+
+ -- Christopher James Halse Rogers <raof@ubuntu.com>  Tue, 21 Feb 2012 17:04:41 +1100
+
+xorg-server (2:1.11.4-0ubuntu3) precise; urgency=low
+
+  * Fix touch class memory corruption
+    - Add 612-Fix-vcp-touches-corruption.patch
+    - Add 613-Keep-vcp-touch-class.patch
+
+ -- Chase Douglas <chase.douglas@ubuntu.com>  Mon, 13 Feb 2012 15:54:04 -0800
+
+xorg-server (2:1.11.4-0ubuntu2) precise; urgency=low
+
+  * Fix crash when punting a touch to a non-existent owner
+    - Add 611-Fix-touch-punt-crash.patch
+
+ -- Chase Douglas <chase.douglas@ubuntu.com>  Mon, 13 Feb 2012 12:10:02 -0800
+
+xorg-server (2:1.11.4-0ubuntu1) precise; urgency=low
+
+  [ Chase Douglas ]
+  * Allow for non-root config paths so xorg-gtest can be run without root
+    - Add 225_non-root_config_paths.patch backported from upstream
+
+  [ Alberto Milone]
+  * debian/patches/226_fall_back_to_autoconfiguration.patch:
+    - Fall back to autoconfiguration for graphics drivers in some cases
+      instead of letting X fail when configuration files are available.
+
+  [ Chase Douglas ]
+  * Update to 1.11.99.902 input stack
+  * Update to 1.11.4 for everything else
+  * Drop input patches that have been merged upstream:
+    - 220_dont_scale_indirect.patch
+    - 221_pointer_motion_update_fix.patch
+    - 222_touch_valuators_absolute.patch
+    - 223_indirect_touch_x_y_valuators.patch
+  * Add reviewed input patches that have not been merged upstream yet:
+    - 600-Revert-dix-deduplicate-callers-of-DeliverDeviceEvent.patch
+    - 601-Store-window-pointer-in-touch-listener-record.patch
+    - 602-Factor-out-TouchEnd-generation-and-delivery.patch
+    - 603-Export-TouchEventRejected-as-TouchRejected.patch
+    - 604-Move-AllowTouch-to-dix-touch.c-and-rename-to-TouchAc.patch
+    - 605-Check-for-proper-window-ID-when-processing-touch-all.patch
+    - 606-Implement-early-touch-reject.patch
+    - 607-Implement-touch-early-accept.patch
+    - 608-dix-fix-an-out-of-memory-crash.patch
+    - 609-Xi-handle-new-XIAllowEvents-request-in-inputproto-2..patch
+    - 610-Fix-scrolling.patch (LP: #925785)
+  * Bump deps on x11proto-input-dev to 2.1.99.6
+
+ -- Chase Douglas <chase.douglas@ubuntu.com>  Fri, 10 Feb 2012 16:27:25 -0800
+
+xorg-server (2:1.11.3-0ubuntu10) precise; urgency=low
+
+  * Drop 214_glx_dri_searchdirs.patch, drisearchdirs is no longer
+    exported in mesa's dri.pc because of multiarch and the only consumer
+    (dri-alternates) is no longer used.
+
+ -- Robert Hooker <sarvatt@ubuntu.com>  Thu, 02 Feb 2012 12:08:55 -0500
+
+xorg-server (2:1.11.3-0ubuntu9) precise; urgency=low
+
+  * debian/patches/500_pointer_barrier_thresholds.diff:
+    - Implement proposed XFIXES 6.0 protocol.  This protocol is subject to
+      change, use at own risk!
+  * debian/control:
+    - Bump build-dep on x11proto-fixes to pick up new protocol definition
+
+ -- Christopher James Halse Rogers <raof@ubuntu.com>  Fri, 27 Jan 2012 20:05:42 +1100
+
+xorg-server (2:1.11.3-0ubuntu8) precise; urgency=low
+
+  * debian/patches/224_return_BadWindow_not_BadMatch.diff:
+    - Fix the error values of a whole slew of window-related calls.
+      Fixes some gnome-settings-daemon aborts in XLib (LP: #903973)
+
+ -- Christopher James Halse Rogers <raof@ubuntu.com>  Mon, 23 Jan 2012 16:09:29 +1100
+
+xorg-server (2:1.11.3-0ubuntu7) precise; urgency=low
+
+  * Fixes for relative devices
+    - Add 220_dont_scale_indirect.patch
+    - Add 221_pointer_motion_update_fix.patch
+    - Add 222_touch_valuators_absolute.patch
+    - Add 223_indirect_touch_x_y_valuators.patch
+
+ -- Chase Douglas <chase.douglas@ubuntu.com>  Thu, 19 Jan 2012 16:23:28 -0800
+
+xorg-server (2:1.11.3-0ubuntu6) precise; urgency=low
+
+  * Bump Build-Depends on x11proto-input-dev to 2.1.99.5
+
+ -- Chase Douglas <chase.douglas@ubuntu.com>  Tue, 17 Jan 2012 22:22:57 +0100
+
+xorg-server (2:1.11.3-0ubuntu5) precise; urgency=low
+
+  * Add Breaks clause for XInput changes
+    - qt4-x11 < 4:4.8.0-1ubuntu2 (crashes due to XI ABI change)
+    - utouch-geis < 2.2.3 (infinite loop if utouch XCB backend is unavailable)
+    - utouch-frame < 2.1.0 (crashes due to XI ABI change)
+    - unity < 5.0.0 (crashes if utouch stack is unavailable)
+
+ -- Chase Douglas <chase.douglas@ubuntu.com>  Tue, 17 Jan 2012 22:03:35 +0100
+
+xorg-server (2:1.11.3-0ubuntu4) precise; urgency=low
+
+  * Merge in input changes from upstream master through commit 954bb99
+  * Remove temporary patch 220_grab_event_time.patch
+
+ -- Chase Douglas <chase.douglas@ubuntu.com>  Tue, 17 Jan 2012 19:52:04 +0100
+
+xorg-server (2:1.11.3-0ubuntu3) precise; urgency=low
+
+  * Add temporary patch for fixing grab time bug
+    - Add 220_grab_event_time.patch
+
+ -- Chase Douglas <chase.douglas@ubuntu.com>  Wed, 11 Jan 2012 07:41:04 -0800
+
+xorg-server (2:1.11.3-0ubuntu2) precise; urgency=low
+
+  * Merge in input changes from upstream master through commit 8722ad6
+  * Remove temporary patch 220_test-loop.patch, merged upstream
+
+ -- Chase Douglas <chase.douglas@ubuntu.com>  Tue, 10 Jan 2012 10:48:31 +0100
+
+xorg-server (2:1.11.3-0ubuntu1) precise; urgency=low
+
+  * New upstream bugfix release
+  * Merge in input changes from upstream master through commit e7df42a
+  * Bump input ABI
+  * Bump x11proto-input-dev build dependency version
+  * Add temporary patch for fixing a test case loop
+    - Add 220_test-loop.patch
+
+ -- Chase Douglas <chase.douglas@ubuntu.com>  Thu, 22 Dec 2011 12:11:39 -0800
+
+xorg-server (2:1.11.2.902-1ubuntu1) precise; urgency=low
+
+  * Drop prototype XI multitouch patches
+  * Merge in input changes from upstream master through commit 7da7aa9
+  * Bump input ABI
+  * Refresh patches
+    - Drop 210_pixman_null_ptr_check.patch, merged upstream
+
+ -- Chase Douglas <chase.douglas@ubuntu.com>  Wed, 14 Dec 2011 16:06:37 -0800
+
+xorg-server (2:1.11.2.902-1) unstable; urgency=low
+
+  [ Julien Cristau ]
+  * New upstream release candidate (1.11.3 RC2)
+
+ -- Cyril Brulebois <kibi@debian.org>  Sat, 10 Dec 2011 22:36:42 +0100
+
 xorg-server (2:1.11.2.901-1) unstable; urgency=low
 
   * New upstream release candidate (1.11.3 RC1):
@@ -1309,6 +3242,17 @@ xorg-server (2:1.11.1-1) unstable; urgen
 
  -- Cyril Brulebois <kibi@debian.org>  Sat, 24 Sep 2011 11:23:17 +0200
 
+xorg-server (2:1.11.0-1ubuntu1~prep1) oneiric; urgency=low
+
+  * Merge from Debian experimental.  Remaining Ubuntu changes
+    - Fill in later
+  * Drop all XI2.1 multitouch patches, pending Chase's rework.
+  * 217_revert_bgnonevisitwindow.patch:
+  * 219_fedora-pointer-barriers.diff:
+    - Drop; included in the new upstream release.
+
+ -- Christopher James Halse Rogers <chris@cooperteam.net>  Sat, 10 Sep 2011 21:26:49 -0700
+
 xorg-server (2:1.11.0-1) unstable; urgency=low
 
   [ Julien Cristau ]
@@ -1357,6 +3301,214 @@ xorg-server (2:1.10.99.901+git20110731-1
 
  -- Julien Cristau <jcristau@debian.org>  Sun, 31 Jul 2011 22:15:07 +0200
 
+xorg-server (2:1.10.4-1ubuntu1) oneiric; urgency=low
+
+  [ Christopher James Halse Rogers ]
+  * Drop i8xx-disablement patch.  2.6.39 and later kernels contain a patch
+    which alledgedly fixes the cache-incoherency problems. (LP: #817814)
+
+  [ Ricardo Salveti de Araujo ]
+  * debian/patches/112_armel-pvr-drv.patch:
+    - Include support for the pvr driver available on OMAP 4 (LP: #828494)
+
+  [ Timo Aaltonen ]
+  * Merge from Debian unstable.
+    - Fixes Xephyr assert failure in dixGetPrivateAddr (LP: #821090)
+  * debian/rules: Modify the patch stampdir creation.
+  * Update patch 500_xi2.1.patch to apply.
+  * Refresh patches.
+  * debian/rules: Add PATH for the xvfb-run check, otherwise Xvfb is not found.
+  * debian/rules: Shift the xvfb-run test to be run later, to ensure that the
+    binaries are installed.
+
+  [ Bryce Harrington ]
+  * debian/rules: Add check target invoking xvfb-run to test that it works
+  * debian/control: Add build dependency on xauth, required by xvfb-run
+
+  [ Chase Douglas ]
+  * Add fixes for touch grab handling, courtesy of Carlos Garnacho
+    - 505_Xi_ensure_replayed_touch_events_have_devices.patch
+    - 506_Xi_ensure_touch_events_update_currentTime.patch
+    - 507_dix_Ensure_touch_events_are_delivered_to_next_client.patch
+
+ -- Timo Aaltonen <tjaalton@ubuntu.com>  Fri, 09 Sep 2011 14:13:07 +0300
+
+xorg-server (2:1.10.4-1) unstable; urgency=low
+
+  [ Timo Aaltonen ]
+  * New upstream release.
+
+ -- Cyril Brulebois <kibi@debian.org>  Wed, 24 Aug 2011 10:44:42 +0200
+
+xorg-server (2:1.10.3-1) unstable; urgency=medium
+
+  [ Cyril Brulebois ]
+  * New upstream release (with just a version bump).
+  * Remove the Replaces: xdmx from xdmx-tools, that was before lenny.
+  * Add a Breaks: libgl1-mesa-dri-no-multiarch, to handle upgrades from
+    squeeze-backports (without multiarch) to wheezy (with multiarch).
+  * Set urgency to “medium” to speed things up. Migration to testing is
+    a prerequisite for squeeze backports.
+
+  [ Julien Cristau ]
+  * Merge packaging changes lost from the 1.7 (squeeze) branch:
+    + Add Breaks on drivers abandoned between lenny and squeeze.  This helps
+      apt decide to remove them instead of removing all of X.  Thanks, David
+      Kalnischkies!
+    + Set default xkb rules to evdev on linux, to work around a wrong default in
+      configure.ac and an Xorg issue where it reverts to the default on reset.
+      Thanks to Bastian Blank for the report.
+
+ -- Cyril Brulebois <kibi@debian.org>  Sun, 07 Aug 2011 19:35:07 +0200
+
+xorg-server (2:1.10.2.902-1ubuntu3) oneiric; urgency=low
+
+  * debian/patches/220_xi21_always_deliver_raw_events.diff:
+    - Backport patch from the mailing list to deliver raw events regardless of
+      grab state.  Bon appétit, DX!
+
+ -- Christopher James Halse Rogers <raof@ubuntu.com>  Mon, 11 Jul 2011 10:03:26 +1000
+
+xorg-server (2:1.10.2.902-1ubuntu2) oneiric; urgency=low
+
+  [ Bryce Harrington ]
+  * rules:  patch needs to depend on stampdir, else it doesn't get created,
+    and 'debian/rules patch' malfunctions.
+
+  [ Chase Douglas ]
+  * Fix event handling when neither X nor Y coordinates are set (LP: #806256)
+    - Added 504_fix_no_coords.patch
+
+  [ Christopher James Halse Rogers ]
+  * rules: Add both /usr/lib/xorg/extra-modules and
+    /usr/lib/$MULTIARCH/xorg/extra-modules for extra modules.
+    Fixes GLX for the proprietary drivers after a mesa upgrade (LP: #807209)
+
+ -- Christopher James Halse Rogers <raof@ubuntu.com>  Fri, 08 Jul 2011 13:16:59 +1000
+
+xorg-server (2:1.10.2.902-1ubuntu1) oneiric; urgency=low
+
+  * Merge from Debian unstable. (LP: #441653)
+    - Update 500_xi2.1.patch to apply.
+    - Drop patch 218_randr-check-rotated-virtual-size-limits-correctly.diff,
+      fixed upstream.
+  * Update the crtc confinement patch with one that should work, with
+    further fixes from upstream. (LP: #389519)
+  * Dropped a bunch of old Breaks from xserver-xorg-core.
+
+ -- Timo Aaltonen <tjaalton@ubuntu.com>  Tue, 05 Jul 2011 16:22:23 +0300
+
+xorg-server (2:1.10.2.902-1) unstable; urgency=low
+
+  * New upstream release (1.10.3 rc2):
+    - DIX: Set backgroundState correctly for root window (Closes: #632134).
+  * Drop 20-workaround-36986.diff, fixed upstream.
+  * Bump Standards-Version to 3.9.2 (no changes).
+
+ -- Cyril Brulebois <kibi@debian.org>  Sat, 02 Jul 2011 11:58:58 +0200
+
+xorg-server (2:1.10.2-2) unstable; urgency=low
+
+  * Bump libgl1-mesa-dri versioned Recommends to 7.10.2-4, to lower the
+    odds of having a server built against multiarched mesa, installed
+    along a pre-multiarch mesa. The Breaks in mesa packages take care of
+    the other way round already.
+  * And since the server's binNMU managed to migrate to testing way too
+    early, add a Breaks against pre-multiarch libgl1-mesa-dri and
+    libgl1-mesa-dri-experimental.
+
+ -- Cyril Brulebois <kibi@debian.org>  Fri, 17 Jun 2011 18:09:36 +0200
+
+xorg-server (2:1.10.2-1ubuntu1) oneiric; urgency=low
+
+  [ Timo Aaltonen ]
+  * Merge from Debian unstable, remaining changes:
+     - rules:
+      + Disable SELinux, libaudit-dev is not in main yet. (LP #406226)
+      + Add --with-extra-module-dir to support GL alternatives.
+      + Mention Ubuntu support in builderstring rather than package uploader's
+        email address.
+      + Enable multitouch gestures.
+    - control:
+      + Xvfb depends on xauth, x11-xkb-utils, recommends libgl1-mesa-dri.
+        (LP #500102)
+      + Add breaks for incompatible drivers. (LP #614993)
+      + Drop libaudit-dev from build-deps.
+      + Build-depend on newer mesa to pick up DRI search paths variable.
+      + Bump dependency on x11proto-input-dev for Xi 2.1
+      + Drop linux-any specifier to make pbuilder less narky.
+    - local/xvfb-run*: Add correct docs about error codes. (LP #328205)
+    - debian/patches:
+      + 100_rethrow_signals.patch:
+        When aborting, re-raise signals for apport
+      + 105_nvidia_fglrx_autodetect.patch:
+        Load proprietary drivers automatically when installed.
+      + 109_fix-swcursor-crash.patch:
+        Avoid dereferencing null pointer while reloading cursors during
+        resume. (LP #371405)
+      + 111_armel-drv-fallbacks.patch:
+        Add support for armel driver fallbacks.
+      + 122_xext_fix_card32_overflow_in_xauth.patch:
+        Fix server crash when “xauth generate” is called with large timeout.
+      + 157_check_null_modes.patch, 162_null_crtc_in_rotation.patch,
+        166_nullptr_xinerama_keyrepeat.patch, 167_nullptr_xisbread.patch
+        172_cwgetbackingpicture_nullptr_check.patch:
+        Fix various segfaults in xserver by checking pointers for NULL
+        values before dereferencing them.
+      + 165_man_xorg_conf_no_device_ident.patch
+        Correct man page
+      + 168_glibc_trace_to_stderr.patch:
+        Report abort traces to stderr instead of terminal
+      + 188_default_primary_to_first_busid.patch:
+        Pick the first device and carry on (LP #459512)
+      + 190_cache-xkbcomp_output_for_fast_start_up.patch:
+        Cache keyboard settings.
+      + 191-Xorg-add-an-extra-module-path.patch:
+        Add support for the alternative module path.
+      + 198_nohwaccess.patch:
+        Adds a -nohwaccess argument to make X not access the hardware
+        ports directly.
+      + 200_randr-null.patch:
+        Clarify a pointer initialization.
+      + 206_intel_8xx_default_to_fbdev.patch:
+        Makes 8xx class intel GPUs default to fbdev for stability. (LP #633593)
+      + 208_switch_on_release.diff:
+        Switch keyboard layouts on key-release rather than key-press
+  	(LP #36812)
+      + 209_add_legacy_bgnone_option.patch:
+        Add -nr as a synonym for -background none until all ?DM are updated for
+  	the new option.
+      + 210_pixman_null_ptr_check.patch:
+        Catch NULL pointer access after pixman_image_create_bits() failure
+  	(LP #705078)
+      + 214_glx_dri_searchdirs.patch:
+        Search in same paths as mesa for DRI drivers for AIGLX so we can handle
+        UMS fallback for radeon gracefully.
+      + 217_revert_bgnonevisitwindow.patch:
+        Revert a commit that causes brief graphical corruption. (LP: 726807)
+      + 218_randr-check-rotated-virtual-size-limits-correctly.diff:
+        Fix rotation with nvidia driver. (LP: 740933)
+      + 500_xi2.1.patch,
+        501_xf86CoordinatesToWindow.patch,
+        502_gestures-extension.patch:
+        Add Xi 2.1 and Gesture extension support.
+      + 503_fix_masked_transformed_valuators.patch:
+        Fix masked transformed valuator handling (LP #774938)
+  * Drop patch 215_glx_drawable_refcounting.diff, similar fix included
+    upstream.
+  * Drop patch 121_only_switch_vt_when_active.diff, doesn't seem to
+    work anymore.
+  * videoabiver, inputabiver, xserver-xorg-dev.install:
+    Drop changes that are obsolete post-natty.
+  * Add 219_fedora-pointer-barrier.diff:
+    Pointer barrier and cursor confinement patch backported to 1.10.
+
+  [ Christopher James Halse Rogers ]
+  * debian/control:
+    Bump mesa-common-dev build-dep to pick up multiarch DRI paths.
+
+ -- Christopher James Halse Rogers <raof@ubuntu.com>  Wed, 15 Jun 2011 10:51:18 +1000
+
 xorg-server (2:1.10.2-1) unstable; urgency=low
 
   * New upstream release.
@@ -1381,12 +3533,43 @@ xorg-server (2:1.10.1-2) unstable; urgen
 
  -- Julien Cristau <jcristau@debian.org>  Thu, 28 Apr 2011 13:28:58 +0200
 
+xorg-server (2:1.10.1-1ubuntu3) oneiric; urgency=low
+
+  * Add 218_randr-check-rotated-virtual-size-limits-correctly.diff
+    - Fix rotation with nvidia driver. (LP: #740933)
+
+ -- Timo Aaltonen <tjaalton@ubuntu.com>  Fri, 20 May 2011 00:07:11 +0300
+
+xorg-server (2:1.10.1-1ubuntu2) oneiric; urgency=low
+
+  * Fix masked transformed valuator handling (LP: #774938)
+    - Added debian/patches/503_fix_masked_transformed_valuators.patch
+
+ -- Bryce Harrington <bryce@ubuntu.com>  Tue, 17 May 2011 14:44:58 -0700
+
+xorg-server (2:1.10.1-1ubuntu1) natty; urgency=low
+
+  * Merge from Debian experimental (LP: #757972)
+
+ -- Timo Aaltonen <tjaalton@ubuntu.com>  Tue, 19 Apr 2011 16:12:14 +0300
+
 xorg-server (2:1.10.1-1) experimental; urgency=low
 
   * New upstream release.
 
  -- Cyril Brulebois <kibi@debian.org>  Tue, 19 Apr 2011 03:08:08 +0200
 
+xorg-server (2:1.10.0.902-1ubuntu1) natty; urgency=low
+
+  * Merge from Debian experimental.
+    - dropped patches, included upstream:
+      213_xichangehierarchy-check-oom.patch
+      216_fix_sdksyms_build.diff, included upstream.
+      218_getValuatorEvents_cleanup.patch
+      219_xi1_handle_noncontinuous_valuator_data.patch
+
+ -- Timo Aaltonen <tjaalton@ubuntu.com>  Mon, 11 Apr 2011 09:51:56 +0300
+
 xorg-server (2:1.10.0.902-1) experimental; urgency=low
 
   * New upstream release (1.10.1 rc2).
@@ -1405,6 +3588,130 @@ xorg-server (2:1.10.0.901-1) experimenta
 
  -- Cyril Brulebois <kibi@debian.org>  Wed, 30 Mar 2011 02:22:56 +0200
 
+xorg-server (2:1.10.0-0ubuntu3) natty; urgency=low
+
+  [ Bryce Harrington ]
+  * patches/111_armel-drv-fallbacks.patch: Always fallback to -fbdev,
+    not just when no other X driver matches. (Thanks jcristau)
+
+  [ Chase Douglas ]
+  * Fix jumpy cursor in XI 1.x applications.
+    (LP: #736500)
+    - Added 218_getValuatorEvents_cleanup.patch
+    - Added 219_xi1_handle_noncontinuous_valuator_data.patch
+
+ -- Bryce Harrington <bryce@ubuntu.com>  Thu, 31 Mar 2011 23:58:07 -0700
+
+xorg-server (2:1.10.0-0ubuntu2) natty; urgency=low
+
+  [ Chase Douglas ]
+  * patches/500_xi2.1.patch: Process ownership properly when activating an
+    async passive grab.
+    (LP: #733483)
+
+  [ Bryce Harrington ]
+  * 217_revert_bgnonevisitwindow.patch: Cherrypick from upstream.  Drops
+    recent change that inhibits drawing backfill for non-bg-None windows.
+    This causes a regression on -ati (at least) where menus and other
+    windows display graphical corruption briefly.
+    (LP: #726807)
+
+ -- Bryce Harrington <bryce@ubuntu.com>  Thu, 24 Mar 2011 15:27:40 -0700
+
+xorg-server (2:1.10.0-0ubuntu1) natty; urgency=low
+
+  * Update to new upstream final release.
+    + Drop 16-construct-paths-in-doxygen.conf.diff; included in new upstream.
+  * debian/patches/216_fix_sdksyms_build.diff:
+    + Cherry-pick from 1.10 branch, fixing the stale sdksyms.c file picked up
+      in the udeb build, causing the udeb build to fail with missing symbols.
+  * Merge from unreleased Debian experimental.  Remaining Ubuntu changes:
+    - rules:
+      + Disable SELinux, libaudit-dev is not in main yet. (LP #406226)
+      + Enable xcsecurity. (LP #247537)
+      + Add --with-extra-module-dir to support GL alternatives.
+      + Mention Ubuntu support in builderstring rather than package uploader's
+        email address.
+    - control:
+      + Xvfb depends on xauth, x11-xkb-utils. (LP #500102)
+      + Add breaks for incompatible drivers. (LP #614993)
+      + Drop libaudit-dev from build-deps.
+      + Build-depend on newer mesa to pick up DRI search paths variable.
+      + Bump dependency on x11proto-input-dev for Xi 2.1
+      + Drop linux-any specifier to make pbuilder less narky.
+      + Bump build-depends on mesa-common-dev to pick up dri.pc DRI search
+        paths change for 214_glx_dri_searchdirs.patch
+    - local/xvfb-run*: Add correct docs about error codes. (LP #328205)
+    - debian/patches:
+      + 100_rethrow_signals.patch:
+        When aborting, re-raise signals for apport
+      + 105_nvidia_fglrx_autodetect.patch:
+        Load proprietary drivers automatically when installed.
+      + 109_fix-swcursor-crash.patch:
+        Avoid dereferencing null pointer while reloading cursors during
+        resume. (LP #371405)
+      + 111_armel-drv-fallbacks.patch:
+        Add support for armel driver fallbacks.
+      + 121_only_switch_vt_when_active.diff:
+        Add a check to prevent the X server from changing the VT when killing
+        GDM from the console.
+      + 122_xext_fix_card32_overflow_in_xauth.patch:
+        Fix server crash when “xauth generate” is called with large timeout.
+      + 157_check_null_modes.patch, 162_null_crtc_in_rotation.patch,
+        166_nullptr_xinerama_keyrepeat.patch, 167_nullptr_xisbread.patch
+        172_cwgetbackingpicture_nullptr_check.patch:
+        Fix various segfaults in xserver by checking pointers for NULL
+        values before dereferencing them.
+      + 165_man_xorg_conf_no_device_ident.patch
+        Correct man page
+      + 168_glibc_trace_to_stderr.patch:
+        Report abort traces to stderr instead of terminal
+      + 184_virtual_devices_autodetect.patch:
+        Use vesa for qemu device, which is not supported by cirrus
+      + 188_default_primary_to_first_busid.patch:
+        Pick the first device and carry on (LP #459512)
+      + 190_cache-xkbcomp_output_for_fast_start_up.patch:
+      + 191-Xorg-add-an-extra-module-path.patch:
+        Add support for the alternatives module path.
+      + 198_nohwaccess.patch:
+        Adds a -nohwaccess argument to make X not access the hardware
+        ports directly.
+      + 200_randr-null.patch:
+        Clarify a pointer initialization.
+      + 206_intel_8xx_default_to_fbdev.patch:
+        Makes 8xx class intel GPUs default to fbdev for stability. (LP #633593)
+      + 208_switch_on_release.diff:
+        Switch keyboard layouts on key-release rather than key-press
+  	(LP #36812)
+      + 209_add_legacy_bgnone_option.patch:
+        Add -nr as a synonym for -background none until all ?DM are updated for
+  	the new option.
+      + 210_pixman_null_ptr_check.patch:
+        Catch NULL pointer access after pixman_image_create_bits() failure
+  	(LP #705078)
+      + 213_xichangehierarchy-check-oom.patch:
+        Add NULL pointer check for out-of-memory conditions. (LP #720445)
+      + 214_glx_dri_searchdirs.patch:
+        Search in same paths as mesa for DRI drivers for AIGLX so we can handle
+        UMS fallback for radeon gracefully.
+      + 215_glx_drawable_refcounting.diff:
+        Prevents segfault on logout and server regenerate, and possibly other
+        times. (LP #711422)
+      + 500_xi2.1.patch,
+        501_xf86CoordinatesToWindow.patch,
+        502_gestures-extension.patch:
+        Add Xi 2.1 and Gesture extension support.
+  * debian/serverminver:
+    - Bump to 1.10.0-0ubuntu1~ for Xi 2.1 ABI
+  * New upstream release fixes crash in Record, trigerred by x11vnc
+    (LP: #525066)
+  * Refresh 500_xi2.1.patch for new upstream version
+  * debian/videoabiver:
+    - Bump to 10 for XRandR 1.4 revert.
+
+ -- Cyril Brulebois <kibi@debian.org>  Wed, 30 Mar 2011 02:22:56 +0200
+
+
 xorg-server (2:1.9.99.903-1) experimental; urgency=low
 
   * New upstream release candidate (1.10 rc3).
@@ -1428,6 +3735,136 @@ xorg-server (2:1.9.99.902-3) experimenta
 
  -- Cyril Brulebois <kibi@debian.org>  Wed, 23 Feb 2011 13:36:13 +0100
 
+xorg-server (2:1.9.99.902-2ubuntu2) natty; urgency=low
+
+  [ Timo Aaltonen ]
+  * Remove 169_mipointer_nullptr_checks.patch, fixed in another way
+    upstream since 1.6.1.901.
+
+  [ Chase Douglas ]
+  * Cancel touch clients if emulated button press is delivered.
+    (LP: #725191)
+  * Check slave device touch selection mask during implicit grab.
+    (LP: #725241)
+  * Cancel slave touch selections when attached to master device.
+    (LP: #723904)
+  * Check for touch selections only when there are active clients.
+    (LP: #723900)
+  * Prevent pointer motion when more than one touch on touchpad.
+    (LP: #730881)
+
+  [ Bryce Harrington ]
+  * Drop specification for linux-any.  Breaks pbuilder test builds.
+
+ -- Chase Douglas <chase.douglas@ubuntu.com>  Mon, 07 Mar 2011 14:28:02 -0500
+
+xorg-server (2:1.9.99.902-2ubuntu1) natty; urgency=low
+
+  [ Christopher James Halse Rogers ]
+  * Merge from Debian experimental.  Remaining Ubuntu changes:
+    - rules:
+      + Disable SELinux, libaudit-dev is not in main yet. (LP #406226)
+      + Enable xcsecurity. (LP #247537)
+      + Add --with-extra-module-dir to support GL alternatives.
+      + Mention Ubuntu support in builderstring rather than package uploader's
+        email address.
+    - control:
+      + Xvfb depends on xauth, x11-xkb-utils. (LP #500102)
+      + Add breaks for incompatible drivers. (LP #614993)
+      + Drop libaudit-dev from build-deps.
+      + Build-depend on newer mesa to pick up DRI search paths variable.
+    - local/xvfb-run*: Add correct docs about error codes. (LP #328205)
+    - debian/patches:
+      + 100_rethrow_signals.patch:
+        When aborting, re-raise signals for apport
+      + 105_nvidia_fglrx_autodetect.patch:
+        Load proprietary drivers automatically when installed.
+      + 109_fix-swcursor-crash.patch:
+        Avoid dereferencing null pointer while reloading cursors during
+        resume. (LP: #371405)
+      + 111_armel-drv-fallbacks.patch:
+        Add support for armel driver fallbacks.
+      + 121_only_switch_vt_when_active.diff:
+        Add a check to prevent the X server from changing the VT when killing
+        GDM from the console.
+      + 122_xext_fix_card32_overflow_in_xauth.patch:
+        Fix server crash when “xauth generate” is called with large timeout.
+      + 157_check_null_modes.patch, 162_null_crtc_in_rotation.patch,
+        166_nullptr_xinerama_keyrepeat.patch, 167_nullptr_xisbread.patch
+        169_mipointer_nullptr_checks.patch,
+        172_cwgetbackingpicture_nullptr_check.patch:
+        Fix various segfaults in xserver by checking pointers for NULL
+        values before dereferencing them.
+      + 165_man_xorg_conf_no_device_ident.patch
+        Correct man page
+      + 168_glibc_trace_to_stderr.patch:
+        Report abort traces to stderr instead of terminal
+      + 184_virtual_devices_autodetect.patch:
+        Use vesa for qemu device, which is not supported by cirrus
+      + 188_default_primary_to_first_busid.patch:
+        Pick the first device and carry on (LP: #459512)
+      + 190_cache-xkbcomp_output_for_fast_start_up.patch:
+      + 191-Xorg-add-an-extra-module-path.patch:
+        Add support for the alternatives module path.
+      + 198_nohwaccess.patch:
+        Adds a -nohwaccess argument to make X not access the hardware
+        ports directly.
+      + 200_randr-null.patch:
+        Clarify a pointer initialization.
+      + 206_intel_8xx_default_to_fbdev.patch:
+        Makes 8xx class intel GPUs default to fbdev for stability. (LP: #633593)
+      + 208_switch_on_release.diff:
+        Switch keyboard layouts on key-release rather than key-press
+  	(LP #36812)
+      + 209_add_legacy_bgnone_option.patch:
+        Add -nr as a synonym for -background none until all ?DM are updated for
+  	the new option.
+      + 210_pixman_null_ptr_check.patch:
+        Catch NULL pointer access after pixman_image_create_bits() failure
+  	(LP #705078)
+      + 213_xichangehierarchy-check-oom.patch:
+        Add NULL pointer check for out-of-memory conditions. (LP #720445)
+      + 214_glx_dri_searchdirs.patch:
+        Search in same paths as mesa for DRI drivers for AIGLX so we can handle
+        UMS fallback for radeon gracefully.
+  * 211_glx_fix_bindtextimageext_length_check.patch:
+  * 212_fix_request_length_check_for_createglxpbuffersgix.patch:
+    - Drop; these cherry-picks are included in 1.10RC2
+  * 214_glx_dri_searchdirs.patch:
+    - Fix dlclose/free snafu. (LP: #722563)
+    - Fix nouveau check to downgrade missing DRI error messages to info.
+      We don't support nouveau's 3D, so let's not complain too strenuously
+      when it's not installed.
+  * 215_glx_drawable_refcounting.diff:
+    - Refcount GLXDrawables to avoid use-after-free crashes.  Patch from
+      xorg-devel mailing list.  Prevents segfault on logout and server
+      regenerate, and possibly other times. (LP: #711422)
+  * debian/inputabiver,
+    debian/videoabiver,
+    debian/xserver-xorg-dev.install
+    - Temporarily re-add these to xserver-xorg-dev so we don't need to merge
+      all the driver changes from Debian en masse.  These should be dropped
+      once all drivers have been merged from Debian, and certainly in Natty+1.
+  * debian/serverminver:
+    - Include 2ubuntu1 string; Xi 2.1 bumps the minor input ABI, so drivers
+      built against it need the Xi 2.1 patched server.
+
+  [ Timo Aaltonen ]
+  * debian/patches/216_dix-valuator-count-of-0-is-valid.diff:
+    - For all but motion and proximity events, having no valuators is ok.
+      Regression from 1.9, keyboard events are not converted to protocol
+      events. (LP: #714696)
+
+  [ Chase Douglas ]
+  * Add in preliminary xi2.1 support
+    - Added 500_xi2.1.patch
+    - Moved 202_xf86CoordinationsToWindows.patch to
+      501_xf86CoordinatesToWindow.patch
+    - Moved 203_gestures-extension.patch to 502_gestures-extension.patch
+    - Bump dependency on x11proto-input for xi 2.1
+
+ -- Christopher James Halse Rogers <raof@ubuntu.com>  Wed, 23 Feb 2011 09:40:07 +1100
+
 xorg-server (2:1.9.99.902-2) experimental; urgency=low
 
   * Bump dependency on x11proto-randr-dev, needed since xorg-server.pc
@@ -1465,6 +3902,122 @@ xorg-server (2:1.9.99.902-1) experimenta
 
  -- Cyril Brulebois <kibi@debian.org>  Sat, 19 Feb 2011 15:29:54 +0100
 
+xorg-server (2:1.9.99.901+git20110131.be3be758-0ubuntu6) natty; urgency=low
+
+  * debian/patches/214_glx_dri_searchdirs.patch:
+    - Search for DRI drivers for AIGLX in the same set of directories as mesa.
+      Allows us to fall back to the classic radeon drivers when KMS is not
+      available.
+  * debian/rules:
+    - --disable-builddocs → --disable-devel-docs to match upstream rename.
+      Makes local builds faster and less prone to doxygen errors.
+  * debian/control:
+    - Bump build-depends on mesa to pick up new drisearchdirs variable in
+      dri.pc
+
+ -- Christopher James Halse Rogers <raof@ubuntu.com>  Fri, 18 Feb 2011 17:03:46 +1100
+
+xorg-server (2:1.9.99.901+git20110131.be3be758-0ubuntu5) natty; urgency=low
+
+  * Add 213_xichangehierarchy-check-oom.patch: Another NULL pointer check
+    for out-of-memory conditions, this time leading to a segfault in an
+    unchecked calloc in XISendDeviceHierarchyEvent().
+    (LP: #720445)
+
+ -- Bryce Harrington <bryce@ubuntu.com>  Wed, 16 Feb 2011 16:46:35 -0800
+
+xorg-server (2:1.9.99.901+git20110131.be3be758-0ubuntu4) natty; urgency=low
+
+  * Add 211_glx_fix_bindtextimageext_length_check.patch,
+    212_fix_request_length_check_for_createglxpbuffersgix.patch:
+    - Correct wrong request size match for xGLXCreateGLXPbufferSGIXReq.
+      This can result in some invalid BadLength errors.
+      (LP: #714280)
+
+ -- Bryce Harrington <bryce@ubuntu.com>  Mon, 14 Feb 2011 12:07:45 -0800
+
+xorg-server (2:1.9.99.901+git20110131.be3be758-0ubuntu3) natty; urgency=low
+
+  * Restore 208_switch_on_release.diff - the patch does not appear to be
+    upstream actually.  Users confirm the fix regressed without it.
+    (LP: #711842)
+  * Add 210_pixman_null_ptr_check.patch: pixman_image_create_bits() can
+    return NULL under a variety of circumstances, thus needs checked
+    before dereferencing it in the pixman_image_set_has_client_clip()
+    call.
+    (LP: #705078, deb: 596155, fdo: 28882)
+
+ -- Bryce Harrington <bryce@ubuntu.com>  Thu, 03 Feb 2011 22:42:52 -0800
+
+xorg-server (2:1.9.99.901+git20110131.be3be758-0ubuntu1) natty; urgency=low
+
+  * Merge from (unreleased) debian-experimental.  Remaining Ubuntu changes:
+    - rules:
+      + Disable SELinux, libaudit-dev is not in main yet. (LP: #406226)
+      + Enable xcsecurity. (LP: #247537)
+      + Add --with-extra-module-dir to support GL alternatives.
+    - control:
+      + Xvfb depends on xauth, x11-xkb-utils. (LP: #500102)
+      + Add breaks for incompatible drivers. (LP: #614993)
+      + Drop libaudit-dev from build-deps.
+    - local/xvfb-run*: Add correct docs about error codes. (LP #328205)
+    - debian/patches:
+      + 100_rethrow_signals.patch:
+        When aborting, re-raise signals for apport
+      + 109_fix-swcursor-crash.patch:
+        Avoid dereferencing null pointer while reloading cursors during
+        resume. (LP: #371405)
+      + 111_armel-drv-fallbacks.patch:
+        Add support for armel driver fallbacks.
+      + 121_only_switch_vt_when_active.diff:
+        Add a check to prevent the X server from changing the VT when killing
+        GDM from the console.
+      + 122_xext_fix_card32_overflow_in_xauth.patch:
+        Fix server crash when “xauth generate” is called with large timeout.
+      + 157_check_null_modes.patch, 162_null_crtc_in_rotation.patch,
+        166_nullptr_xinerama_keyrepeat.patch, 167_nullptr_xisbread.patch
+        169_mipointer_nullptr_checks.patch,
+        172_cwgetbackingpicture_nullptr_check.patch:
+        Fix various segfaults in xserver by checking pointers for NULL
+        values before dereferencing them.
+      + 165_man_xorg_conf_no_device_ident.patch
+        Correct man page
+      + 168_glibc_trace_to_stderr.patch:
+        Report abort traces to stderr instead of terminal
+      + 184_virtual_devices_autodetect.patch:
+        Use vesa for qemu device, which is not supported by cirrus
+      + 188_default_primary_to_first_busid.patch:
+        Pick the first device and carry on (LP: #459512)
+      + 190_cache-xkbcomp_output_for_fast_start_up.patch:
+      + 191-Xorg-add-an-extra-module-path.patch:
+        Add support for the alternatives module path.
+      + 198_nohwaccess.patch:
+        Adds a -nohwaccess argument to make X not access the hardware
+        ports directly.
+      + 200_randr-null.patch:
+        Clarify a pointer initialization.
+      + 206_intel_8xx_default_to_fbdev.patch:
+        Makes 8xx class intel GPUs default to fbdev for stability. (LP: #633593)
+  * Refresh 121_only_switch_vt_when_active.diff for new upstream.
+  * Drop 187_edid_quirk_hp_nc8430.patch; upstream.
+  * Drop 189_xserver_1.5.0_bg_none_root.patch; functionality now upstream.
+  * Refresh 190_cache-xkbcomp_output_for_fast_start_up.patch for new upstream.
+  * Drop 197_xvfb-randr.patch:
+    - miRandR, which this used, has been removed from the server.
+  * Drop 204_fix-neg-sync-transition.patch; upstream.
+  * Drop 207_dga_master_device.patch; upstream.
+  * Drop 208_switch_on_release.diff; upstream.
+  * debian/patches/209_add_legacy_bgnone_option.patch:
+    - Add "-nr" as a synonym for "-background none" to ease the transition from
+      the old 189_xserver_1.5.0_bg_none_root.patch patch.  Can be dropped once
+      all the ?DM have been updated to use the new option.
+  * debian/control:
+    - Add Breaks: to xserver-xorg-video-8 and current fglrx.  These proprietary
+      drivers don't yet have appropriate dependency information, so manually
+      handle them here to prevent broken upgrades.
+
+ -- Christopher James Halse Rogers <raof@ubuntu.com>  Mon, 31 Jan 2011 19:45:19 +1100
+
 xorg-server (2:1.9.4-3) unstable; urgency=low
 
   * Maintainer script clean-up:
@@ -1590,6 +4143,105 @@ xorg-server (2:1.9.2-1) experimental; ur
 
  -- Cyril Brulebois <kibi@debian.org>  Wed, 10 Nov 2010 00:10:19 +0100
 
+xorg-server (2:1.9.0.902-1ubuntu4) natty; urgency=low
+
+  * Add 208_switch_on_release.diff: Perform keyboard layout switches on
+    key-release rather than key-press events.  This solves a very
+    long-standing issue where e.g. <ctrl>+<shift>+<key> fails when
+    ctrl+shift is configured for layout switching.
+    (LP: #36812)
+
+ -- Bryce Harrington <bryce@ubuntu.com>  Thu, 06 Jan 2011 14:35:59 -0800
+
+xorg-server (2:1.9.0.902-1ubuntu3) natty; urgency=low
+
+  * Add 207_dga_master_device.patch: Cherrypick from upstream xserver git
+    to fix crash with a bluetooth keyboard when using XBMC full screen.
+    (LP: #597895)
+
+ -- Bryce Harrington <bryce@ubuntu.com>  Thu, 06 Jan 2011 12:17:16 -0800
+
+xorg-server (2:1.9.0.902-1ubuntu2) natty; urgency=low
+
+  [ Christopher James Halse Rogers ]
+  * Cherry-pick 3effb61e from server-1.9 branch.  Fixes a typo in Xinerama
+    support which caused Qt apps to crash X when using Xinerama multi-head
+    (LP: #650539)
+
+  [ Robert Hooker ]
+  * Add 105_nvidia_fglrx_autodetect.patch, enables fglrx and nvidia to work
+    without an xorg.conf.
+  * debian/local/64-xorg-xkb.rules, control: Use keyboard-configuration
+    information for keymaps (/etc/default/keyboard)
+
+ -- Robert Hooker <sarvatt@ubuntu.com>  Wed, 05 Jan 2011 11:29:17 -0500
+
+xorg-server (2:1.9.0.902-1ubuntu1) natty; urgency=low
+
+  * Merge from Debian experimental.  Remaining Ubuntu changes:
+    - rules:
+      + Disable SELinux, libaudit-dev is not in main yet. (LP: #406226)
+      + Enable xcsecurity. (LP: #247537)
+      + Add --with-extra-module-dir to support GL alternatives.
+    - control: 
+      + Xvfb depends on xauth, x11-xkb-utils. (LP: #500102)
+      + Add breaks for incompatible drivers. (LP: #614993)
+      + Drop libaudit-dev from build-deps.
+    - rules, local/64-xorg-xkb.rules: Don't use keyboard-configuration
+      until it's available.
+    - local/xvfb-run*: Add correct docs about error codes. (LP #328205)
+    - debian/patches:
+      + 100_rethrow_signals.patch:
+        When aborting, re-raise signals for apport
+      + 109_fix-swcursor-crash.patch:
+        Avoid dereferencing null pointer while reloading cursors during
+        resume. (LP: #371405)
+      + 111_armel-drv-fallbacks.patch:
+        Add support for armel driver fallbacks.
+      + 121_only_switch_vt_when_active.diff:
+        Add a check to prevent the X server from changing the VT when killing
+        GDM from the console.
+      + 122_xext_fix_card32_overflow_in_xauth.patch:
+        Fix server crash when “xauth generate” is called with large timeout.
+      + 157_check_null_modes.patch, 162_null_crtc_in_rotation.patch,
+        166_nullptr_xinerama_keyrepeat.patch, 167_nullptr_xisbread.patch
+        169_mipointer_nullptr_checks.patch,
+        172_cwgetbackingpicture_nullptr_check.patch:
+        Fix various segfaults in xserver by checking pointers for NULL
+        values before dereferencing them.
+      + 165_man_xorg_conf_no_device_ident.patch
+        Correct man page
+      + 168_glibc_trace_to_stderr.patch:
+        Report abort traces to stderr instead of terminal
+      + 184_virtual_devices_autodetect.patch:
+        Use vesa for qemu device, which is not supported by cirrus
+      + 187_edid_quirk_hp_nc8430.patch:
+        Quirk for another LPL monitor (LP: #380009)
+      + 188_default_primary_to_first_busid.patch:
+        Pick the first device and carry on (LP: #459512)
+      + 189_xserver_1.5.0_bg_none_root.patch:
+        Create a root window with no background.
+      + 190_cache-xkbcomp_output_for_fast_start_up.patch:
+      + 191-Xorg-add-an-extra-module-path.patch:
+        Add support for the alternatives module path.
+      + 197_xvfb-randr.patch:
+        Adds xrandr support to xvfb. (LP: #516123)
+      + 198_nohwaccess.patch:
+        Adds a -nohwaccess argument to make X not access the hardware
+        ports directly.
+      + 200_randr-null.patch:
+        Clarify a pointer initialization.
+      + 203_gestures-extension.patch:
+      + 202_xf86CoordinationsToWindows.patch:
+        Add gesture extension support (LP: #616678)
+      + 204_fix-neg-sync-transition.patch:
+        Fixes gnome screensaver fade being uninterruptable. (LP: #595555)
+      + 206_intel_8xx_default_to_fbdev.patch:
+        Makes 8xx class intel GPUs default to fbdev for stability. (LP: #633593)
+  * Drop 205_udev-product-ids.patch, merged upstream.
+
+ -- Robert Hooker <robert.hooker@canonical.com>  Mon, 18 Oct 2010 11:19:33 -0400
+
 xorg-server (2:1.9.0.902-1) experimental; urgency=low
 
   * New upstream release (1.9.1 rc2).
@@ -1615,7 +4267,209 @@ xorg-server (2:1.9.0.901-1) experimental
   * Remove --disable-multibuffer from configure flags, that extension is
     gone for real now.
 
- -- Cyril Brulebois <kibi@debian.org>  Tue, 12 Oct 2010 22:13:20 +0200
+ -- Cyril Brulebois <kibi@debian.org>  Tue, 12 Oct 2010 22:13:20 +0200
+
+xorg-server (2:1.9.0-0ubuntu6) maverick; urgency=low
+
+  [ Chase Douglas ] 
+  * Fix udev USB product ID parsing (LP: #628214)
+    - debian/patches:
+      + 205_udev-product-ids.patch
+
+  [ Christopher James Halse Rogers ]
+  * debian/patches/206_intel_8xx_default_to_fbdev.patch:
+    - Don't autoload the intel driver on i830, i845g and i855.  These are
+      still too unstable with KMS/GEM.  X will autoload the fbdev driver
+      (if using KMS) or the vesa driver instead.  (LP: #633593)
+
+ -- Christopher James Halse Rogers <raof@ubuntu.com>  Mon, 13 Sep 2010 18:48:54 +1000
+
+xorg-server (2:1.9.0-0ubuntu5) maverick; urgency=low
+
+  * debian/control:
+    - fix duplicated breaks for xserver-xorg-video-v4l
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 08 Sep 2010 10:57:49 +0200
+
+xorg-server (2:1.9.0-0ubuntu4) maverick; urgency=low
+
+  * debian/control:
+    - add more "breaks" for leftover drivers that have no
+      xserver 1.9 abi version, thanks to Jean-Baptiste Lallement
+      (LP: #614993)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 31 Aug 2010 10:52:29 +0200
+
+xorg-server (2:1.9.0-0ubuntu3) maverick; urgency=low
+
+  * debian/control:
+    - add additional breaks for video drivers that have no ABI for
+      xserver 1.9 (LP: #614993)
+    - merge the "breaks" list from the debian git tree
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 31 Aug 2010 10:04:01 +0200
+
+xorg-server (2:1.9.0-0ubuntu2) maverick; urgency=low
+
+  * debian/control:
+    - add explict breaks from xserver-xorg-core against 
+      xserver-xorg-video-v4l (<< 1:0.2.0-4ubuntu1) to ensure that
+      upgrades with universe disabled work (LP: #614993)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 30 Aug 2010 15:40:07 +0200
+
+xorg-server (2:1.9.0-0ubuntu1) maverick; urgency=low
+  
+  * Merge from (unreleased) Debian experimental.  Remaining Ubuntu changes:
+    - rules, control:
+      + Disable SELinux, libaudit-dev is not in main yet (LP 406226).
+        Drop libaudit-dev from build-deps.
+    - rules: Enable xcsecurity (LP 247537).
+    - local/xvfb-run*: Add correct docs about error codes (LP 328205)
+    - rules: Add --with-extra-module-dir to support GL alternatives.
+    - control: Xvfb depends on xauth, x11-xkb-utils. (LP 500102)
+    - rules, local/64-xorg-xkb.rules: Don't use keyboard-configuration
+      until it's available.
+    - control: Update some versioned Breaks for Ubuntu versions.
+    - debian/patches:
+      + 100_rethrow_signals.patch:
+        When aborting, re-raise signals for apport
+      + 109_fix-swcursor-crash.patch:
+        Avoid dereferencing null pointer while reloading cursors during
+        resume. (LP 371405)
+      + 111_armel-drv-fallbacks.patch:
+        Add support for armel driver fallbacks.
+      + 121_only_switch_vt_when_active.diff:
+        Add a check to prevent the X server from changing the VT when killing
+        GDM from the console.
+      + 122_xext_fix_card32_overflow_in_xauth.patch:
+        Fix server crash when “xauth generate” is called with large timeout.
+      + 157_check_null_modes.patch, 162_null_crtc_in_rotation.patch,
+        166_nullptr_xinerama_keyrepeat.patch, 167_nullptr_xisbread.patch
+        169_mipointer_nullptr_checks.patch,
+        172_cwgetbackingpicture_nullptr_check.patch:
+        Fix various segfaults in xserver by checking pointers for NULL
+        values before dereferencing them.
+      + 165_man_xorg_conf_no_device_ident.patch
+        Correct man page
+      + 168_glibc_trace_to_stderr.patch:
+        Report abort traces to stderr instead of terminal
+      + 184_virtual_devices_autodetect.patch:
+        Use vesa for qemu device, which is not supported by cirrus
+      + 187_edid_quirk_hp_nc8430.patch:
+        Quirk for another LPL monitor (LP 380009)
+      + 188_default_primary_to_first_busid.patch:
+        Pick the first device and carry on (LP 459512)
+      + 189_xserver_1.5.0_bg_none_root.patch:
+        Create a root window with no background.
+      + 190_cache-xkbcomp_output_for_fast_start_up.patch:
+        Cache keyboard settings.
+      + 191-Xorg-add-an-extra-module-path.patch:
+        Add support for the alternatives module path.
+      + 197_xvfb-randr.patch:
+        Adds xrandr support to xvfb. (LP 516123)
+      + 198_nohwaccess.patch:
+        Adds a -nohwaccess argument to make X not access the hardware
+        ports directly.
+      + 200_randr-null.patch:
+        Clarify a pointer initialization.  
+      + 203_gestures-extension.patch:
+      + 202_xf86CoordinationsToWindows.patch:
+        Add gesture extension support (LP: 616678)
+      + debian/serverminver:
+        Bump for gesture support
+  * New upstream release:
+    - Fixes crash in DamageUnregister on session close (LP: #343694)
+    - Fixes crash with extremely large windows exposed by xpdf (Closes: #320627)
+  * Drop 17-fix-DRI2-segfault-when-clientGone.diff: fixed upstream in more
+    generality.
+  * debian/patches/204_fix-neg-sync-transition.patch:
+    - Fix edge case in SYNC extension resulting in GNOME screensaver's 
+      fade-to-screensaver being uninteruptible.  (LP: #595555)
+
+ -- Christopher James Halse Rogers <raof@ubuntu.com>  Tue, 24 Aug 2010 15:44:10 +1000
+
+xorg-server (2:1.8.99.905-1ubuntu3) maverick; urgency=low
+
+  * Bump debian/serverminver for gesture support
+
+ -- Chase Douglas <chase.douglas@ubuntu.com>  Fri, 20 Aug 2010 16:35:22 -0400
+
+xorg-server (2:1.8.99.905-1ubuntu2) maverick; urgency=low
+  
+    * Add in gesture support (LP: #616678)
+      - add debian/patches/203_gestures-extension.patch
+        and debian/patches/202_xf86CoordinationsToWindows.patch
+      - debian/rules:
+        - add configure option to enable gesture
+
+ -- Chase Douglas <chase.douglas@ubuntu.com>  Mon, 09 Aug 2010 14:33:40 +0000
+
+xorg-server (2:1.8.99.905-1ubuntu1) maverick; urgency=low
+
+  * Merge from (unreleased) Debian experimental.  Remaining Ubuntu changes:
+    - rules, control:
+      + Disable SELinux, libaudit-dev is not in main yet (LP 406226).
+        Drop libaudit-dev from build-deps.
+    - rules: Enable xcsecurity (LP 247537).
+    - local/xvfb-run*: Add correct docs about error codes (LP 328205)
+    - rules: Add --with-extra-module-dir to support GL alternatives.
+    - control: Xvfb depends on xauth, x11-xkb-utils. (LP 500102)
+    - rules, local/64-xorg-xkb.rules: Don't use keyboard-configuration
+      until it's available.
+    - control: Update some versioned Breaks for Ubuntu versions.
+    - debian/patches:
+      + 100_rethrow_signals.patch:
+        When aborting, re-raise signals for apport
+      + 109_fix-swcursor-crash.patch:
+        Avoid dereferencing null pointer while reloading cursors during
+        resume. (LP 371405)
+      + 111_armel-drv-fallbacks.patch:
+        Add support for armel driver fallbacks.
+      + 121_only_switch_vt_when_active.diff:
+        Add a check to prevent the X server from changing the VT when killing
+        GDM from the console.
+      + 122_xext_fix_card32_overflow_in_xauth.patch:
+        Fix server crash when “xauth generate” is called with large timeout.
+      + 157_check_null_modes.patch, 162_null_crtc_in_rotation.patch,
+        166_nullptr_xinerama_keyrepeat.patch, 167_nullptr_xisbread.patch
+        169_mipointer_nullptr_checks.patch,
+        172_cwgetbackingpicture_nullptr_check.patch:
+        Fix various segfaults in xserver by checking pointers for NULL
+        values before dereferencing them.
+      + 165_man_xorg_conf_no_device_ident.patch
+        Correct man page
+      + 168_glibc_trace_to_stderr.patch:
+        Report abort traces to stderr instead of terminal
+      + 184_virtual_devices_autodetect.patch:
+        Use vesa for qemu device, which is not supported by cirrus
+      + 187_edid_quirk_hp_nc8430.patch:
+        Quirk for another LPL monitor (LP 380009)
+      + 188_default_primary_to_first_busid.patch:
+        Pick the first device and carry on (LP 459512)
+      + 189_xserver_1.5.0_bg_none_root.patch:
+        Create a root window with no background.
+      + 190_cache-xkbcomp_output_for_fast_start_up.patch:
+        Cache keyboard settings.
+      + 191-Xorg-add-an-extra-module-path.patch:
+        Add support for the alternatives module path.
+      + 197_xvfb-randr.patch:
+        Adds xrandr support to xvfb. (LP 516123)
+      + 198_nohwaccess.patch:
+        Adds a -nohwaccess argument to make X not access the hardware
+        ports directly.
+      + 200_randr-null.patch:
+        Clarify a pointer initialization.
+  * Update changelog entries for 1.8.1.902-1 which became 1.8.99.904-1
+  * Drop 196_xvfbscreeninit-handling.patch: it's semantically empty, and now 
+    doesn't apply.  Merge remaining #include change into 197_xvfb-randr.patch
+  * New upstream version will start correctly when no outputs are connected,
+    as long as the video driver can dynamically resize the framebuffer
+    (true for all KMS drivers) (LP: #337889)
+  * New upstream version fixes crash on non-admin logout with KDE (LP: #569879)
+  * Refresh 111_armel-drv-fallbacks.patch to fix the build on armel
+
+ -- Christopher James Halse Rogers <raof@ubuntu.com>  Thu, 05 Aug 2010 11:25:14 +1000
 
 xorg-server (2:1.8.99.905-1) experimental; urgency=low
 
@@ -1649,6 +4503,164 @@ xorg-server (2:1.8.99.904-1) experimenta
 
  -- Julien Cristau <jcristau@debian.org>  Fri, 09 Jul 2010 12:45:09 +0100
 
+xorg-server (2:1.8.1.902-0ubuntu2) maverick; urgency=low
+
+  * debian/rules:
+    - Drop the upstream changelog harder.  We're scrabbling for CD space
+      and this is an easy 1MB saving.
+
+ -- Christopher James Halse Rogers <raof@ubuntu.com>  Wed, 30 Jun 2010 09:50:33 +1000
+
+xorg-server (2:1.8.1.902-0ubuntu1) maverick; urgency=low
+
+  * Merge from (unreleased) Debian experimental.  Remaining changes:  
+    - rules, control:
+      + Disable SELinux, libaudit-dev is not in main yet (LP 406226).
+        Drop libaudit-dev from build-deps.
+    - rules: Enable xcsecurity (LP 247537).
+    - local/xvfb-run*: Add correct docs about error codes (LP 328205)
+    - rules: Add --with-extra-module-dir to support GL alternatives.
+    - control: Xvfb depends on xauth, x11-xkb-utils. (LP 500102)
+    - rules, local/64-xorg-xkb.rules: Don't use keyboard-configuration
+      until it's available.
+    - control: Update some versioned Breaks for Ubuntu versions.
+    - debian/patches:
+      + 100_rethrow_signals.patch:
+        When aborting, re-raise signals for apport
+      + 109_fix-swcursor-crash.patch:
+        Avoid dereferencing null pointer while reloading cursors during
+        resume. (LP 371405)
+      + 111_armel-drv-fallbacks.patch:
+        Add support for armel driver fallbacks.
+      + 121_only_switch_vt_when_active.diff:
+        Add a check to prevent the X server from changing the VT when killing
+        GDM from the console.
+      + 122_xext_fix_card32_overflow_in_xauth.patch:
+        Fix server crash when “xauth generate” is called with large timeout.
+      + 157_check_null_modes.patch, 162_null_crtc_in_rotation.patch,
+        166_nullptr_xinerama_keyrepeat.patch, 167_nullptr_xisbread.patch
+        169_mipointer_nullptr_checks.patch,
+        172_cwgetbackingpicture_nullptr_check.patch:
+        Fix various segfaults in xserver by checking pointers for NULL
+        values before dereferencing them.
+      + 165_man_xorg_conf_no_device_ident.patch
+        Correct man page
+      + 168_glibc_trace_to_stderr.patch:
+        Report abort traces to stderr instead of terminal
+      + 184_virtual_devices_autodetect.patch:
+        Use vesa for qemu device, which is not supported by cirrus
+      + 187_edid_quirk_hp_nc8430.patch:
+        Quirk for another LPL monitor (LP 380009)
+      + 188_default_primary_to_first_busid.patch:
+        Pick the first device and carry on (LP 459512)
+      + 189_xserver_1.5.0_bg_none_root.patch:
+        Create a root window with no background.
+      + 190_cache-xkbcomp_output_for_fast_start_up.patch:
+        Cache keyboard settings.
+      + 191-Xorg-add-an-extra-module-path.patch:
+        Add support for the alternatives module path.
+      + 196_xvfb-fbscreeninit-handling.patch, 197_xvfb-randr.patch:
+        Adds xrandr support to xvfb. (LP 516123)
+      + 198_nohwaccess.patch:
+        Adds a -nohwaccess argument to make X not access the hardware
+        ports directly.
+      + 200_randr-null.patch:
+        Clarify a pointer initialization.
+  * Update changelog entries for previously unreleased Debian 1.8.1.901-1
+  
+ -- Christopher James Halse Rogers <raof@ubuntu.com>  Wed, 23 Jun 2010 11:19:49 +1000
+
+xorg-server (2:1.8.1.901-1ubuntu1) maverick; urgency=low
+
+  [ Timo Aaltonen ]
+  * Merged from Debian experimental, remaining changes:
+    - rules, control:
+      + Disable SELinux, libaudit-dev is not in main yet (LP 406226).
+        Drop libaudit-dev from build-deps.
+    - rules: Enable xcsecurity (LP 247537).
+    - local/xvfb-run*: Add correct docs about error codes (LP 328205)
+    - rules: Add --with-extra-module-dir to support GL alternatives.
+    - control: Xvfb depends on xauth, x11-xkb-utils, recommends
+      libgl1-mesa-dri. (LP 500102)
+    - rules, local/64-xorg-xkb.rules: Don't use keyboard-configuration
+      until it's available.
+    - debian/patches:
+      + 100_rethrow_signals.patch:
+        When aborting, re-raise signals for apport
+      + 109_fix-swcursor-crash.patch:
+        Avoid dereferencing null pointer while reloading cursors during
+        resume. (LP 371405)
+      + 111_armel-drv-fallbacks.patch:
+        Add support for armel driver fallbacks.
+      + 121_only_switch_vt_when_active.diff:
+        Add a check to prevent the X server from changing the VT when killing
+        GDM from the console.
+      + 122_xext_fix_card32_overflow_in_xauth.patch:
+      + 157_check_null_modes.patch, 162_null_crtc_in_rotation.patch,
+        166_nullptr_xinerama_keyrepeat.patch, 167_nullptr_xisbread.patch
+        169_mipointer_nullptr_checks.patch,
+        172_cwgetbackingpicture_nullptr_check.patch:
+        Fix various segfaults in xserver by checking pointers for NULL
+        values before dereferencing them.
+      + 165_man_xorg_conf_no_device_ident.patch
+        Correct man page
+      + 168_glibc_trace_to_stderr.patch:
+        Report abort traces to stderr instead of terminal
+      + 184_virtual_devices_autodetect.patch:
+        Use vesa for qemu device, which is not supported by cirrus
+      + 187_edid_quirk_hp_nc8430.patch:
+        Quirk for another LPL monitor (LP 380009)
+      + 188_default_primary_to_first_busid.patch:
+        Pick the first device and carry on (LP 459512)
+      + 189_xserver_1.5.0_bg_none_root.patch:
+        Create a root window with no background.
+      + 190_cache-xkbcomp_output_for_fast_start_up.patch:
+        Cache keyboard settings.
+      + 191-Xorg-add-an-extra-module-path.patch:
+        Add support for the alternatives module path.
+      + 196_xvfb-fbscreeninit-handling.patch, 197_xvfb-randr.patch:
+        Adds xrandr support to xvfb. (LP 516123)
+      + 198_nohwaccess.patch:
+        Adds a -nohwaccess argument to make X not access the hardware
+        ports directly.
+      + 200_randr-null.patch:
+        Clarify a pointer initialization.
+  * Dropped patches:
+    - 106_nouveau_autodetect.patch: obsoleted by 15-nouveau.diff
+    - 112_xaa-fbcomposite-fix-negative-size.patch: adopted by Debian
+    - 113_quell_nouveau_aiglx.patch: obsoleted by 15-nouveau.diff
+    - 115_xext_fix_cursor_ref_counting.patch: merged upstream
+    - 116_fix_typos_in_swap_functions.patch: merged upstream
+    - 118_xkb_fix_garbage_init.patch: merged upstream
+    - 123_exa_sys_ptr_nullpointer_check.patch: merged upstream
+    - 199_xfvb-help-typo.patch: merged upstream
+  * debian/xserver-xorg-core.preinst.in: Drop the removal of the wrong
+    alternative, obsolete by now.
+  * debian/control: Build the udeb and bump the relaxed build-deps.
+  * debian/local/xvfb-run: Don't disable composite, seems to run fine
+    with it nowadays.
+
+  [ Robert Hooker ]
+  * Fix 190_cache-xkbcomp_output_for_fast_start_up.patch so it works.
+  * Drop 164_trap-aspect-ratios.patch: obsolete.
+  * debian/rules: Adjust confflag targets so xcsecurity isn't enabled for udeb
+    with disabled xace.
+  * Drop 184_virtual_devices_autodetect.patch: It's a noop with todays autoconfig.
+  
+  [ Bryce Harrington ]
+  * debian/rules: Don't reference the package uploader for support; instead point
+    users to the standard Ubuntu support page.
+    (LP: #589811)
+
+  [ Christopher James Halse Rogers ]
+  * Add debian/gbp.conf pointing at ubuntu branch.
+  * Drop 109_fix-swcursor-crash.patch; merged upstream in 3a3edb2c.
+  * 122_xext_fix_card32_overflow_in_xauth.patch: Update to most recent patch
+    on patchwork.  This patch actually works! (tested with 
+    “xauth generate :0 . trusted timeout 99999999) (LP: #519049)
+  
+ -- Bryce Harrington <bryce@ubuntu.com>  Mon, 07 Jun 2010 14:50:49 -0700
+
 xorg-server (2:1.8.1.901-1) experimental; urgency=low
 
   [ Julien Cristau ]
@@ -1794,6 +4806,113 @@ xorg-server (2:1.7.6.901-1) unstable; ur
 
  -- Cyril Brulebois <kibi@debian.org>  Sat, 17 Apr 2010 16:55:39 +0200
 
+xorg-server (2:1.7.6-2ubuntu8) lucid-updates; urgency=low
+
+  [Bryce Harrington]
+  * Add 123_exa_sys_ptr_nullpointer_check.patch: Patch from upstream to
+    verify a pointer is not NULL before dereferencing it.  Fixes X
+    segfault in miCopyRegion which occurs while using firefox (e.g. typing
+    into fields in AOL).  Issue found by Jerry Lamos.
+    (LP: #539772)
+  * Add 19-exa-handle-pixmap-create-destroy-in-lower-layers.diff: Patch
+    from Debian to fix X segfault on mouse click in xfig, when pixmaps
+    are created in the course of software fallbacks.
+    (LP: #553647)
+
+  [Martin Pitt]
+  * debian/local/64-xorg-xkb.rules: Ignore XKBMODEL=="SKIP" and
+    XKBVARIANT=="U.S. English", which happen to get into
+    /etc/default/console-setup in some cases like the VMWare automatic
+    installer.
+    (LP: #548891)
+
+ -- Bryce Harrington <bryce@ubuntu.com>  Wed, 28 Apr 2010 13:10:44 -0700
+
+xorg-server (2:1.7.6-2ubuntu7) lucid; urgency=low
+
+  * Drop 117_fix_crash_with_createglyphset.patch
+    - Dupe of patch 110
+  * Drop 03_fedora_glx_versioning.diff, 04_fedora_glx14-swrast.diff
+    - These patches were brought in by Debian to provide glx 1.4 support
+      which Fedora backported from xserver 1.8, however testing in
+      Ubuntu showed they caused a crash when closing Clutter apps (#550218),
+      and graphics corruption when opening windows.  Dropping these patches
+      returns us to GLX 1.2, which has been found to be stable; Debian has
+      also dropped these two patches.
+      (Fixes #565903).
+  * Drop 114_dri2_make_sure_x_drawable_exists.patch
+    - This was an early attempt by upstream which fixed the aforementioned
+      Clutter crash, but which introduced a memory leak.
+      (Fixes #565981)
+
+ -- Bryce Harrington <bryce@ubuntu.com>  Thu, 22 Apr 2010 17:24:38 -0700
+
+xorg-server (2:1.7.6-2ubuntu6) lucid; urgency=low
+
+  * Add 122_xext_fix_card32_overflow_in_xauth.patch:  Prevent overflow
+    of a CARD32 variable millis by doing bounds checking.  This is a
+    patch currently in discussion at fdo #27134, so this patch can be
+    dropped in favor of whatever upstream decides to include.
+    (LP: #519049)
+
+ -- Bryce Harrington <bryce@ubuntu.com>  Thu, 15 Apr 2010 14:10:53 -0700
+
+xorg-server (2:1.7.6-2ubuntu5) lucid; urgency=low
+
+  * Update patches in previous upload to fix FTBS issue.
+
+ -- Bryce Harrington <bryce@ubuntu.com>  Thu, 15 Apr 2010 11:03:01 -0700
+
+xorg-server (2:1.7.6-2ubuntu4) lucid; urgency=low
+
+  * Add several cherrypicks of fixes from upstream git tree which fix various
+    issues and that look safe with low or no risk of regression.
+    + 115_xext_fix_cursor_ref_counting.patch: Xext: Fix cursor reference
+      counting hazard.
+    + 116_fix_typos_in_swap_functions.patch: Fixes typos in several of the
+      glxcmdsswap routines.
+    + 117_fix_crash_with_createglyphset.patch:  Fixes crash introduced in
+      FindGlyphsByHash() if one client disconnects while a second is in
+      the middle of doing certain Glyph operations.
+    + 118_xkb_fix_garbage_init.patch: Fixes typo that can cause garbage
+      bits to get appended on the xkbControlsNotify changedControls mask
+      because it was uninitialized on the stack.
+
+ -- Bryce Harrington <bryce@ubuntu.com>  Wed, 14 Apr 2010 18:49:56 -0700
+
+xorg-server (2:1.7.6-2ubuntu3) lucid; urgency=low
+
+  * add support for omapfb to 111_armel-drv-fallbacks.patch
+
+ -- Alexander Sack <asac@ubuntu.com>  Mon, 12 Apr 2010 14:43:42 +0200
+
+xorg-server (2:1.7.6-2ubuntu2) lucid; urgency=low
+
+  [Bryce Harrington]
+  * Add 113_quell_nouveau_aiglx.patch: Don't emit error message about
+    AIGLX on nouveau.  3D is not supported yet on -nouveau so this error
+    message serves only to confuse bug reporters.
+    (LP: #529590)
+
+  [Robert Sarvatt]
+  * Add 114_dri2_make_sure_x_drawable_exists.patch: Makes sure
+    a corresponding X drawable exists before trying to use it, fixing
+    xserver segfaults under DRI2 when closing down GLX apps.
+    (LP: #550218)
+
+ -- Bryce Harrington <bryce@ubuntu.com>  Wed, 31 Mar 2010 16:37:45 -0700
+
+xorg-server (2:1.7.6-2ubuntu1) lucid; urgency=low
+
+  [ Timo Aaltonen ]
+  * Merge from Debian unstable. (LP: #546933)
+
+  [ Michael Casadevall ]
+  * Updated 111_armel-drv-fallbacks.patch to also add support for finding
+    dovefb devices in addition to imx51 ones. (LP: #550701)
+
+ -- Timo Aaltonen <tjaalton@ubuntu.com>  Tue, 30 Mar 2010 22:01:12 +0300
+
 xorg-server (2:1.7.6-2) unstable; urgency=low
 
   [ Timo Aaltonen ]
@@ -1819,6 +4938,39 @@ xorg-server (2:1.7.6-2) unstable; urgenc
 
  -- Timo Aaltonen <tjaalton@ubuntu.com>  Tue, 30 Mar 2010 21:32:52 +0300
 
+xorg-server (2:1.7.6-1ubuntu3) lucid; urgency=low
+
+  * Extend 112_xaa-fbcomposite-fix-negative-size.patch to also correct a
+    mod() definition in the mi code which suffers the same flaw.
+
+ -- Bryce Harrington <bryce@ubuntu.com>  Mon, 29 Mar 2010 14:15:07 -0700
+
+xorg-server (2:1.7.6-1ubuntu2) lucid; urgency=low
+
+  * Add 112_xaa-fbcomposite-fix-negative-size.patch:  Prevent 3rd-party
+    controllable Xorg crash/exploit when XAA and compositing is in use.
+    Be more careful in sign-changes with mod().
+    (LP: #551193)
+
+ -- Bryce Harrington <bryce@ubuntu.com>  Mon, 29 Mar 2010 13:37:06 -0700
+
+xorg-server (2:1.7.6-1ubuntu1) lucid; urgency=low
+
+  [Timo Aaltonen]
+  * Merge from Debian unstable.
+  * Drop patch 107, included in Debian.
+  * Drop patch 108, included upstream.
+  * control: Drop the udeb, we don't need it for lucid.
+  * control: Relax/drop some build-deps caused by the udeb.
+
+  [Bryce Harrington]
+  * Add 110_findglyphbyhash-fix.patch from upstream to fix a sporadic
+    crash in FindGlyphByHash.
+    (LP: #401045)
+  * Renumber patch 201_armel-drv-fallbacks.patch to 111
+
+ -- Bryce Harrington <bryce@ubuntu.com>  Wed, 24 Mar 2010 12:04:20 -0700
+
 xorg-server (2:1.7.6-1) unstable; urgency=low
 
   [ Brice Goglin ]
@@ -1879,6 +5031,59 @@ xorg-server (2:1.7.5.902-1) unstable; ur
 
  -- Cyril Brulebois <kibi@debian.org>  Mon, 15 Mar 2010 22:19:01 +0100
 
+xorg-server (2:1.7.5-1ubuntu4) lucid; urgency=low
+
+  * 201_armel-drv-fallbacks.patch: use imx driver if available on
+    armel imx51 systems; the current test checks for mxc_gpu
+    devices listed in /sys/devices/platform and ensures that the
+    imx_drv module can be loaded; if both succeed, imx driver is
+    used instead of fbdev; note: the mxc_gpu device test should be
+    replaced with parsing output of /proc/fb once the mxc driver
+    provides reasonable content there.
+
+ -- Alexander Sack <asac@ubuntu.com>  Wed, 24 Mar 2010 13:03:41 +0100
+
+xorg-server (2:1.7.5-1ubuntu3) lucid; urgency=low
+
+  * Add 109_fix-swcursor-crash.patch: Avoid dereferencing null pointer
+    while reloading cursors during resume.
+    (LP: #371405)
+
+ -- Bryce Harrington <bryce@ubuntu.com>  Thu, 11 Mar 2010 17:16:12 -0800
+
+xorg-server (2:1.7.5-1ubuntu2) lucid; urgency=low
+
+  [ Bryce Harrington ]
+  [Timo Aaltonen]
+  * Add 107_dont_filter_input_subsys.diff so for instance serial wacom
+    devices are initialized by the udev backend (LP: #522318)
+
+  [Bryce Harrington]
+  * Add 108_reenable_record_ext.patch: Upstream patch to make the
+    record callback work with the new internal core/Xi events mechanism
+    instead of xEvents. With this fix, the record extension can be
+    re-enabled.
+    (LP: #315456)
+
+ -- Timo Aaltonen <tjaalton@ubuntu.com>  Tue, 02 Mar 2010 17:09:33 +0200
+
+xorg-server (2:1.7.5-1ubuntu1) lucid; urgency=low
+
+  [ Bryce Harrington ]
+  [Robert Hooker]
+  * Add 106_nouveau_autodetect.patch: makes nouveau the default driver
+    for supported cards when not explicitly named in xorg.conf.
+
+  [Timo Aaltonen]
+  * Merge from Debian unstable.
+  * Drop patch 101, included in Debian.
+
+  [Robert Collins]
+  * Add 199_xfvb-help-typo.patch to fix typo in help for xvfb (fdo #32990)
+  * Add 200_randr-null.patch to clarify a pointer initialization (fdo #26389)
+
+ -- Timo Aaltonen <tjaalton@ubuntu.com>  Fri, 19 Feb 2010 13:24:15 +0200
+
 xorg-server (2:1.7.5-1) unstable; urgency=low
 
   [ Julien Cristau ]
@@ -1920,6 +5125,127 @@ xorg-server (2:1.7.4-1) unstable; urgenc
 
  -- Julien Cristau <jcristau@debian.org>  Tue, 12 Jan 2010 10:49:22 +0000
 
+xorg-server (2:1.7.3.902-1ubuntu12) lucid; urgency=low
+
+  * Add 198_nohwaccess.patch: Needed for rootless X.  Adds a -nohwaccess
+    argument to make X not access the hardware ports directly.
+
+ -- Bryce Harrington <bryce@ubuntu.com>  Fri, 05 Feb 2010 22:17:20 -0800
+
+xorg-server (2:1.7.3.902-1ubuntu11) lucid; urgency=low
+
+  * Add 196_xvfb-fbscreeninit-handling.patch and 197_xvfb-randr.patch:
+    Adds xrandr support to xvfb.  Thanks lifeless!
+    (LP: #516123)
+
+ -- Bryce Harrington <bryce@ubuntu.com>  Thu, 04 Feb 2010 10:56:12 -0800
+
+xorg-server (2:1.7.3.902-1ubuntu10) lucid; urgency=low
+
+  * 100_rethrow_signals.patch: Fix SigAbortServer to cleanly exit(1) on a
+    non-signal crash, as the original upstream code does. Not exiting leads to
+    continuing back into the code which threw the error, which eventually
+    leads to writing into the already closed log file and other operations
+    which cause segfaults.
+  * Re-enable 100_rethrow_signals.patch.  Hello apport.
+
+ -- Martin Pitt <martin.pitt@ubuntu.com>  Wed, 03 Feb 2010 17:29:53 -0800
+
+xorg-server (2:1.7.3.902-1ubuntu9) lucid; urgency=low
+
+  * Fully disable 100_rethrow_signals.patch as it seems to still cause
+    crashes.  Goodbye apport.
+    (LP: #506510)
+
+ -- Bryce Harrington <bryce@ubuntu.com>  Mon, 18 Jan 2010 23:31:08 -0800
+
+xorg-server (2:1.7.3.902-1ubuntu8) lucid; urgency=low
+
+  * Drop 160_log_timestamping.patch.  The bootup time objectives have been
+    met so this patch is no longer required.
+
+ -- Bryce Harrington <bryce@ubuntu.com>  Sat, 16 Jan 2010 02:28:30 -0800
+
+xorg-server (2:1.7.3.902-1ubuntu7) lucid; urgency=low
+
+  * Update 100_rethrow_signals.patch: Don't log more error messages after
+    the log has been closed, else it causes a SIGSEGV (signal 11) crash
+    under several different conditions, including on even ordinary error
+    exits.
+    (LP: #506510, #507345, #506977, #504497, #507083)
+
+ -- Bryce Harrington <bryce@ubuntu.com>  Fri, 15 Jan 2010 15:22:34 -0800
+
+xorg-server (2:1.7.3.902-1ubuntu6) lucid; urgency=low
+
+  * debian/xserver-xorg-core.preinst.in:
+    - Correct the name of the alternative that we need to remove.
+      Thanks to Steve Langasek for spotting the error.
+
+ -- Alberto Milone <alberto.milone@canonical.com>  Thu, 14 Jan 2010 12:50:19 +0100
+
+xorg-server (2:1.7.3.902-1ubuntu5) lucid; urgency=low
+
+  * debian/xserver-xorg-core.preinst.in:
+    - Make sure that the alternative which was previously provided by
+      xserver-xorg-core is removed.
+
+ -- Alberto Milone <alberto.milone@canonical.com>  Tue, 12 Jan 2010 11:37:49 +0100
+
+xorg-server (2:1.7.3.902-1ubuntu4) lucid; urgency=low
+
+  * debian/patches/191-Xorg-add-an-extra-module-path.patch:
+    - Patch from Mandriva to allow the use of an extra-modules-dir so that
+      the modules installed in this dir will override the ones in the
+      default directory.
+  * debian/rules:
+    - Remove alternatives stuff introduced in a previous upload.
+    - Configure with --with-extra-module-dir="/usr/lib/xorg/extra-modules".
+    - Do not install libglx.so and libdri.so in a different place any more.
+    - Do not install ld.so.conf file any more. Mesa will deal with this.
+  * debian/xserver-xorg-core.links:
+    - Do not create link to /usr/lib/xvmcconfig-standard/XvMCConfig.
+    - Remove links file.
+  * debian/xserver-xorg-core.postinst.in:
+    - Do not install an alternative any more. Mesa will deal with this.
+  * debian/xserver-xorg-core.prerm.in:
+    - Remove file.
+
+ -- Alberto Milone <alberto.milone@canonical.com>  Mon, 11 Jan 2010 14:48:35 +0100
+
+xorg-server (2:1.7.3.902-1ubuntu3) lucid; urgency=low
+
+  [ Julien Cristau ]
+  * Don't call config_init() until after InitInput() has initialized the event
+    queue, so that devices don't get enabled too early (closes: #564256,
+    #564324). (LP: #504254)
+
+ -- Timo Aaltonen <tjaalton@ubuntu.com>  Sat, 09 Jan 2010 19:34:30 +0200
+
+xorg-server (2:1.7.3.902-1ubuntu2) lucid; urgency=low
+
+  * debian/rules:
+    - Make sure that /usr/lib/standard-x11/ld.so.conf points to
+      the libraries provided by mesa.
+
+ -- Alberto Milone <alberto.milone@canonical.com>  Fri, 08 Jan 2010 18:55:52 +0100
+
+xorg-server (2:1.7.3.902-1ubuntu1) lucid; urgency=low
+
+  [ Timo Aaltonen ]
+  * Merge from Debian unstable.
+
+  [ Michael Vogt ]
+  * Add 101_nv-crash-fix.diff: Do not crash if gamma_set is NULL.
+    (LP: #494627)
+
+  [ Alberto Milone ]
+  * Install libglx.so and libdri.so in /usr/lib/standard-x11 as X
+    seems to prefer the file in /usr/lib/xorg/modules/extensions/standard/
+    over links in /usr/lib/xorg/modules/extensions/.
+
+ -- Timo Aaltonen <tjaalton@ubuntu.com>  Fri, 08 Jan 2010 14:21:15 +0200
+
 xorg-server (2:1.7.3.902-1) unstable; urgency=low
 
   [ Timo Aaltonen ]
@@ -1935,6 +5261,44 @@ xorg-server (2:1.7.3.902-1) unstable; ur
 
  -- Julien Cristau <jcristau@debian.org>  Wed, 06 Jan 2010 17:44:59 +0000
 
+xorg-server (2:1.7.3.901-1ubuntu5) lucid; urgency=low
+
+  * Use alternatives to make it easier to switch between X11 and 3rd
+    party modules.
+  * Add link to /usr/lib/xvmcconfig-standard/XvMCConfig and use it
+    for alternatives.
+
+ -- Alberto Milone <alberto.milone@canonical.com>  Mon, 04 Jan 2010 12:08:17 +0100
+
+xorg-server (2:1.7.3.901-1ubuntu4) lucid; urgency=low
+
+  * xvfb: Depend again on xauth. Depend on x11-xkb-utils. LP: #500102.
+
+ -- Matthias Klose <doko@ubuntu.com>  Thu, 24 Dec 2009 12:20:02 +0100
+
+xorg-server (2:1.7.3.901-1ubuntu3) lucid; urgency=low
+
+  * Update 100_rethrow_signals.patch to work with xserver 1.7
+
+ -- Bryce Harrington <bryce@ubuntu.com>  Fri, 18 Dec 2009 18:55:56 -0800
+
+xorg-server (2:1.7.3.901-1ubuntu2) lucid; urgency=low
+
+  [ Alberto Milone ]
+  * debian/patches/190_cache-xkbcomp_output_for_fast_start_up.patch:
+    Make the patch build again with xserver 1.7.
+
+  [ Timo Aaltonen ]
+  * Enable patch 190 now that it works.
+
+ -- Timo Aaltonen <tjaalton@ubuntu.com>  Tue, 15 Dec 2009 14:49:39 +0200
+
+xorg-server (2:1.7.3.901-1ubuntu1) lucid; urgency=low
+
+  * Merge from Debian experimental.
+
+ -- Timo Aaltonen <tjaalton@ubuntu.com>  Mon, 14 Dec 2009 11:34:33 +0200
+
 xorg-server (2:1.7.3.901-1) experimental; urgency=low
 
   [ Julien Cristau ]
@@ -1950,6 +5314,89 @@ xorg-server (2:1.7.3.901-1) experimental
 
  -- Brice Goglin <bgoglin@debian.org>  Sat, 12 Dec 2009 17:46:45 +0100
 
+xorg-server (2:1.7.2-2ubuntu2) lucid; urgency=low
+
+  * local/64-xorg-xkb.rules: Use "program" instead of "file" when
+    grepping the XKB settings from console-setup.
+
+ -- Timo Aaltonen <tjaalton@ubuntu.com>  Tue, 08 Dec 2009 13:17:04 +0200
+
+xorg-server (2:1.7.2-2ubuntu1) lucid; urgency=low
+
+  * Merge from Debian experimental. Remaining Ubuntu changes:
+    - debian/rules, debian/control:
+      + Disable SELinux, libaudit-dev is not in main yet (LP 406226).
+        Drop libaudit-dev from build-deps.
+    - debian/rules: Enable xcsecurity (LP 247537).
+    - local/xvfb-run*: Add correct docs about error codes (LP 328205)
+    - local/xvfb-run: Use "-extension Composite" to fix xvfb-run crashing.
+    - debian/patches:
+      + 121_only_switch_vt_when_active.diff:
+        Add a check to prevent the X server from changing the VT when killing
+        GDM from the console.
+      + 135_rethrow_signals.patch:
+        When aborting, re-raise signals for apport
+      + 157_check_null_modes.patch, 162_null_crtc_in_rotation.patch,
+        166_nullptr_xinerama_keyrepeat.patch, 167_nullptr_xisbread.patch
+        169_mipointer_nullptr_checks.patch,
+        172_cwgetbackingpicture_nullptr_check.patch:
+        Fix various segfaults in xserver by checking pointers for NULL
+        values before dereferencing them.
+      + 164_trap-aspect-ratios.patch:
+        Correct monitor EDIDs that have misreported aspect ratios.
+      + 165_man_xorg_conf_no_device_ident.patch
+        Correct man page
+      + 168_glibc_trace_to_stderr.patch:
+        Report abort traces to stderr instead of terminal
+      + 184_virtual_devices_autodetect.patch:
+        Use vesa for qemu device, which is not supported by cirrus
+      + 187_edid_quirk_hp_nc8430.patch:
+        Quirk for another LPL monitor (LP: #380009)
+      + 188_default_primary_to_first_busid.patch:
+        Pick the first device and carry on (LP 459512)
+      + 189_xserver_1.5.0_bg_none_root.patch:
+        Create a root window with no background.
+      + 190_cache-xkbcomp_output_for_fast_start_up.patch:
+        Cache keyboard settings.
+  * debian/control: Drop obsolete Conflicts/Breaks against -psb,
+    -synaptics and -evdev.
+  * debian/local/xserver-xephyr.1: Delete, upstream has Xephyr.1 now.
+  * Dropped patches:
+    - 101_fedora_xserver-1.3.0-document-fontpath-correctly.patch:
+      Upstream dropped it.
+    - 102_ubuntu_sharevts_load_cpu.patch: Upstream.
+    - 103_psb_auto.patch: Fallback to vesa done differently upstream.
+    - 110_fedora_no_move_damage.patch: Upstream dropped it.
+    - 140_quell_acpi_errmsgs.patch: Superseded.
+    - 153_make_dmx_compile.patch: Xdmx is fixed upstream.
+    - 156_exevents_copykeyclass_nullptrcheck.patch: No longer needed.
+      Appropriate checks are done on the pointers prior to CopyKeyClass
+      being called now.
+    - 158_raise_maxclients.patch: Breaks binary drivers.  We've had this
+      reverted for some time now, may as well just get rid of it entirely.
+    - 174_set_bg_pixmap_of_cow_to_none.patch: Upstream
+    - 177_animated_cursor_change_master.patch: Different fix upstream.
+    - 180_fedora_no_synaptics_mouse_synthesis.patch: Superseded.
+    - 181_fedora_log_proc_cmdline.patch: Upstream.
+    - 185_dix_badwindow.patch: Upstream.
+    - 186_autoconfig_geode.patch: Upstream.
+  * 189_xserver_1.5.0_bg_none_root.patch: Fetched a new version.
+  * 135_rethrow_signals.patch, 168_glibc_trace_to_stderr.patch:
+    Disabled until fixed to work with the current version.
+  * 160_log_timestamping.patch: Updated and re-enabled for boot speed
+    testing in Lucid.  This patch should be disabled by beta2.
+  * 169_mipointer_nullptr_checks.patch: Updated.  MIPOINTER() still
+    can return NULL under some circumstances, and its return values
+    are still being dereferenced without checking for NULL.
+  * 188_default_primary_to_first_busid.patch: Updated.  Still looks to be
+    relevant for certain multi-card systems.
+  * 190_cache-xkbcomp_output_for_fast_start_up.patch: Updated.
+  * control, local/64-xorg-xkb.rules: Don't depend on keyboard-configuration
+    until we have it.
+  * rules, local/64-xorg-xkb.rules: Use input_id from udev.
+
+ -- Timo Aaltonen <tjaalton@ubuntu.com>  Mon, 07 Dec 2009 15:30:18 +0200
+
 xorg-server (2:1.7.2-2) experimental; urgency=low
 
   [ Julien Cristau ]
@@ -2024,6 +5471,146 @@ xorg-server (2:1.6.99.903-1) experimenta
 
  -- Julien Cristau <jcristau@debian.org>  Tue, 29 Sep 2009 17:51:05 +0200
 
+xorg-server (2:1.6.4-2ubuntu6) lucid; urgency=low
+
+  * 189_xserver_1.5.0_bg_none_root.patch: Moblin patch to allow X to
+    create a root window with no background by passing the -nr
+    argument.  This will make X no longer clear the framebuffer when it
+    starts, thus eliminating a flicker between bootsplash and gdm.  -nr
+    is ignored if this feature is not supported by the driver.  This patch
+    is not upstream yet.
+    TESTERS:  Watch for screen corruption issues during X or app start.
+  * 190_cache-xkbcomp_output_for_fast_start_up.patch: Causes the X
+    Keyboard Compiler (xkbcomp) to create a cache file of the keyboard
+    settings.  This will make the 2nd and later boots slightly faster.
+    TESTERS:  Watch for issues relating to keyboard customizations not
+    taking effect properly following boot.
+
+ -- Bryce Harrington <bryce@ubuntu.com>  Mon, 23 Nov 2009 13:59:44 -0800
+
+xorg-server (2:1.6.4-2ubuntu5) lucid; urgency=low
+
+  * Rework xvfb-run patch to wait for server to come up before checking
+    status (LP: #481591, Debian bug 521075).
+
+ -- Kees Cook <kees@ubuntu.com>  Fri, 13 Nov 2009 16:15:36 -0800
+
+xorg-server (2:1.6.4-2ubuntu4) karmic; urgency=low
+
+  * Add 188_default_primary_to_first_busid.patch: X can abort if multiple
+    video devices are present, and none are marked as primary.  This makes
+    X just pick the first one it sees and carry on.
+    (LP: #459512)
+
+ -- Bryce Harrington <bryce@ubuntu.com>  Mon, 26 Oct 2009 10:05:44 -0700
+
+xorg-server (2:1.6.4-2ubuntu3) karmic; urgency=low
+
+  * local/xvfb-run: Fix race condition in xvfb-run that can cause
+    concurrent invocations to fail.
+    (LP: #348052)
+
+ -- Bryce Harrington <bryce@ubuntu.com>  Wed, 14 Oct 2009 15:21:51 -0700
+
+xorg-server (2:1.6.4-2ubuntu2) karmic; urgency=low
+
+  * Add 187_edid_quirk_hp_nc8430.patch: Quirk for another LPL monitor, to
+    fix huge font sizes due to invalid EDID from the hardware.
+    (LP: #380009)
+
+ -- Bryce Harrington <bryce@ubuntu.com>  Tue, 13 Oct 2009 02:25:46 -0700
+
+xorg-server (2:1.6.4-2ubuntu1) karmic; urgency=low
+
+  * Merge from Debian unstable.  (LP: #447010)
+    Remaining Ubuntu changes:
+    - debian/control:
+      + set Conflicts: xkb-data (<< 0.9), since xkb-path is
+        different from previous releases
+      + do not Conflict with xserver-xorg-video
+      + xvfb Depends on xauth, xfonts-base
+      + Set Maintainer to Ubuntu Core Developers
+    - debian/rules:
+      + build using -fno-stack-protector
+      + --with-os-vendor=Ubuntu
+    - debian/xserver-xorg-core.install:
+      + Add ioport, pcitweak, scanpci scripts & man pages
+    - debian/patches:
+      + 101_fedora_xserver-1.3.0-document-fontpath-correctly.patch:
+        Specify correct paths to fonts
+      + 102_ubuntu_sharevts_load_cpu.patch:
+        close console fd only when ShareVTs
+      + 103_psb_auto.patch:
+        Autodetect poulsbo devices (but use -vesa since -psb is broken)
+      + 110_fedora_no_move_damage.patch:
+        further aiglx support
+      + 121_only_switch_vt_when_active.diff:
+        Add a check to prevent the X server from changing the VT when killing
+        GDM from the console.
+      + 135_rethrow_signals.patch:
+        When aborting, re-raise signals for apport
+      + 140_quell_acpi_errmsgs.patch:
+        Avoid generating extraneous warnings when acpi is missing
+      + 153_make_dmx_compile.patch:
+        Change xcalloc -> calloc, so that dmx compiles.
+      + 156_exevents_copykeyclass_nullptrcheck.patch,
+        157_check_null_modes.patch, 162_null_crtc_in_rotation.patch,
+        166_nullptr_xinerama_keyrepeat.patch, 167_nullptr_xisbread.patch
+        169_mipointer_nullptr_checks.patch,
+        172_cwgetbackingpicture_nullptr_check.patch:
+        Fix various segfaults in xserver by checking pointers for NULL
+        values before dereferencing them.
+      + 164_trap-aspect-ratios.patch:
+        Correct monitor EDIDs that have misreported aspect ratios.
+      + 165_man_xorg_conf_no_device_ident.patch
+        Correct man page
+      + 168_glibc_trace_to_stderr.patch:
+        Report abort traces to stderr instead of terminal
+      + 174_set_bg_pixmap_of_cow_to_none.patch:
+        Set background pixmap of composite overlay window to no background
+      + 177_animated_cursor_change_master.patch:
+        Don't create animated cursors for slave devices
+      + 180_fedora_no_synaptics_mouse_synthesis.patch:
+        Don't synthesize a mouse section if a synaptics device is found
+      + 181_fedora_log_proc_cmdline.patch:
+        Dump /proc/cmdline in the log file too
+      + 184_virtual_devices_autodetect.patch:
+        Use vesa for qemu device, which is not supported by cirrus
+      + 185_dix_badwindow.patch:
+        Don't return BadMatch from GetProperty if window isn't actually a window
+      + 186_autoconfig_geode.patch
+        Perform autodetection correctly for various geode devices
+  * Update 184_virtual_devices_autodetect.patch to only include inserting
+    cirrus, since vbox is covered by the new fedora patch.
+  * Drop patches already included upstream:
+    - 187_lastdeviceeventtime-no-reset.patch
+    - 178_glx_flush_cache.patch
+    - 179_glx_cleanup_drawables.patch
+    - 183_dont_reset_event_time.patch
+    - 182_negative_sync_transitions.patch
+  * Ubuntu bugs fixed as of this release:
+    - Generate key up event only when key is released.  (Fixed previously)
+      (LP: #403339)
+    - Fix XDPMS change event idle handling
+      (LP: #114336, #152999)
+    - Don't shutdown the libhal ctx if it failed to initialize.  Fixes
+      crash if HAL or dbus is not running or is interrupted.
+      (LP: #114336)
+    - Fix crash if SendCoreEvents is off.  Don't send events through
+      master in this case.
+      (LP: #368135)
+    - Fix SWCursor check in xf86CursorSetCursor to prevent cursor image
+      showing up on every screen with Xinerama.
+      (LP: #357901)
+
+ -- Bryce Harrington <bryce@ubuntu.com>  Fri, 09 Oct 2009 12:01:52 -0700
+
+xorg-server (2:1.6.4-2) unstable; urgency=low
+
+  * Add fix-dga-removal.patch, closes: #548724.
+
+ -- Brice Goglin <bgoglin@debian.org>  Wed, 30 Sep 2009 22:40:29 +0200
+
 xorg-server (2:1.6.4-1) unstable; urgency=low
 
   * New upstream release.
@@ -2056,12 +5643,105 @@ xorg-server (2:1.6.3.901-1) unstable; ur
 
  -- Julien Cristau <jcristau@debian.org>  Mon, 14 Sep 2009 15:33:46 +0200
 
+xorg-server (2:1.6.3-1ubuntu7) karmic; urgency=low
+
+  * Add 187_lastdeviceeventtime-no-reset.patch: Avoids resetting IDLETIME on
+    DPMS events.  Cherrypick from upstream.
+    (LP: #397839)
+
+ -- Loïc Minier <loic.minier@ubuntu.com>  Mon, 28 Sep 2009 10:54:08 +0200
+
+xorg-server (2:1.6.3-1ubuntu6) karmic; urgency=low
+
+  * Add 186_autoconfig_geode.patch:  Add autoconfiguration support for
+    older geode cards.  Cherrypick from upstream.
+    (LP: #423866)
+
+ -- Bryce Harrington <bryce@ubuntu.com>  Tue, 08 Sep 2009 15:43:28 -0700
+
+xorg-server (2:1.6.3-1ubuntu5) karmic; urgency=low
+
+  * Add 185_dix_badwindow.patch: dixLookupWindow may return BadMatch if
+    the window in question isn't actually a window. In this case,
+    GetProperty needs to return BadWindow - not BadMatch.  Fixes unexpected
+    crash in some GNOME applications not expecting to get BadMatch returned
+    from this function call.
+    (LP: #321041)
+
+ -- Bryce Harrington <bryce@ubuntu.com>  Thu, 03 Sep 2009 18:27:04 -0700
+
+xorg-server (2:1.6.3-1ubuntu4) karmic; urgency=low
+
+  * Add 184_virtual_devices_autodetect.patch: Automatic driver detection
+    for vbox and kvm for non-cirrus devices.
+    (LP: #338219, #348497)
+
+ -- Bryce Harrington <bryce@ubuntu.com>  Mon, 24 Aug 2009 14:58:22 -0700
+
+xorg-server (2:1.6.3-1ubuntu3) karmic; urgency=low
+
+  * Add 183_dont_reset_event_time.patch:  Upstream cherrypick.
+    Fix another random display blanking issue.  When we turn off DPMS with
+    DPMSModeOff and do dixSaveScreens, don't reset the event time else
+    session clients using IDLETIME will be reset.
+    See http://blogs.gnome.org/hughsie/2009/08/17/
+
+ -- Bryce Harrington <bryce@ubuntu.com>  Wed, 19 Aug 2009 10:21:45 -0700
+
+xorg-server (2:1.6.3-1ubuntu2) karmic; urgency=low
+
+  * Add 182_negative_sync_transitions.patch:  Upstream cherrypick.
+    Fix random blanking display when system is not idle, caused by
+    mishandling of negative transition triggers in XSync.
+    (LP: #397839)
+
+ -- Bryce Harrington <bryce@ubuntu.com>  Fri, 14 Aug 2009 11:21:09 -0700
+
+xorg-server (2:1.6.3-1ubuntu1) karmic; urgency=low
+
+  * Merge from Debian unstable.
+  * control: Drop libaudit-dev from build-deps, since SELinux-support
+    is still disabled anyway.
+  * Drop 182_fedora_quirk_pea.patch, included in 1.6.3.
+
+ -- Timo Aaltonen <tjaalton@ubuntu.com>  Wed, 05 Aug 2009 14:11:01 +0300
+
 xorg-server (2:1.6.3-1) unstable; urgency=low
 
   * New upstream release.
 
  -- Brice Goglin <bgoglin@debian.org>  Sat, 01 Aug 2009 08:55:40 +0200
 
+xorg-server (2:1.6.2.901-1ubuntu3) karmic; urgency=low
+
+  * Add 182_fedora_quirk_pea.patch:  Quirk for Peacock Ergovision 19
+    to use first detailed mode.
+  * Add 181_fedora_log_proc_cmdline.patch: Log the /proc/cmdline into
+    Xorg.0.log
+  * Add 180_fedora_no_synaptics_mouse_synthesis.patch: Don't synthesise a
+    mouse section if synaptics devices are found.
+    (LP: #406291, #405281, #396908)
+  * Actually enable patches 178 and 179
+
+ -- Bryce Harrington <bryce@ubuntu.com>  Tue, 04 Aug 2009 02:37:12 -0700
+
+xorg-server (2:1.6.2.901-1ubuntu2) karmic; urgency=low
+
+  * Add 178_glx_flush_cache.patch and 179_glx_cleanup_drawables.patch:
+    - Cleanup destroyed windows and drawables, to prevent crash during
+      compiz startup.
+      (LP: #408293)
+
+ -- Bryce Harrington <bryce@ubuntu.com>  Mon, 03 Aug 2009 07:55:12 -0700
+
+xorg-server (2:1.6.2.901-1ubuntu1) karmic; urgency=low
+
+  [ Timo Aaltonen ]
+  * Merge from Debian unstable. (LP: #403316)
+  * Drop 170_primary_pci_video_device.patch, included in Debian
+
+ -- Timo Aaltonen <tjaalton@ubuntu.com>  Tue, 28 Jul 2009 15:34:16 +0300
+
 xorg-server (2:1.6.2.901-1) unstable; urgency=low
 
   * New upstream release candidate.
@@ -2135,6 +5815,36 @@ xorg-server (2:1.6.1.901-3) unstable; ur
 
  -- Julien Cristau <jcristau@debian.org>  Tue, 23 Jun 2009 19:52:10 +0200
 
+xorg-server (2:1.6.1.901-2ubuntu2) karmic; urgency=low
+
+  * Add xserver-1.5.0-bad-fbdev-thats-mine.patch - If no xorg.conf is
+    specified, framebuffer device can erroneously grab the PCI.  Make
+    it fail instead in this case.
+    (LP: #383407)
+
+ -- Bryce Harrington <bryce@ubuntu.com>  Wed, 24 Jun 2009 15:24:44 -0700
+
+xorg-server (2:1.6.1.901-2ubuntu1) karmic; urgency=low
+
+  * Merge from Debian unstable.
+  * Dropped patches:
+    - obsolete:
+      100_xserver_exa_force_greedy.patch
+      107_fedora_dont_backfill_bg_none.patch
+    - upstream:
+      163_thinko_in_xf86targetpreferred.patch
+      171_xkb_geometry_copying.patch
+      173_edid_quirk_philips_lcd.patch
+      175_set_pointer_screen_in_xtestfakeinput.patch
+      176_quell_warning_exacopydirty.patch
+    - included by Debian: 999_default_modedebug_on.patch
+  * Disable 143_default_to_vesa.patch for now, breaks autoconfiguration
+    when the pci-ids directory exists but has no match. (LP: #379504)
+  * Disable SELinux support for now, because libaudit-dev needs to be
+    moved to main first.
+
+ -- Timo Aaltonen <tjaalton@ubuntu.com>  Sun, 24 May 2009 00:32:37 +0300
+
 xorg-server (2:1.6.1.901-2) unstable; urgency=low
 
   * Merge from upstream server-1.6-branch (commit a9f85dce).
@@ -2199,6 +5909,187 @@ xorg-server (2:1.6.0-1) unstable; urgenc
 
  -- Julien Cristau <jcristau@debian.org>  Thu, 09 Apr 2009 00:36:40 +0100
 
+xorg-server (2:1.6.0-0ubuntu15) karmic; urgency=low
+
+  * Re-enable 999_default_modedebug_on.patch to provide debug info in
+    Xorg.0.log for development series.
+
+ -- Bryce Harrington <bryce@ubuntu.com>  Sun, 10 May 2009 22:35:02 -0700
+
+xorg-server (2:1.6.0-0ubuntu14) jaunty; urgency=low
+
+  * Add 177_animated_cursor_change_master.patch: Fixes crash when using
+    animated cursors.
+    (LP: #358009)
+
+ -- Bryce Harrington <bryce@ubuntu.com>  Wed, 08 Apr 2009 18:52:56 -0700
+
+xorg-server (2:1.6.0-0ubuntu13) jaunty; urgency=low
+
+  * Add 176_quell_warning_exacopydirty.patch: Quells innocuous but scary
+    sounding "exaCopyDirty: Pending damage region empty!" warning, as it
+    can lead to false-positives with bug reporters.
+
+ -- Bryce Harrington <bryce@ubuntu.com>  Wed, 08 Apr 2009 14:49:36 -0700
+
+xorg-server (2:1.6.0-0ubuntu12) jaunty; urgency=low
+
+  * local/xvfb-run: Revert change from 2:1.6.0-0ubuntu9; prevents running
+    multiple times.
+    (LP: #357338.  Reopen 348052 rejecting patch)
+
+ -- Bryce Harrington <bryce@ubuntu.com>  Tue, 07 Apr 2009 15:21:32 -0700
+
+xorg-server (2:1.6.0-0ubuntu11) jaunty; urgency=low
+
+  * Add 175_set_pointer_screen_in_xtestfakeinput.patch: Fixes issue when
+    using Vino, mouse cursor can get stuck in the upper left corner of the
+    screen.  The POINTER_SCREEN flag must be set explicitly for XTest core events to avoid
+    out-of-range events when the lastSlave was an SD with an explicit axis range.
+    Device events sent through XTest don't need this flag, they are expected to be
+    in the valuator range of the device anyway.
+    (LP: #337926)
+
+ -- Bryce Harrington <bryce@ubuntu.com>  Mon, 06 Apr 2009 17:22:35 -0700
+
+xorg-server (2:1.6.0-0ubuntu10) jaunty; urgency=low
+
+  * debian/patches/174_set_bg_pixmap_of_cow_to_none.patch:
+    - Set bg pixmap of composite overlay window to None.
+      Thanks to Havoc Pennington for the patch.
+      (LP: #356254).
+
+ -- Alberto Milone <alberto.milone@canonical.com>  Mon, 06 Apr 2009 15:06:14 +0200
+
+xorg-server (2:1.6.0-0ubuntu9) jaunty; urgency=low
+
+  * local/xvfb-run: Fixes race condition with concurrent invocations
+    (LP: #348052)
+  * local/xvfb-run, xvfb-run.1: Add correct docs about error codes
+    (LP: #328205)
+  * local/xserver-xephyr.1, rules, xserver-xephyr.install: Add man page
+    for xephyr
+    (LP: #134906)
+
+ -- Bryce Harrington <bryce@ubuntu.com>  Wed, 01 Apr 2009 20:37:22 -0700
+
+xorg-server (2:1.6.0-0ubuntu8) jaunty; urgency=low
+
+  * Add 173_edid_quirk_philips_lcd.patch :
+    Quirk for wrongly reported screen dimensions.
+    Fixes "huge fonts" issues.
+    (LP: #353074)
+
+ -- Tormod Volden <debian.tormod@gmail.com>  Wed, 01 Apr 2009 19:47:13 +0200
+
+xorg-server (2:1.6.0-0ubuntu7) jaunty; urgency=low
+
+  * Add 172_cwgetbackingpicture_nullptr_check.patch:
+    - cwGetBackingPicture can segfault when minimizing/maximizing firefox with
+      a flash video playing.  This appears to be a race condition in which the
+      backing picture's data is not always fully defined.
+      (LP: #319402)
+
+ -- Bryce Harrington <bryce@ubuntu.com>  Mon, 30 Mar 2009 22:20:17 -0700
+
+xorg-server (2:1.6.0-0ubuntu6) jaunty; urgency=low
+
+  * Add 171_xkb_geometry_copying.patch:
+    - Fixes crash when plugging/unplugging USB devices due to incorrect
+      copying of XKB geometry base_color and label_color.  Patch
+      cherrypicked from upstream.
+      (LP: #333222, #321946)
+
+ -- Bryce Harrington <bryce@ubuntu.com>  Fri, 27 Mar 2009 19:58:33 -0700
+
+xorg-server (2:1.6.0-0ubuntu5) jaunty; urgency=low
+
+  [Tormod Volden]
+  * Disable 160_log_timestamping.patch before the beta, this was only used
+    for testing, and the patch also has a serious stack corruption bug.
+    (LP: #328035)
+
+  [Bryce Harrington]
+  * Disable 999_default_modedebug_on.patch before the beta, this was used
+    only for testing.
+  * Add 169_mipointer_nullptr_checks.patch:
+    - MIPOINTER() can return NULL in some circumstances, so always check
+      its return value before dereferencing.
+    - Fixes crash with keyrepeat on non-primary screen on -nvidia when
+      using Xinerama (and probably other serious mipointer-related crashes)
+      (LP: #324465)
+  * Add 170_primary_pci_video_device.patch:
+    - Patch from redhat
+    - Fixes failure when multiple video cards are present.  Xserver currently
+      exits with an error "(EE) No device detected" in such cases.
+      (LP: #267241)
+
+ -- Bryce Harrington <bryce@ubuntu.com>  Tue, 24 Mar 2009 09:57:17 -0700
+
+xorg-server (2:1.6.0-0ubuntu4) jaunty; urgency=low
+
+  * Add 168_glibc_trace_to_stderr.patch:
+    - Catch glibc internal abort traces on stderr instead of to the
+      controlling terminal (LP: #345748).
+
+ -- Kees Cook <kees@ubuntu.com>  Thu, 19 Mar 2009 22:39:33 -0700
+
+xorg-server (2:1.6.0-0ubuntu3) jaunty; urgency=low
+
+  * Add 165_man_xorg_conf_no_device_ident.patch:
+    - Device identifier no longer necessary in Screen section of
+      xorg.conf.  Update man page accordingly.
+      (LP: #261577)
+  * Add 166_nullptr_xinerama_keyrepeat.patch:
+    - Avoids null pointer dereference when holding down keys on
+      non-primary screen when using TwinView / Xinerama on -nvidia.
+      (LP: #324465)
+  * Add 167_nullptr_xisbread.patch:
+    - Avoids null pointer dereference in XisbRead to prevent a (difficult
+      to reproduce) crash during or after a resume from RAM.
+      (LP: #324368)
+
+ -- Bryce Harrington <bryce@ubuntu.com>  Thu, 19 Mar 2009 00:17:40 -0700
+
+xorg-server (2:1.6.0-0ubuntu2) jaunty; urgency=low
+
+  * Add 163_thinko_in_xf86targetpreferred.patch:
+    - For monitors that do not define a "preferred" mode, if the monitor
+      is not connected to the first output, X wouldn't pick up the mode
+      correctly, resulting in a "No modes" error in Xorg.0.log and dropping
+      user to failsafe-X mode.
+      (LP: #335214)
+  * Add 164_trap-aspect-ratios.patch:
+    - Some monitors fib in the EDID they provide, giving their physical
+      dimensions in the global block, and their aspect ratio(!) in
+      the detailed timings.  This totally messes up DPI calculations
+      resulting in huge fonts.
+      (LP: #320930)
+
+ -- Bryce Harrington <bryce@ubuntu.com>  Wed, 18 Mar 2009 20:47:12 -0700
+
+xorg-server (2:1.6.0-0ubuntu1) jaunty; urgency=low
+
+  [ Bryce Harrington ]
+  * New upstream release
+    - Fixes segfault during X startup for drivers with RANDR < 1.2
+      (LP: #319210)
+    - Fixes EDID for monitors that incorrectly report aspect ratio instead
+      of resolution (LP: #311485)
+    - Fixes issue where X stops responding to mouse clicks after some time
+      if using Xinerama. (LP: #296167)
+  * Add 162_null_crtc_in_rotation.patch: Fixes crash when two displays on
+    separate cards are attached.  X doesn't work with multiple cards yet,
+    but crashing is not an appropriate way to handle such a situation.
+    (LP: #139990)
+
+  [ Timo Aaltonen ]
+  * 159_xinerama_focus.patch,
+    161_force_paired_kbd_device.patch:
+    - Dropped, applied upstream
+
+ -- Bryce Harrington <bryce@ubuntu.com>  Fri, 06 Mar 2009 14:44:31 -0800
+
 xorg-server (2:1.5.99.902-1) experimental; urgency=low
 
   * New upstream release candidate.
@@ -2208,6 +6099,74 @@ xorg-server (2:1.5.99.902-1) experimenta
 
  -- Julien Cristau <jcristau@debian.org>  Sat, 31 Jan 2009 19:32:31 +0100
 
+xorg-server (2:1.5.99.902-0ubuntu7) jaunty; urgency=low
+
+  * Add 161_force_paired_kbd_device.patch: Fixes issue where a multimedia
+    keyboard (or keyboard-like device) sends its multimedia key events
+    through the mouse device file.  In this case, pair the device with the
+    master before processing the events.  Patch cherrypicked from upstream.
+    (LP: #318261)
+
+ -- Bryce Harrington <bryce@ubuntu.com>  Tue, 17 Feb 2009 17:20:51 -0800
+
+xorg-server (2:1.5.99.902-0ubuntu6) jaunty; urgency=low
+
+  * Add 999_default_modedebug_on.patch.  Defaults ModeDebug to on.
+    Upstream requests that users include this option when forwarding bugs
+    upstream, thus it should be carried at least during development and
+    reverted by -beta.  Performance won't be impacted, and boot time will
+    be slowed only a negligible amount, as it merely adds a few additional
+    prints.
+
+ -- Bryce Harrington <bryce@ubuntu.com>  Tue, 10 Feb 2009 14:06:38 -0800
+
+xorg-server (2:1.5.99.902-0ubuntu5) jaunty; urgency=low
+
+  * Revert 158_raise_maxclients.patch.  Breaks -nvidia.  Binary drivers FTL.
+    (LP: #326344)
+
+ -- Bryce Harrington <bryce@ubuntu.com>  Mon, 09 Feb 2009 13:51:04 -0800
+
+xorg-server (2:1.5.99.902-0ubuntu4) jaunty; urgency=low
+
+  * 160_log_timestamping.patch: Only add timestamp on tagged messages
+    (LP: #285787)
+
+ -- Tormod Volden <debian.tormod@gmail.com>  Fri, 06 Feb 2009 23:33:11 +0100
+
+xorg-server (2:1.5.99.902-0ubuntu3) jaunty; urgency=low
+
+  * Add 160_log_timestamping.patch: Show timestamps in Xorg.*.log
+    files.
+    (LP: #285787)
+
+ -- Bryce Harrington <bryce@ubuntu.com>  Fri, 06 Feb 2009 06:28:48 -0800
+
+xorg-server (2:1.5.99.902-0ubuntu2) jaunty; urgency=low
+
+  [Bryce Harrington]
+  * Add 157_check_null_modes.patch: Catch null pointer dereference in
+    video mode selection, which can cause xserver crash when using SDL
+    applications with qemu/kvm.
+    (LP: #300310)
+  * Add 158_raise_maxclients.patch to raise max number of clients from 256
+    to 512.  Trade-off is that this reduces client resources available to
+    1,048,576 total resources (which should still be ample).
+    (LP: #260138)
+
+  [Steven Harms]
+  * 159_xinerama_focus.patch: Resolves xinerama focus issues
+    with multiple screens
+    (LP: #41301)
+
+ -- Bryce Harrington <bryce@ubuntu.com>  Wed, 04 Feb 2009 22:33:28 -0800
+
+xorg-server (2:1.5.99.902-0ubuntu1) jaunty; urgency=low
+
+  * New upstream release candidate.
+
+ -- Timo Aaltonen <tjaalton@ubuntu.com>  Sat, 31 Jan 2009 11:03:52 +0200
+
 xorg-server (2:1.5.99.901-2) experimental; urgency=low
 
   [ Julien Cristau ]
@@ -2218,6 +6177,13 @@ xorg-server (2:1.5.99.901-2) experimenta
 
  -- Julien Cristau <jcristau@debian.org>  Fri, 23 Jan 2009 21:16:14 +0100
 
+xorg-server (2:1.5.99.901-1ubuntu1) jaunty; urgency=low
+
+  * Merge with Debian experimental.
+  * debian/rules: Include xorg-server.conf for dbus support.
+
+ -- Timo Aaltonen <tjaalton@ubuntu.com>  Fri, 23 Jan 2009 13:53:33 +0200
+
 xorg-server (2:1.5.99.901-1) experimental; urgency=low
 
   * New upstream release candidate.
@@ -2267,23 +6233,227 @@ xorg-server (2:1.5.99.901-1) experimenta
     - x11proto-randr-dev (>= 1.2.99.3)
     - add x11proto-dri2-dev
 
- -- Julien Cristau <jcristau@debian.org>  Wed, 21 Jan 2009 20:59:34 +0100
+ -- Julien Cristau <jcristau@debian.org>  Wed, 21 Jan 2009 20:59:34 +0100
+
+xorg-server (2:1.5.99.901-0ubuntu1) jaunty; urgency=low
+
+  [ Timo Aaltonen ]
+  * debian/rules: Enable dbus-support.
+  * Merge current server-1.6-branch.
+  * Disable patch 107 for now, to see what kind of a performance hit
+    it'll be. The problem it causes is random garbage on windows
+    while apps are being loaded.
+    (LP: #254468)
+  * Remove patches 150, 151, 152, 154, applied upstream.
+
+  [ Bryce Harrington ]
+  * 156_exevents_copykeyclass_nullptrcheck.patch: Add several NULL pointer
+    checks in CopyKeyClass to prevent SEGFAULT seen when pressing button
+    on an ATI USB remote control.
+    (LP: #311254)
+
+ -- Timo Aaltonen <tjaalton@ubuntu.com>  Sat, 17 Jan 2009 16:17:58 +0200
+
+xorg-server (2:1.5.99.3-0ubuntu3) jaunty; urgency=low
+
+  [Timo Aaltonen]
+  * debian/rules: Disable builtin fonts (LP: #308649)
+
+  [Bryce Harrington]
+  * 135_rethrow_signals.patch:  Update for 1.6 and re-enable.
+    (LP: #226668)
+
+ -- Bryce Harrington <bryce@ubuntu.com>  Tue, 16 Dec 2008 19:04:14 -0800
+
+xorg-server (2:1.5.99.3-0ubuntu2) jaunty; urgency=low
+
+  * Merge server-1.6-branch (LP: #308225).
+
+ -- Timo Aaltonen <tjaalton@ubuntu.com>  Tue, 16 Dec 2008 10:00:58 +0200
+
+xorg-server (2:1.5.99.3-0ubuntu1) jaunty; urgency=low
+
+  * Merge from debian experimental git branch.
+  * Dropped patches:
+    - 103_inputproto_1.4.3_is_fine.patch: obsolete
+    - 137_add_device_property_support.patch: upstream
+    - 138_look_at_all_bytes_of_dev_enabled.diff: upstream
+    - 141_improved_driver_selection.patch: upstream
+    - 150_no_visibility_notify_on_unredirect.patch: upstream
+  * 110_fedora_no_move_damage.patch modified to use new function names.
+  * Renumbered 142_psb_auto.patch to 103.
+  * Add a couple of patches from the proposed queue:
+    - 150_dont-update-vcp-valuators.patch
+      The VCP doesn't need to update the valuators anyway since it cannot
+      send XI events. Just skip that bit.
+    - 151_allow-null-as-rulesfile.patch
+      If no rules file is given, simply re-use the previous one. If no
+      RF is given the first time this function is called, use the
+      built-in default.
+    - 152_let-the-ddx-decide-on-the-xkbrulesdefaults.patch
+      Rather than assuming rules in the CoreKeyboardProc, init the default
+      rules in InitCoreDevices, then re-use them later.
+  * Add 153_make_dmx_compile.patch
+    - Change xcalloc -> calloc, so that dmx compiles. Not tested if it
+      also works.
+  * Drop patch 136, since SwitchCoreKeyboard is gone, and patches 151/152
+    basically reimplement the functionality.
+  * Add 154_force-copykeyclass-for-key-events.patch, to fix fdo
+    bug 19048. Without this the server default layout would always be
+    used.
+
+  [ Bryce Harrington ]
+  * Patch 135 updated so that apport actually works now, but leave it
+    disabled until the code is updated for 1.6.
+
+ -- Timo Aaltonen <tjaalton@ubuntu.com>  Mon, 15 Dec 2008 11:34:53 +0200
+
+
+xorg-server (2:1.5.3-1ubuntu1) jaunty; urgency=low
+
+  * Merge from debian-experimental, remaining changes:
+   + debian/control:
+    - x11proto-input-dev, libxi-dev build-deps bumped because of
+      input properties.
+    - Conflict with xserver-xorg-video-psb << 0.15.0-0ubuntu1~804um5
+      as these versions didn't have an ABI provide.
+    - Breaks old synaptics, evdev which didn't have properties.
+   + debian/patches:
+    - 100_xserver_exa_force_greedy.patch
+      Provide a mechanism for drivers to force greedy mode on.
+    - 101_fedora_xserver-1.3.0-document-fontpath-correctly.patch
+      Fixes document fontpaths shown in the man page.
+    - 102_ubuntu_sharevts_load_cpu.patch
+      Close console fd only when using --sharevts.
+    - 103_inputproto_1.4.3_is_fine.patch:
+      Don't require inputproto 1.4.4 in configure.ac.
+    - 107_fedora_dont_backfill_bg_none.patch
+      Disable backfilling of windows created with bg=none, which
+      would otherwise force a framebuffer readback.
+    - 110_fedora_no_move_damage.patch
+      Disable damage notifications on move for manually redirected windows.
+    - 121_only_switch_vt_when_active.diff
+      Add a check to prevent the X server from changing the VT when
+      killing GDM from the console.
+    - 135_rethrow_signals.patch
+      Currently Xorg "eats" its crash signals, issuing an error message
+      that it caught the signal and then aborts.  This patch raises the
+      signal it caught, so that subsequent crash handlers (i.e. apport)
+      can also catch and act on it.
+    - 136_fedora_force_switchcorekeyboard_for_evdev.patch
+      Allow clients to set the layout.
+    - 137_add_device_property_support.patch
+      Add support for input-device properties (XI 1.5).
+    - 138_look_at_all_bytes_of_dev_enabled.diff:  dev->enabled has type
+      Bool, which is typedef'd to int, but is used in comparisons with
+      CARD8 data, which gives incorrect logic on big endian systems,
+      causing failure to initialize keyboard and mouse.
+    - 140_quell_acpid_errmsgs.patch: Don't fill the server log with errors
+      from not being able to connect to acpid.
+    - 141_improved_driver_selection.patch
+      Allow returning multiple drivers to try for a given PCI id.
+      Also includes support for fallback drivers, but only when
+      not using an xorg.conf.
+    - 142_psb_auto.patch
+      Autoload vesa for the psb hardware, psb being broken currently.
+    - 143_default_to_vesa.patch:  If no matching driver is found in the
+      .ids files, set "vesa" as a fallback default, otherwise a driver
+      may be selected regardless of whether it actually provides support
+      for the chipset by videoPtrToDriverList() based on its vendor id.
+    - 150_no_visibility_notify_on_unredirect.patch
+      Do not sent VisibilityNotify events when MapUnmapEvents
+      are disabled
+   + debian/local/xvfb-run: disable the Composite-extension for xvfb.
+   + debian/serverminver: Bump the serverminver because of the newer
+     properties API.
+   + debian/rules:
+     Add --enable-xcsecurity --enable-appgroup. The SECURITY module was
+     disabled by default as part of the SELinux merge. However, we need
+     the security module for xauth on Kubuntu, else ubiquity fails.
+     (LP 247537)
+  * Changes done:
+    - debian/control: xfvb doesn't need to Depend on xauth, xfonts-base
+      anymore, Recommends are pulled in by default now.
+
+ -- Timo Aaltonen <tepsipakki@ubuntu.com>  Wed, 26 Nov 2008 13:42:11 +0200
+
+xorg-server (2:1.5.3-1) experimental; urgency=low
+
+  [ Loic Minier ]
+  * Shut up rmdir error when trying to remove dirs; this might confuse
+    debconf.
+
+  [ Julien Cristau ]
+  * New upstream release.
+  * Fix infinite loop on server reset when swrast_dri.so is missing.  Only
+    push swrast on the glx provider stack on first generation, so we don't
+    turn the stack into a circular list (closes: #500287).
+  * Enable the record extension (closes: #504303).
+  * Merge changes from 2:1.4.2-8.
+
+ -- Julien Cristau <jcristau@debian.org>  Tue, 11 Nov 2008 23:17:14 +0100
+
+xorg-server (2:1.5.2-2ubuntu3) intrepid; urgency=low
+
+  * 138_look_at_all_bytes_of_dev_enabled.diff:  dev->enabled has type
+    Bool, which is typedef'd to int, but is used in comparisons with
+    CARD8 data, which gives incorrect logic on big endian systems,
+    causing failure to initialize keyboard and mouse.
+    (LP: #281610)
+
+ -- Bryce Harrington <bryce@ubuntu.com>  Thu, 23 Oct 2008 07:31:47 -0700
+
+xorg-server (2:1.5.2-2ubuntu2) intrepid; urgency=low
+
+   * 143_default_to_vesa.patch:  If no matching driver is found in the
+     .ids files, set "vesa" as a fallback default, otherwise a driver
+     may be selected regardless of whether it actually provides support
+     for the chipset by videoPtrToDriverList() based on its vendor id.
+     (LP: #261977)
+
+ -- Bryce Harrington <bryce@ubuntu.com>  Thu, 23 Oct 2008 06:21:18 -0700
+
+xorg-server (2:1.5.2-2ubuntu1) intrepid; urgency=low
 
-xorg-server (2:1.5.3-1) experimental; urgency=low
+  * debian/patches/150_no_visibility_notify_on_unredirect.patch
+    - do not sent VisibilityNotify events when MapUnmapEvents
+      are disabled (LP: #278112)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Sat, 18 Oct 2008 00:05:30 +0200
+
+xorg-server (2:1.5.2-1ubuntu4) intrepid; urgency=low
+
+  * Update patch 142_psb_auto to only try vesa, not even psb, as this requires
+    the psb driver to be loadable, and it's not available anymore (and broken
+    anyway).
+
+ -- Loic Minier <lool@dooz.org>  Wed, 15 Oct 2008 18:14:28 +0200
+
+xorg-server (2:1.5.2-1ubuntu3) intrepid; urgency=low
 
-  [ Loic Minier ]
   * Shut up rmdir error when trying to remove dirs; this might confuse
     debconf.
 
-  [ Julien Cristau ]
-  * New upstream release.
-  * Fix infinite loop on server reset when swrast_dri.so is missing.  Only
-    push swrast on the glx provider stack on first generation, so we don't
-    turn the stack into a circular list (closes: #500287).
-  * Enable the record extension (closes: #504303).
-  * Merge changes from 2:1.4.2-8.
+ -- Loic Minier <lool@dooz.org>  Wed, 15 Oct 2008 17:57:13 +0200
 
- -- Julien Cristau <jcristau@debian.org>  Tue, 11 Nov 2008 23:17:14 +0100
+xorg-server (2:1.5.2-1ubuntu2) intrepid; urgency=low
+
+  * Update patch 142_psb_auto to also try psb and vesa for 0x8109.
+  * Apply and drop patch 123_no_composite_for_xvfb_run which was changing
+    files below debian/ (xvfb-run, to disable the Composite extension by
+    default).
+
+ -- Loic Minier <lool@dooz.org>  Wed, 15 Oct 2008 15:27:23 +0200
+
+xorg-server (2:1.5.2-1ubuntu1) intrepid; urgency=low
+
+  * Merge from debian-experimental.
+  * Update patch 142_psb_auto to try vesa if psb fails; thanks Oliver Grawert.
+  * Refresh patch 100_xserver_exa_force_greedy to apply cleanly.
+  * Let xserver-xorg-core conflict with xserver-xorg-video-psb
+    << 0.15.0-0ubuntu1~804um5 as these versions didn't have an ABI provide.
+
+ -- Loic Minier <lool@dooz.org>  Tue, 14 Oct 2008 23:03:06 +0200
 
 xorg-server (2:1.5.2-1) experimental; urgency=low
 
@@ -2301,6 +6471,55 @@ xorg-server (2:1.5.2-1) experimental; ur
 
  -- Julien Cristau <jcristau@debian.org>  Sat, 11 Oct 2008 20:20:28 +0200
 
+xorg-server (2:1.5.1-1ubuntu3) intrepid; urgency=low
+
+  * Pull upstream changes from server-1.5-branch including b595b65e:
+    - Fix GKVE with key_code > 255 (LP: #274203)
+    - DGA: Fix ProcXF86DGASetViewPort for missing support in driver.
+      Fixes a segfault when trying to activate a DGA mode without
+      checking whether DGA modesetting is at all possible.
+    - Check nextEnabledOutput()'s return in bestModeForAspect()
+      In case no enabled outputs, we will reference wrong index of
+      output array.
+    - int10: Fix a nasty memory leak.
+    - int10: Don't warn when scanning for devices we don't have.
+      Some BIOSes (hi XGI!) will attempt to enumerate the PCI bus by
+      asking for the config space of every possible device number.
+      This despite perfectly functional BIOS methods to enumerate the
+      bus exactly.
+    - int10: Remove useless check.
+      If you have more than one PCI device with the same d/b/d/f, you're
+      already in trouble.
+    - http://bugs.freedesktop.org/show_bug.cgi?id=14373
+      xkb: squash canonical types into explicit ones on core reconstruction.
+      xkb: fix core keyboard map generation.
+    - xkb: fix use of uninitialized variable.
+    - Remove usage of mfbChangeWindowAttributes missed in e4d11e58c...
+    - Only build dri2 when DRI2 is enabled.
+  * Merge patches 138 and 139 into 137, and update the properties API to
+    match the current version in master (final API for XI 1.5).
+    (LP: #274728)
+  * Bump the build-dep on x11proto-input-dev and libxi-dev.
+  * Bump the serverminver because of newer properties API.
+  * Add Breaks against current synaptics and evdev, since they use the old
+    API and need to be updated with the server.
+
+ -- Timo Aaltonen <tepsipakki@ubuntu.com>  Fri, 10 Oct 2008 11:16:56 +0300
+
+xorg-server (2:1.5.1-1ubuntu2) intrepid; urgency=low
+
+  * Merge with Debian experimental:
+    - debian/rules: define PCI_TXT_IDS_DIR to unbreak the pci id matching
+      using plain text files provided by drivers. (LP: #261977)
+
+ -- Timo Aaltonen <tepsipakki@ubuntu.com>  Fri, 26 Sep 2008 12:05:12 +0300
+
+xorg-server (2:1.5.1-1ubuntu1) intrepid; urgency=low
+
+  * Merge with Debian experimental. (LP: #269388)
+
+ -- Timo Aaltonen <tepsipakki@ubuntu.com>  Wed, 24 Sep 2008 19:33:34 +0300
+
 xorg-server (2:1.5.1-1) experimental; urgency=low
 
   * New upstream bugfix release.
@@ -2310,6 +6529,18 @@ xorg-server (2:1.5.1-1) experimental; ur
 
  -- Julien Cristau <jcristau@debian.org>  Wed, 24 Sep 2008 17:49:18 +0200
 
+xorg-server (2:1.5.0-1ubuntu1) intrepid; urgency=low
+
+  * Merge with Debian experimental.
+  * 141_improved_driver_selection.patch
+    - Allow returning multiple drivers to try for a given PCI id.
+      Also includes support for fallback drivers, but only when
+      not using an xorg.conf.
+  * 142_psb_auto.patch
+    - Renamed, refreshed.
+
+ -- Timo Aaltonen <tepsipakki@ubuntu.com>  Tue, 09 Sep 2008 11:44:13 +0300
+
 xorg-server (2:1.5.0-1) experimental; urgency=low
 
   * New upstream release.
@@ -2320,6 +6551,50 @@ xorg-server (2:1.5.0-1) experimental; ur
 
  -- Julien Cristau <jcristau@debian.org>  Thu, 04 Sep 2008 02:05:47 +0200
 
+xorg-server (2:1.4.99.906-2ubuntu5) intrepid; urgency=low
+
+  * Bump the serverminver because of input properties.
+
+ -- Timo Aaltonen <tepsipakki@ubuntu.com>  Wed, 03 Sep 2008 16:03:28 +0300
+
+xorg-server (2:1.4.99.906-2ubuntu4) intrepid; urgency=low
+
+  [ Bryce Harrington ]
+  * 140_quell_acpid_errmsgs.patch: Don't fill the server log with errors
+    from not being able to connect to acpid. (LP: #247195)
+
+ -- Timo Aaltonen <tepsipakki@ubuntu.com>  Wed, 03 Sep 2008 10:48:24 +0300
+
+xorg-server (2:1.4.99.906-2ubuntu3) intrepid; urgency=low
+
+  [ Bryce Harrington ]
+  * 135_rethrow_signals.patch:  Update to make it catch and throw a
+    wider variety of signals, and do a clean shutdown of the X server
+    (code borrowed from FatalError()).
+
+ -- Bryce Harrington <bryce@ubuntu.com>  Mon, 01 Sep 2008 13:19:46 -0700
+
+xorg-server (2:1.4.99.906-2ubuntu2) intrepid; urgency=low
+
+  * 103_inputproto_1.4.3_is_fine.patch:
+    - Don't require inputproto 1.4.4 in configure.ac..
+
+ -- Timo Aaltonen <tepsipakki@ubuntu.com>  Thu, 28 Aug 2008 13:24:05 +0300
+
+xorg-server (2:1.4.99.906-2ubuntu1) intrepid; urgency=low
+
+  * Merge with Debian experimental.
+  * Dropped patches, upstream:
+    130_fedora_fix_procxkbsetxyz_to_work_on_all.patch
+    131_remove_open-coded_strcasestr.patch
+    132_add_parsing_for_xkb.options.patch
+    133_support_strlist_for_xkboptions.patch
+    134_protect_against_out_of_bounds.patch
+  * control: Fix build-dep on inputproto to >= 1.4.3-2ubuntu2 for
+    DeviceControlChanged.
+
+ -- Timo Aaltonen <tepsipakki@ubuntu.com>  Thu, 28 Aug 2008 12:39:33 +0300
+
 xorg-server (2:1.4.99.906-2) experimental; urgency=low
 
   * Pull from server-1.5-branch as of Aug 27th
@@ -2330,6 +6605,57 @@ xorg-server (2:1.4.99.906-2) experimenta
 
  -- Julien Cristau <jcristau@debian.org>  Thu, 28 Aug 2008 00:33:02 +0200
 
+xorg-server (2:1.4.99.906-1ubuntu4) intrepid; urgency=low
+
+  * 137_add_device_property_support.patch,
+    138_xi_expose_enable_disabledevice.patch,
+    139_xi_protect_against_null_handlers.patch:
+    - Add support for input-device properties.
+  * debian/control: Bump the build-depends on x11proto-input-dev
+    and libxi-dev.
+
+ -- Timo Aaltonen <tepsipakki@ubuntu.com>  Fri, 22 Aug 2008 09:00:14 +0300
+
+xorg-server (2:1.4.99.906-1ubuntu3) intrepid; urgency=low
+
+  * 130_fedora_fix_procxkbsetxyz_to_work_on_all.patch
+    136_fedora_force_switchcorekeyboard_for_evdev.patch
+    - Allow clients to set the layout.
+  * Drop 130_fedora_call_switchcorekeyboard.patch, obsoleted.
+
+ -- Timo Aaltonen <tepsipakki@ubuntu.com>  Wed, 06 Aug 2008 13:30:28 +0300
+
+xorg-server (2:1.4.99.906-1ubuntu2) intrepid; urgency=low
+
+  * Add 135_rethrow_signals.patch
+    - Currently Xorg "eats" its crash signals, issuing an error message
+      that it caught the signal and then aborts.  This patch raises the
+      signal it caught, so that subsequent crash handlers (i.e. apport)
+      can also catch and act on it.
+
+ -- Bryce Harrington <bryce@ubuntu.com>  Tue, 05 Aug 2008 16:20:46 -0700
+
+xorg-server (2:1.4.99.906-1ubuntu1) intrepid; urgency=low
+
+  * Merge with debian experimental, 1.5RC6 (LP: #247120, #253021)
+  * Drop 120_fedora_xserver-xaa-evict-pixmaps.patch, because offscreen
+    pixmaps are already disabled by default.
+  * Drop 124_fix_randr_no_crtc.patch, fixed upstream.
+  * Add 130_fedora_call_switchcorekeyboard.patch, a hack to fix fd.o bug
+    #16364. Breaks if the first hotplugged keyboard is not the wanted
+    keyboard.
+  * Patches from upstream master:
+    131_remove_open-coded_strcasestr.patch
+    - pre-requisite for the rest
+    132_add_parsing_for_xkb.options.patch
+    - parsing xkb.options didn't work (fd.o #16874)
+    133_support_strlist_for_xkboptions.patch
+    - allow using a list for xkb.options like before.
+    134_protect_against_out_of_bounds.patch
+    - protect against potential out-of-bounds indexing.
+
+ -- Timo Aaltonen <tepsipakki@ubuntu.com>  Tue, 05 Aug 2008 01:49:42 +0300
+
 xorg-server (2:1.4.99.906-1) experimental; urgency=low
 
   * debian/rules: drop useless handling of nostrip in DEB_BUILD_OPTIONS (this
@@ -2353,6 +6679,110 @@ xorg-server (2:1.4.99.906-1) experimenta
 
  -- Julien Cristau <jcristau@debian.org>  Sun, 27 Jul 2008 18:30:45 +0200
 
+xorg-server (2:1.4.99.905-0ubuntu5) intrepid; urgency=low
+
+  * debian/rules:
+    Added --enable-record.  By default, xorg-server does not build the
+    RECORD extension.  Added the record module (for Xnee and other purposes).
+
+ -- Chris Nasho <chris.nasho@sympatico.ca>  Thu, 31 Jul 2008 17:26:00 -0400
+
+xorg-server (2:1.4.99.905-0ubuntu4) intrepid; urgency=low
+
+  * debian/rules:
+    Add --enable-xcsecurity --enable-appgroup.  The SECURITY module was
+    disabled by default in commit 86b2e59bfb79bd042a13c35fbb4ccecec576f629,
+    as part of the SELinux merge.  However, we need the security module
+    for xauth on Kubuntu, else ubiquity fails.  (Ref. LP 247537)
+
+ -- Bryce Harrington <bryce@ubuntu.com>  Wed, 16 Jul 2008 06:01:45 -0700
+
+xorg-server (2:1.4.99.905-0ubuntu3) intrepid; urgency=low
+
+   * patches/124_fix_randr_no_crtc.patch:
+     + In certain circumstances, xrandr multiscreen initialization fails
+       to associate crtcs with monitors, resulting in startup failures
+       in some GDK-based applications when using -vesa.  This occurs
+       because mode-Clock, mode->HTotal, and mode->VTotal are all 0.
+       (LP: #246585)
+
+ -- Bryce Harrington <bryce@ubuntu.com>  Tue, 15 Jul 2008 07:01:13 -0700
+
+xorg-server (2:1.4.99.905-0ubuntu2) intrepid; urgency=low
+
+  * Merge with debian git, new changes:
+    - Build with --enable-glx-tls, we build mesa with TLS support
+      (otherwise swrast_dri.so might fail to load due to unresolved
+      symbols).
+    - Make the servers recommend libgl1-mesa-dri (>= 7.1~rc1).  Without
+      this package, the GLX extension fails to initialise (and takes the
+      server down) due to missing swrast_dri.so.
+
+ -- Timo Aaltonen <tepsipakki@ubuntu.com>  Mon, 07 Jul 2008 11:44:39 +0300
+
+xorg-server (2:1.4.99.905-0ubuntu1) intrepid; urgency=low
+
+  * Merge with Debian experimental, remaining changes:
+  * debian/control:
+    - Change maintainer address.
+    - xvfb Depends on xauth, xfonts-base.
+  * debian/patches:
+    - 100_xserver_exa_force_greedy.patch
+      Provide a mechanism for drivers to force greedy mode on.
+    - 101_fedora_xserver-1.3.0-document-fontpath-correctly.patch
+      Fixes document fontpaths shown in the man page.
+    - 102_ubuntu_sharevts_load_cpu.patch
+      Close console fd only when using --sharevts.
+    - 104_psb_auto.patch
+      Add automatic detection of Poulsbo hardware when running without a
+      Device definition.
+    - 107_fedora_dont_backfill_bg_none.patch
+      Disable backfilling of windows created with bg=none, which
+      would otherwise force a framebuffer readback.
+    - 110_fedora_no_move_damage.patch
+      Disable damage notifications on move for manually redirected windows.
+    - 120_fedora_xserver-xaa-evict-pixmaps.patch
+      A hack to evict XAA pixmaps and disable the pixmap cache when the first
+      texture is bound.
+    - 121_only_switch_vt_when_active.diff
+      Add a check to prevent the X server from changing the VT when
+      killing GDM from the console.
+    - 123_no_composite_for_xvfb_run.patch
+      Use "-extension Composite" to fix xvfb-run crashing.
+  * Cleaned up patches:
+    - upstream, either directly or otherwise implemented:
+      103_fedora_openchrome.patch, 105_reduce_wakeups_from_smart_scheduler.diff
+      108_fedora_honor_displaysize.patch, 109_glx_fail_if_no_texture_bound.diff
+      144_fedora_xserver-1.3.0-xnest-exposures.patch,
+      146_X86EMU-added-blacklist-for-I-O-port-in-0-0xFF-range.patch,
+      147_X86EMU-pass-the-correct-bus-dev-fn-tag-to-pci-emula.patch,
+      148_dix_touchscreen_fixes.diff,
+      149_add_quirks_for_physical_screen_size_issues.patch,
+      150_edid_quirk_lp154w01.patch, 151_x86emu_handle_cpuid.patch,
+      153_exa_skip_empty_glyphs.diff, 154_fix_rotation_for_multimon.diff,
+      155_exa_fix_off-by-one.diff, 156_resize_composite_overlay.diff,
+      157_fix_exa_pixmap_width.diff, 158_xkb_wrapping.diff,
+      159_xkb_default_to_null.diff, 160_default_to_intel.diff,
+      161_fix_big_endian_cursor.diff, 162_cve-2007-6429.diff,
+      163_fix_untrusted_access.diff, 164_fix_context_sharing.diff,
+      165_fedora_xserver-1.5.0-xaa-option-inversion.patch,
+      166_fix_lpl_monitors.diff, 167_xf86AutoConfig_geode_addition.diff,
+      168_closedir.patch,
+      170_xorg-xserver-1.4-cve-2008-1377.diff,
+      171_xorg-xserver-1.4-cve-2008-1379.diff,
+      172_xorg-xserver-1.4-cve-2008-2360.diff,
+      173_xorg-xserver-1.4-cve-2008-2361.diff,
+      174_xorg-xserver-1.4-cve-2008-2362.diff
+    - obsolete:
+      101_fedora-apm-typedefs.patch
+      104_fedora_init_origins_fix.patch
+      142_fedora_xserver-1.3.0-no-pseudocolor-composite.patch
+      169_xf86AutoConfig_choose_default_driver_if_no_pci.patch
+    - unnecessary:
+      106_ubuntu_fpic_libxf86config.patch (the lib is not shipped)
+
+ -- Timo Aaltonen <tepsipakki@ubuntu.com>  Fri, 04 Jul 2008 13:39:34 +0300
+
 xorg-server (2:1.4.99.905-1) experimental; urgency=low
 
   [ Julien Cristau ]
@@ -2704,6 +7134,213 @@ xorg-server (2:1.4.1~git20080131-2) unst
 
  -- Julien Cristau <jcristau@debian.org>  Fri, 14 Mar 2008 15:18:16 +0100
 
+xorg-server (2:1.4.1~git20080131-1ubuntu12) intrepid; urgency=low
+
+   * Fix multiple security issues:
+     + CVE-2008-2360 - RENDER Extension heap buffer overflow
+     + CVE-2008-2361 - RENDER Extension crash
+     + CVE-2008-2362 - RENDER Extension memory corruption
+     + CVE-2008-1379 - MIT-SHM arbitrary memory read
+     + CVE-2008-1377 - RECORD and Security extensions memory corruption
+
+ -- Bryce Harrington <bryce@ubuntu.com>  Wed, 11 Jun 2008 10:54:15 -0700
+
+xorg-server (2:1.4.1~git20080131-1ubuntu11) intrepid; urgency=low
+
+  * 169_xf86AutoConfig_choose_default_driver_if_no_pci.patch
+    - Choose the default driver for the platform instead of the generic
+      default (vesa) if there is no PCI info.  Without this, on platforms
+      like PS3 where fbdev should be used rather than vesa, the system
+      will fail to start up.  (LP: #219424)
+
+ -- Bryce Harrington <bryce@ubuntu.com>  Tue, 13 May 2008 13:09:17 -0700
+
+xorg-server (2:1.4.1~git20080131-1ubuntu10) intrepid; urgency=low
+
+  [Timo Aaltonen]
+  * 166_fix_lpl_monitors.diff:
+    - fix LPL monitors properly (LP: #204065)
+
+  [Martin-Eric Racine]
+  * 167_xf86AutoConfig_geode_addition.diff:
+    - Autodetect geode video devices (LP: #219630)
+
+  [Bryce Harrington]
+  * 166_fix_lpl_monitors.diff:
+    - Modified to apply to Ubuntu
+  * 168_closedir.patch:
+    - Fix crash on PS3 due to closing a dir that wasn't successfully opened
+      (LP: #217647)
+
+ -- Bryce Harrington <bryce@ubuntu.com>  Tue, 13 May 2008 00:03:40 -0700
+
+xorg-server (2:1.4.1~git20080131-1ubuntu9) hardy; urgency=low
+
+  * debian/patches/series,
+    debian/patches/165_fedora_xserver-1.5.0-xaa-option-inversion.patch:
+    - Turn on patch included in previous commit - obviously accidentially
+      forgotten.
+    - Now that its really enabled, make it apply to 1.4.1 code base
+      accordingly. (LP: #182038)
+
+ -- Alexander Sack <asac@ubuntu.com>  Tue, 15 Apr 2008 18:23:51 +0200
+
+xorg-server (2:1.4.1~git20080131-1ubuntu8) hardy; urgency=low
+
+  * debian/patches/165_fedora_xserver-1.5.0-xaa-option-inversion.patch:
+    - Turn XAA Offscreen Pixmaps off by default, and use
+      XaaOffscreenPixmaps "true" to turn them on.  This setting was an
+      early pre-EXA HW optimization attempt that didn't pan out; upstream is
+      deprecating XAA in favor of EXA generally, and for situations where
+      XAA is still in use recommends NOT using this optimization hack, since
+      they found it often just made performance worse, and sometimes created
+      visualization bugs.  People wishing to gain added performance should be
+      experimenting with EXA anyway, not this setting.  (closes LP: #182038)
+
+ -- Bryce Harrington <bryce@ubuntu.com>  Mon, 21 Apr 2008 12:30:53 -0700
+
+xorg-server (2:1.4.1~git20080131-1ubuntu7) hardy; urgency=low
+
+  * 159_xkb_default_to_null.diff:
+    When copying the keymap, make sure the structs default to 0/NULL.
+    (LP: #184651)
+  * 160_default_to_intel.diff:
+    Default to using intel instead of i810. (LP: #158709)
+  * 161_fix_big_endian_cursor.diff:
+    Fix RandR 1.2 driver interface conversion of two colour cursors to
+    ARGB. (LP: #141118)
+  * Fixes from the upstream 1.4-branch:
+    - 162_cve-2007-6429.diff:
+      CVE-2007-6429: Always test for size+offset wrapping.
+    - 163_fix_untrusted_access.diff:
+      Security: Fix for fdo bug #14480: untrusted access broken in 7.3.
+    - 164_fix_context_sharing.diff:
+      Fix context sharing between direct/indirect contexts
+
+ -- Timo Aaltonen <tepsipakki@ubuntu.com>  Wed, 09 Apr 2008 11:06:04 +0300
+
+xorg-server (2:1.4.1~git20080131-1ubuntu6) hardy; urgency=low
+
+  * 157_fix_exa_pixmap_width.diff:
+    A patch from upstream to allow wider pixmaps with EXA (LP: #205599)
+  * 158_xkb_wrapping.diff:
+    A patch reviewed by upstream that prevents keys from getting stuck under
+    certain situations. (LP: #194214)
+  * 51_xkb-and-loathing.diff:
+    Re-enable. Ignore SIGALRM around calls to Popen()/Pclose() to fix a hang
+    when opening menus in OpenOffice.org. (LP: #204137)
+
+ -- Timo Aaltonen <tepsipakki@ubuntu.com>  Sun, 30 Mar 2008 19:18:32 +0300
+
+xorg-server (2:1.4.1~git20080131-1ubuntu5) hardy; urgency=low
+
+  * Add some patches from upstream 1.4-branch or proposed set:
+    - 109_glx_fail_if_no_texture_bound.diff
+      + __glXDRIbindTexImage: Fail if no texture bound to pixmap's texture
+        target.
+    - 153_exa_skip_empty_glyphs.diff
+      + Fix a crasher when EXA and RenderAccel is in use.
+    - 154_fix_rotation_for_multimon.diff
+      + Fix rotation for multi-monitor situation.
+    - 155_exa_fix_off-by-one.diff
+      + Fix off-by-one in polyline drawing.
+    - 156_resize_composite_overlay.diff
+      + Resize composite overlay window when the root window changes.
+        (LP: #199700)
+
+ -- Timo Aaltonen <tepsipakki@ubuntu.com>  Thu, 13 Mar 2008 18:21:41 +0200
+
+xorg-server (2:1.4.1~git20080131-1ubuntu4) hardy; urgency=low
+
+  * Add 152_xserver_exa_force_greedy.patch to provide a mechanism for
+    drivers to force greedy mode on.  (LP: #177492, others)
+
+ -- Bryce Harrington <bryce@ubuntu.com>  Tue, 19 Feb 2008 13:38:16 -0800
+
+xorg-server (2:1.4.1~git20080131-1ubuntu3) hardy; urgency=low
+
+  [ Bryce Harrington ]
+  * Add 150_edid_quirk_lp154w01.patch to fix font size on LGPhilipsLCD
+    LP154W01-TLAE (LP: #127827)
+  * Add 149_add_quirks_for_physical_screen_size_issues.patch to help
+    address various common EDID issues (like monitors that report in
+    centimeters instead of millimeters, etc.)  (LP: #151311)
+
+  [ Timo Aaltonen ]
+  * Add 151_x86emu_handle_cpuid.patch to fix X86EMU CPUID handling.
+    (LP: #180742)
+
+ -- Timo Aaltonen <tepsipakki@ubuntu.com>  Tue, 19 Feb 2008 17:48:05 +0200
+
+xorg-server (2:1.4.1~git20080131-1ubuntu2) hardy; urgency=low
+
+    * Add patch 148_dix_touchscreen_fixes.diff from Matthew Garrett to fix
+      touchscreen issues with DIX.
+      http://lists.freedesktop.org/archives/xorg-commit/2008-February/014648.html
+
+ -- Steve Kowalik <stevenk@ubuntu.com>  Fri, 08 Feb 2008 10:30:04 +1100
+
+xorg-server (2:1.4.1~git20080131-1ubuntu1) hardy; urgency=low
+
+  [ Timo Aaltonen ]
+  * Merge with Debian unstable, remaining changes:
+  * debian/control:
+    - Change maintainer address.
+    - set Conflicts: xkb-data (<< 0.9), since xkb-path is
+      different compared to Dapper.
+    - xvfb Depends on xauth, xfonts-base.
+  * debian/patches:
+    - 101_fedora-apm-typedefs.patch:
+      Temporary hack from Fedora for broken kernels that don't publish the
+      /dev/apm_bios types.
+    - 102_ubuntu_sharevts_load_cpu.patch:
+      Close console fd only when using --sharevts.
+    - 103_fedora_openchrome.patch:
+      Patch from Fedora to use openchrome instead of via.
+    - 104_fedora_init_origins_fix.patch
+      Multihead initialization.
+    - 105_reduce_wakeups_from_smart_scheduler.diff:
+      Patch from upstream to reduce wakeups and improve battery life.
+    - 106_ubuntu_fpic_libxf86config.patch
+      Add -fPIC to makefiles for xfree86/parser.
+    - 107_fedora_dont_backfill_bg_none.patch
+      Disable backfilling of windows created with bg=none, which
+      otherwise would force a framebuffer readback.
+    - 110_fedora_no_move_damage.patch
+      Disable damage notifications on move for manually redirected windows.
+    - 120_fedora_xserver-xaa-evict-pixmaps.patch:
+      New version of the hack to copy textures from video memory. Shouldn't
+      break EXA anymore.
+    - 121_only_switch_vt_when_active.diff
+      Add a check to prevent the X server from changing the VT when
+      killing GDM from the console.
+    - 123_no_composite_for_xvfb_run.patch
+      Use "-extension Composite" to fix xvfb-run crashing.
+    - 133_psb_auto.patch
+      Add automatic detection of Poulsbo hardware when running
+      without a Device definition.
+    - 139_fedora_xserver-1.3.0-document-fontpath-correctly.patch
+      Fixes document fontpaths shown in the man page.
+    - 142_fedora_xserver-1.3.0-no-pseudocolor-composite.patch
+      Composite on 8bpp pseudocolor root windows appears to fail, so just
+      disable it on anything pseudocolor for safety.
+    - 144_fedora_xserver-1.3.0-xnest-exposures.patch:
+      Only collect xnest exposures for xexposes with non-zero height and width.
+  * 108_fedora_honor_displaysize.patch:
+    - Patch from upstream/Fedora to honor the DisplaySize-setting.
+      (LP: #135738, b.fd.o #9758)
+  * Drop patch 100_avoid_acpi_insanity.diff, superseded by patch 45.
+
+  [ Bart Trojanowski, Martin-Eric Racine ]
+  * 146_X86EMU-added-blacklist-for-I-O-port-in-0-0xFF-range.patch
+    - Restrict access to I/O ports in range 0-0xFF from x86emu.
+    (LP: #140051)
+  * 147_X86EMU-pass-the-correct-bus-dev-fn-tag-to-pci-emula.patch
+    - Fix improper emulation of PCI access General Software BIOS.
+    (LP: #140051)
+
+ -- Timo Aaltonen <tepsipakki@ubuntu.com>  Tue, 05 Feb 2008 18:57:14 +0200
+
 xorg-server (2:1.4.1~git20080131-1) unstable; urgency=low
 
   [ Brice Goglin ]
@@ -2718,6 +7355,64 @@ xorg-server (2:1.4.1~git20080131-1) unst
 
  -- David Nusinow <dnusinow@debian.org>  Thu, 31 Jan 2008 21:43:12 -0500
 
+xorg-server (2:1.4.1~git20080118-1ubuntu2) hardy; urgency=low
+
+  * Remove the DPI patch for real this time, conflicts with the upstream
+    commit that was pulled.
+  * 105_reduce_wakeups_from_smart_scheduler.diff:
+    Patch from upstream to reduce wakeups and improve battery life.
+
+ -- Timo Aaltonen <tepsipakki@ubuntu.com>  Sat, 19 Jan 2008 20:26:41 +0200
+
+xorg-server (2:1.4.1~git20080118-1ubuntu1) hardy; urgency=low
+
+  * Merge with Debian unstable, remaining changes:
+  * debian/control:
+    - Change maintainer address.
+    - set Conflicts: xkb-data (<< 0.9), since xkb-path is
+      different compared to Dapper.
+    - xvfb Depends on xauth, xfonts-base.
+  * debian/patches:
+    - 100_avoid_acpi_insanity.diff
+      Don't send a configuration change event just because somebody's pressed
+      a brightness key.
+    - 101_fedora-apm-typedefs.patch:
+      Temporary hack from Fedora for broken kernels that don't publish the
+      /dev/apm_bios types.
+    - 102_ubuntu_sharevts_load_cpu.patch:
+      Close console fd only when using --sharevts.
+    - 103_fedora_openchrome.patch:
+      Patch from Fedora to use openchrome instead of via.
+    - 104_fedora_init_origins_fix.patch
+      Multihead initialization.
+    - 106_ubuntu_fpic_libxf86config.patch
+      Add -fPIC to makefiles for xfree86/parser.
+    - 107_fedora_dont_backfill_bg_none.patch
+      Disable backfilling of windows created with bg=none, which
+      otherwise would force a framebuffer readback.
+    - 110_fedora_no_move_damage.patch
+      Disable damage notifications on move for manually redirected windows.
+    - 120_fedora_xserver-xaa-evict-pixmaps.patch:
+      New version of the hack to copy textures from video memory. Shouldn't
+      break EXA anymore.
+    - 121_only_switch_vt_when_active.diff
+      Add a check to prevent the X server from changing the VT when
+      killing GDM from the console.
+    - 123_no_composite_for_xvfb_run.patch
+      Use "-extension Composite" to fix xvfb-run crashing.
+    - 133_psb_auto.patch
+      Add automatic detection of Poulsbo hardware when running
+      without a Device definition.
+    - 139_fedora_xserver-1.3.0-document-fontpath-correctly.patch
+      Fixes document fontpaths shown in the man page.
+    - 142_fedora_xserver-1.3.0-no-pseudocolor-composite.patch
+      Composite on 8bpp pseudocolor root windows appears to fail, so just
+      disable it on anything pseudocolor for safety.
+    - 144_fedora_xserver-1.3.0-xnest-exposures.patch:
+      Only collect xnest exposures for xexposes with non-zero height and width.
+
+ -- Timo Aaltonen <tepsipakki@ubuntu.com>  Sat, 19 Jan 2008 02:40:00 +0200
+
 xorg-server (2:1.4.1~git20080118-1) unstable; urgency=low
 
   [ Brice Goglin ]
@@ -2754,6 +7449,57 @@ xorg-server (2:1.4.1~git20080105-2) unst
 
  -- Julien Cristau <jcristau@debian.org>  Thu, 17 Jan 2008 15:10:03 +0100
 
+xorg-server (2:1.4.1~git20080105-1ubuntu1) hardy; urgency=low
+
+  * Merge with Debian unstable, remaining changes:
+  * debian/control:
+    - Change maintainer address.
+    - set Conflicts: xkb-data (<< 0.9), since xkb-path is
+      different compared to Dapper.
+    - xvfb Depends on xauth, xfonts-base.
+  * debian/patches:
+    - 100_avoid_acpi_insanity.diff
+      Don't send a configuration change event just because somebody's pressed
+      a brightness key.
+    - 101_fedora-apm-typedefs.patch:
+      Temporary hack from Fedora for broken kernels that don't publish the
+      /dev/apm_bios types.
+    - 102_ubuntu_sharevts_load_cpu.patch:
+      Close console fd only when using --sharevts.
+    - 104_fedora_init_origins_fix.patch
+      Multihead initialization.
+    - 106_ubuntu_fpic_libxf86config.patch
+      Add -fPIC to makefiles for xfree86/parser.
+    - 107_fedora_dont_backfill_bg_none.patch
+      Disable backfilling of windows created with bg=none, which
+      otherwise would force a framebuffer readback.
+    - 110_fedora_no_move_damage.patch
+      Disable damage notifications on move for manually redirected windows.
+    - 120_fedora_xserver-xaa-evict-pixmaps.patch:
+      New version of the hack to copy textures from video memory. Shouldn't
+      break EXA anymore.
+    - 121_only_switch_vt_when_active.diff
+      Add a check to prevent the X server from changing the VT when
+      killing GDM from the console.
+    - 123_no_composite_for_xvfb_run.patch
+      Use "-extension Composite" to fix xvfb-run crashing.
+    - 133_psb_auto.patch
+      Add automatic detection of Poulsbo hardware when running
+      without a Device definition.
+    - 138_fedora_xserver-1.3.0-default-dpi.patch
+      Changes default dpi to 96.
+    - 139_fedora_xserver-1.3.0-document-fontpath-correctly.patch
+      Fixes document fontpaths shown in the man page.
+    - 142_fedora_xserver-1.3.0-no-pseudocolor-composite.patch
+      Composite on 8bpp pseudocolor root windows appears to fail, so just
+      disable it on anything pseudocolor for safety.
+    - 144_fedora_xserver-1.3.0-xnest-exposures.patch:
+      Only collect xnest exposures for xexposes with non-zero height and width.
+  * debian/patches/103_fedora_openchrome.patch:
+    - Patch from Fedora to use openchrome instead of via.
+
+ -- Timo Aaltonen <tepsipakki@ubuntu.com>  Tue, 08 Jan 2008 18:05:21 +0200
+
 xorg-server (2:1.4.1~git20080105-1) unstable; urgency=low
 
   * Don't reference non-existent bug-reporting.txt file in xvfb-run.1
@@ -2764,6 +7510,60 @@ xorg-server (2:1.4.1~git20080105-1) unst
 
  -- David Nusinow <dnusinow@debian.org>  Sun, 06 Jan 2008 16:56:38 -0500
 
+xorg-server (2:1.4.1~git20071212-1ubuntu2) hardy; urgency=low
+
+  * debian/patches/101_fedora-apm-typedefs.patch:
+    - Temporary hack from Fedora for broken kernels that don't publish the
+      /dev/apm_bios types.
+
+ -- Timo Aaltonen <tepsipakki@ubuntu.com>  Mon, 17 Dec 2007 11:54:46 +0200
+
+xorg-server (2:1.4.1~git20071212-1ubuntu1) hardy; urgency=low
+
+  * Merge with Debian unstable, remaining changes:
+  * debian/control:
+    - Change maintainer address.
+    - set Conflicts: xkb-data (<< 0.9), since xkb-path is
+      different compared to Dapper.
+    - xvfb Depends on xauth, xfonts-base.
+  * debian/patches:
+    - 100_avoid_acpi_insanity.diff
+      Don't send a configuration change event just because somebody's pressed
+      a brightness key.
+    - 102_ubuntu_sharevts_load_cpu.patch:
+      Close console fd only when using --sharevts.
+    - 104_fedora_init_origins_fix.patch
+      Multihead initialization.
+    - 106_ubuntu_fpic_libxf86config.patch
+      Add -fPIC to makefiles for xfree86/parser.
+    - 107_fedora_dont_backfill_bg_none.patch
+      Disable backfilling of windows created with bg=none, which
+      otherwise would force a framebuffer readback.
+    - 110_fedora_no_move_damage.patch
+      Disable damage notifications on move for manually redirected windows.
+    - 120_fedora_xserver-xaa-evict-pixmaps.patch:
+      New version of the hack to copy textures from video memory. Shouldn't
+      break EXA anymore.
+    - 121_only_switch_vt_when_active.diff
+      Add a check to prevent the X server from changing the VT when
+      killing GDM from the console.
+    - 123_no_composite_for_xvfb_run.patch
+      Use "-extension Composite" to fix xvfb-run crashing.
+    - 133_psb_auto.patch
+      Add automatic detection of Poulsbo hardware when running
+      without a Device definition.
+    - 138_fedora_xserver-1.3.0-default-dpi.patch
+      Changes default dpi to 96.
+    - 139_fedora_xserver-1.3.0-document-fontpath-correctly.patch
+      Fixes document fontpaths shown in the man page.
+    - 142_fedora_xserver-1.3.0-no-pseudocolor-composite.patch
+      Composite on 8bpp pseudocolor root windows appears to fail, so just
+      disable it on anything pseudocolor for safety.
+    - 144_fedora_xserver-1.3.0-xnest-exposures.patch:
+      Only collect xnest exposures for xexposes with non-zero height and width.
+
+ -- Timo Aaltonen <tepsipakki@ubuntu.com>  Thu, 13 Dec 2007 13:43:35 +0200
+
 xorg-server (2:1.4.1~git20071212-2) unstable; urgency=low
 
   * Add patch 08_xkb_infinite_loop.diff from upstream bug#13511: papers over
@@ -2789,6 +7589,55 @@ xorg-server (2:1.4.1~git20071212-1) unst
 
  -- David Nusinow <dnusinow@debian.org>  Wed, 12 Dec 2007 20:19:11 -0500
 
+xorg-server (2:1.4.1~git20071119-1ubuntu1) hardy; urgency=low
+
+  * Merge with Debian unstable, remaining changes:
+  * debian/control:
+    - Change maintainer address.
+    - set Conflicts: xkb-data (<< 0.9), since xkb-path is
+      different compared to Dapper.
+    - xvfb Depends on xauth, xfonts-base.
+  * debian/rules:
+    - --with-os-vendor=Ubuntu
+  * debian/patches:
+    - 100_avoid_acpi_insanity.diff
+      Don't send a configuration change event just because somebody's pressed
+      a brightness key.
+    - 102_ubuntu_sharevts_load_cpu.patch:
+      Close console fd only when using --sharevts.
+    - 104_fedora_init_origins_fix.patch
+      Multihead initialization.
+    - 106_ubuntu_fpic_libxf86config.patch
+      Add -fPIC to makefiles for xfree86/parser.
+    - 107_fedora_dont_backfill_bg_none.patch
+      Disable backfilling of windows created with bg=none, which
+      otherwise would force a framebuffer readback.
+    - 110_fedora_no_move_damage.patch
+      Disable damage notifications on move for manually redirected windows.
+    - 121_only_switch_vt_when_active.diff
+      Add a check to prevent the X server from changing the VT when
+      killing GDM from the console.
+    - 123_no_composite_for_xvfb_run.patch
+      Use "-extension Composite" to fix xvfb-run crashing.
+    - 133_psb_auto.patch
+      Add automatic detection of Poulsbo hardware when running
+      without a Device definition.
+    - 138_fedora_xserver-1.3.0-default-dpi.patch
+      Changes default dpi to 100.
+    - 139_fedora_xserver-1.3.0-document-fontpath-correctly.patch
+      Fixes document fontpaths shown in the man page.
+    - 142_fedora_xserver-1.3.0-no-pseudocolor-composite.patch
+      Composite on 8bpp pseudocolor root windows appears to fail, so just
+      disable it on anything pseudocolor for safety.
+    - 144_fedora_xserver-1.3.0-xnest-exposures.patch:
+      Only collect xnest exposures for xexposes with non-zero height and width.
+  * Bring back old changelog entries.
+  * debian/patches/120_fedora_xserver-xaa-evict-pixmaps.patch:
+    - New version of the hack to copy textures from video memory. Shouldn't
+      break EXA anymore.
+
+ -- Timo Aaltonen <tepsipakki@ubuntu.com>  Tue, 20 Nov 2007 15:35:59 +0200
+
 xorg-server (2:1.4.1~git20071119-1) unstable; urgency=low
 
   * Ship a .orig.tar.gz that's been autoreconf'ed. Closes: #451891
@@ -2838,6 +7687,57 @@ xorg-server (2:1.4.1~git20071117-1) unst
 
  -- David Nusinow <dnusinow@debian.org>  Sat, 17 Nov 2007 18:54:02 -0500
 
+xorg-server (2:1.4.1~git20071105-1ubuntu2) hardy; urgency=low
+
+  * Brown paper bag release: include all the patches.
+
+ -- Timo Aaltonen <tepsipakki@ubuntu.com>  Sat, 10 Nov 2007 15:24:28 +0200
+
+xorg-server (2:1.4.1~git20071105-1ubuntu1) hardy; urgency=low
+
+  * Merge with Debian unstable, remaining changes:
+  * debian/control:
+    - Change maintainer address.
+    - set Conflicts: xkb-data (<< 0.9), since xkb-path is
+      different compared to Dapper.
+    - xvfb Depends on xauth, xfonts-base.
+  * debian/rules:
+    - --with-os-vendor=Ubuntu
+  * debian/patches:
+    - 100_avoid_acpi_insanity.diff
+      Don't send a configuration change event just because somebody's pressed
+      a brightness key.
+    - 102_ubuntu_sharevts_load_cpu.patch:
+      Close console fd only when using --sharevts.
+    - 104_fedora_init_origins_fix.patch
+      Multihead initialization.
+    - 106_ubuntu_fpic_libxf86config.patch
+      Add -fPIC to makefiles for xfree86/parser.
+    - 107_fedora_dont_backfill_bg_none.patch
+      Disable backfilling of windows created with bg=none, which
+      otherwise would force a framebuffer readback.
+    - 110_fedora_no_move_damage.patch
+      Disable damage notifications on move for manually redirected windows.
+    - 121_only_switch_vt_when_active.diff
+      Add a check to prevent the X server from changing the VT when
+      killing GDM from the console.
+    - 123_no_composite_for_xvfb_run.patch
+      Use "-extension Composite" to fix xvfb-run crashing.
+    - 133_psb_auto.patch
+      Add automatic detection of Poulsbo hardware when running
+      without a Device definition.
+    - 138_fedora_xserver-1.3.0-default-dpi.patch
+      Changes default dpi to 100.
+    - 139_fedora_xserver-1.3.0-document-fontpath-correctly.patch
+      Fixes document fontpaths shown in the man page.
+    - 142_fedora_xserver-1.3.0-no-pseudocolor-composite.patch
+      Composite on 8bpp pseudocolor root windows appears to fail, so just disable
+      it on anything pseudocolor for safety.
+    - 144_fedora_xserver-1.3.0-xnest-exposures.patch:
+      Only collect xnest exposures for xexposes with non-zero height and width.
+
+ -- Timo Aaltonen <tepsipakki@ubuntu.com>  Sat, 10 Nov 2007 13:07:55 +0200
+
 xorg-server (2:1.4-3) unstable; urgency=low
 
   [ David Nusinow ]
@@ -3047,6 +7947,188 @@ xorg-server (2:1.3.0.0.dfsg-13) UNRELEAS
 
  -- Christian Perrier <bubulle@debian.org>  Sun, 26 Aug 2007 12:09:52 +0200
 
+xorg-server (2:1.3.0.0.dfsg-12ubuntu8) gutsy; urgency=low
+
+  * Add 145_glx_visuals_bound_check.patch to fix issue where mesa
+    incorrectly counts its visuals and can free too many of them during
+    video mode changes (VT switch, restart, hibernate, etc.) such as
+    when running Compiz.  (closes LP: #127101)
+
+ -- Bryce Harrington <bryce@ubuntu.com>  Fri, 28 Sep 2007 15:48:08 -0700
+
+xorg-server (2:1.3.0.0.dfsg-12ubuntu7) gutsy; urgency=low
+
+  * Drop 143_fedora_xserver-1.3.0-randr12-config-hack.patch
+    as it causes failure to detect proper resolution on some intel
+    hardware.  (closes LP: #144956)
+
+ -- Bryce Harrington <bryce@ubuntu.com>  Tue, 25 Sep 2007 14:42:59 -0700
+
+xorg-server (2:1.3.0.0.dfsg-12ubuntu6) gutsy; urgency=low
+
+  * Drop 214_Bug_9680-_Remove_bogus_blank_length_limiting_in_xf86SetModeCrtc.patch
+    as it is causing black bars to appear on screen for i810 users.
+    (closes LP: #137604 + several dupes)
+
+ -- Bryce Harrington <bryce@ubuntu.com>  Thu, 20 Sep 2007 14:35:54 -0700
+
+xorg-server (2:1.3.0.0.dfsg-12ubuntu5) gutsy; urgency=low
+
+  [ Kees Cook ]
+  * debian/patches/132_composite-no-clipping.diff: Adjusted WindowRec
+    structure order and RedirectDraw logic to avoid nvidia crashes
+    (fixes LP: #130325).
+  * debian/patches/100_security_fdo-bug-7447.diff: Composite used for
+    pixmap population on redirect. [CVE-2007-4730]
+
+ -- Bryce Harrington <bryce@ubuntu.com>  Tue, 18 Sep 2007 17:20:14 -0700
+
+xorg-server (2:1.3.0.0.dfsg-12ubuntu4) gutsy; urgency=low
+
+  * debian/patches/133_psb_auto.patch:  Add automatic detection of
+    Poulsbo hardware when running without a Device definition.
+  * Added some cherry-picked patches from fedora:
+    - 134_fedorda_xorg-x11-server-1.1.1-vt-activate-is-a-terrible-api.patch:
+      Fixes race condition where someone does a VT_ACTIVATE
+      between another ACTIVATE/WAITACTIVE by adding a fail.
+      (Potentially might address Ubuntu bugs 134478 and/or 134982)
+    - 135_fedora_xorg-x11-server-1.1.1-xkb-in-xnest.patch:  Fixes issue when
+      starting a session in an xnest nest environment as a different user,
+      where keyboard map does not get preserved.  Removes
+      NO_HW_ONLY_EXTS check to address this issue.  (RedHat bug 193431;
+      Potentially may address Ubuntu bug 44846)
+    - 136_fedora_xserver-1.2.0-honor-displaysize.patch:  Fixes issue if monitor
+      width and height have been specified, xserver would override them
+      with the hsize/vsize detected from DDC.
+    - 137_fedora_xserver-1.2.0-vfprintf.patch:  Fixes typo 'vfprinf'
+    - 138_fedora_xserver-1.3.0-default-dpi.patch:  Changes default dpi to 100.
+      (Addresses Ubuntu bugs 118745, 107320, many others...)
+    - 139_fedora_xserver-1.3.0-document-fontpath-correctly.patch: Fixes
+      document fontpaths shown in the man page.
+    - 140_fedora_xserver-1.3.0-domain-obiwan.patch:  Fixes longstanding bug in
+      domain support.
+    - 141_fedora_xserver-1.3.0-edid-quirk-backports.patch: Adds quirk for
+      Samsung SyncMaster 225BW.
+    - 142_fedora_xserver-1.3.0-no-pseudocolor-composite.patch:  Composite on
+      8bpp pseudocolor root windows appears to fail, so just disable it
+      on anything pseudocolor for safety.
+    - 143_fedora_xserver-1.3.0-randr12-config-hack.patch:  Adds check to use
+      the screen's xrandr modes if a preferred mode was not specified.
+    - 144_fedora_xserver-1.3.0-xnest-exposures.patch:  Only collect xnest
+      exposures for xexposes with non-zero height and width.
+
+ -- Bryce Harrington <bryce@ubuntu.com>  Fri,  7 Sep 2007 14:23:23 -0700
+
+xorg-server (2:1.3.0.0.dfsg-12ubuntu3) gutsy; urgency=low
+
+  * Added some cherry-picked patches from xserver 1.3.99:
+    - 202_Add_quirk_for_Acer_AL1706_monitor_to_force_60hz_refresh.patch:
+      The Acer AL1706 monitor reports support for 75hz via EDID, but
+      does not sync when this range is given, so force it to 60hz.
+    - 205_Bug_10770-_Inputdevs_isnt_a_valid_config_file_keyword.patch:
+      Fixes typo in config file parser.
+    - 208_Bug_6620-_Fixed_a_missing_else_in_ATIPseudoDMAInit.patch:
+      Fixes issue where registers were written twice on R200, sometimes
+      also putting bad values in atis->cce_pri_size.
+    - 214_Bug_9680-_Remove_bogus_blank_length_limiting_in_xf86SetModeCrtc.patch:
+      Fixes situation where when a specific mode is requested by monitor
+      or user, xorg would tweak it to something incorrect.
+    - 216_Bug_9041-_Check_the_return_code_in_xf86MapDomainMemory.patch:
+      Fixes issue where mmap return value was being ignored and failing
+      to issue fatal error as it should.
+    - 221_ExaOffscreenMarkUsed-_Dont_crash_when_theres_no_offscreen_memory.patch:
+      Fixes crash when there is no offscreen memory for EXA.
+    - 222_Fix_a_crash_when_rotating_the_screen.patch:
+      Fixes crash when rotating screen with xrandr.
+    - 223_Fix_bug_8871-scrolling_corruption_with_a_compositing_manager.patch:
+      Fixes scrolling corruption with composite due to incorrectly
+      generated GraphicsExposes.
+    - 224_Fix_calculations_in_x86_emulator_for_the_long_long_case_Andreas_Schwab.patch:
+      Fixes long long multiplication when in x86 emulator.
+    - 227_Fix_sync_polarity_on_Samsung_SyncMaster_205BW_monitor.patch:
+      Adds quirk for Samsung SyncMaster 205BW
+    - 230_In___glXCreateARGBConfig_insert_the_new_GL_mode_at_the__end__of_the_linked_list.patch:
+      Fixes insertion order of linked list that can cause GLX clients to
+      fail when attempting to use the last GLX mode/visual.
+    - 231_In_dmxBackendMouGetInfo_initialize_the_info-minval_maxval_arrays_to_the_size_of_the_backend_display.patch:
+      Fixes potential issue in X input where axis clipping code in
+      GetPointerEvents() constrains the pointer's coordinate range to a
+      max of 0, causing the mouse to not move.
+    - 234_Reapply_patch_to_fix_AMD_CPU_detection.patch:
+      Fixes AMD Geode CPU detection.
+    - 236_Syncmaster_226_monitor_needs_60Hz_refresh_10545.patch:
+      Adds quirk for Samsung SyncMaster 226BW.
+    - 238_Update_pci.ids_to_2007-07-16_snapshot.patch:
+      Updates our pci ids to support more current hardware.
+      Remove nvidia ids in extrapci.ids that are now in pci.ids.
+      Add nvidia ids to extrapci.ids that are in xf86-video-nv but not pci.ids
+    - 241_XFree86-_Treat_evdev_and_vmmouse_as_mouse_drivers_bug_10512_10559.patch:
+      Fix issue where a default mouse device gets automatically added
+      when an evdev or vmmouse section has already been specified.
+    - 243_exaDriverInit-_Fail_if_pScreenInfo_or_a_member_of_it_is_invalid.patch:
+      Fix crash in EXA when pScreenInfo or a member of it is invalid.
+    - 244_fix_an_occasional_crash_in_GetWindowName_bug-_9798.patch:
+      Fixes crash by adding check of XmbTextPropertyToTextList()'s
+      return code.
+    - 245_regenerated_to_fix_bug_10371.patch:
+      Fixes issue where if DRI is disabled, GL_MAX_TEXTURE_COORDS_ARB
+      value is not returned correctly from glGetIntegerv().
+
+ -- Bryce Harrington <bryce@ubuntu.com>  Fri, 31 Aug 2007 18:36:22 -0700
+
+xorg-server (2:1.3.0.0.dfsg-12ubuntu2) gutsy; urgency=low
+
+  * Don't send a configuration change event just because somebody's pressed
+    a brightness key
+
+ -- Matthew Garrett <mjg59@srcf.ucam.org>  Sun, 26 Aug 2007 16:17:15 +0100
+
+xorg-server (2:1.3.0.0.dfsg-12ubuntu1) gutsy; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - debian/control:
+      + set Conflicts: xkb-data (<< 0.9), since xkb-path is
+        different from previous releases
+      + do not Conflict with xserver-xorg-video
+      + xvfb Depends on xauth, xfonts-base
+      + Set Maintainer to Ubuntu Core Developers
+    - debian/rules:
+      + --with-os-vendor=Ubuntu
+    - debian/xserver-xorg-core.install:
+      + Add ioport, pcitweak, scanpci scripts & man pages
+    - debian/patches:
+      + 102_ubuntu_sharevts_load_cpu.patch:
+        close console fd only when ShareVTs
+      + 104_fedora_init_origins_fix.patch:
+        multihead initialization
+      + 106_ubuntu_fpic_libxf86config.patch:
+        Add -fPIC to makefiles for xfree86/parser
+      + 107_fedora_dont_backfill_bg_none.patch
+        110_fedora_no_move_damage.patch,
+        114_fedora_no_composite_in_xnest.patch,
+        120_fedora_disable_offscreen_pixmaps.patch:
+        further aiglx support
+      + 119_ubuntu_enable_composite.diff:
+        enable composite
+      + 121_only_switch_vt_when_active.diff:
+        Add a check to prevent the X server from changing the VT when killing
+        GDM from the console.
+      + 123_no_composite_for_xvfb_run.patch:
+        use "-extension Composite" to fix xvfb-run crashing
+      + 125_glx_remove-stray__GLinterface.diff,
+        126_glxproxy_remove-stray__GLinterface.diff,
+        127_mesa-6.5.3-compat.diff:
+        Patches needed to build against newer Mesa.
+      + 132_composite-no-clipping.diff:
+        Change the semantics of manual-redirect Composite windows so that
+        they do not clip sibling or parent drawing.  Needed by hildon-desktop
+        to prevent home applets from clipping.
+    - debian/apport.py: Add apport hook for automatically attaching
+      files useful for debugging X crashes:  Xorg.0.log, xorg.conf,
+      lsmod, lspci, and /proc/version
+
+ -- Timo Aaltonen <tepsipakki@ubuntu.com>  Tue, 21 Aug 2007 22:01:38 +0300
+
 xorg-server (2:1.3.0.0.dfsg-12) unstable; urgency=low
 
   [ Brice Goglin ]
@@ -3131,6 +8213,73 @@ xorg-server (2:1.3.0.0.dfsg-7) unstable;
 
  -- Julien Cristau <jcristau@debian.org>  Wed, 04 Jul 2007 23:42:40 +0200
 
+xorg-server (2:1.3.0.0.dfsg-6ubuntu3) gutsy; urgency=low
+
+  * debian/patches/series:
+    - Re-enable 132_composite-no-clipping.diff with fix from upstream
+
+ -- Bryce Harrington <bryce@ubuntu.com>  Wed, 25 Jul 2007 16:39:29 -0700
+
+xorg-server (2:1.3.0.0.dfsg-6ubuntu2) gutsy; urgency=low
+
+  * debian/patches/series:
+    - don't apply 132_composite-no-clipping.diff for now, it doesn't work
+      correctly when using compiz
+
+ -- Sebastien Bacher <seb128@canonical.com>  Fri, 13 Jul 2007 17:03:42 +0100
+
+xorg-server (2:1.3.0.0.dfsg-6ubuntu1) gutsy; urgency=low
+
+  * Merge from Debian unstable. Remaining Ubuntu changes:
+    - debian/control:
+      + set Conflicts: xkb-data (<< 0.9), since xkb-path is
+        different from previous releases
+      + do not Conflict with xserver-xorg-video
+      + xvfb Depends on xauth, xfonts-base
+      + Set Maintainer to Ubuntu Core Developers
+    - debian/rules:
+      + build using -fno-stack-protector
+      + --with-os-vendor=Ubuntu
+    - debian/xserver-xorg-core.install:
+      + Add ioport, pcitweak, scanpci scripts & man pages
+    - debian/patches:
+      + 102_ubuntu_sharevts_load_cpu.patch:
+        close console fd only when ShareVTs
+      + 104_fedora_init_origins_fix.patch:
+        multihead initialization
+      + 106_ubuntu_fpic_libxf86config.patch:
+        Add -fPIC to makefiles for xfree86/parser
+      + 107_fedora_dont_backfill_bg_none.patch:
+        Re-enable to see if it helps with performance regressions.
+      + 108_fedora_gl_include_inferiors.patch,
+        110_fedora_no_move_damage.patch,
+        114_fedora_no_composite_in_xnest.patch:
+        further aiglx support
+      + 119_ubuntu_enable_composite.diff:
+        enable composite
+      + 120_fedora_disable_offscreen_pixmaps.patch:
+        update to the latest version from Fedora (rev. 1.6, was 1.1)
+        Despite being a hack, it works and is needed for compositing
+        managers to work properly.
+      + 121_only_switch_vt_when_active.diff:
+        Add a check to prevent the X server from changing the VT when killing
+        GDM from the console.
+      + 123_no_composite_for_xvfb_run.patch:
+        use "-extension Composite" to fix xvfb-run crashing
+      - 125_glx_remove-stray__GLinterface.diff,
+        126_glxproxy_remove-stray__GLinterface.diff,
+        127_mesa-6.5.3-compat.diff:
+        Mesa 6.5.3 build support
+  * debian/apport.py:  Add apport hook for automatically attaching
+    files useful for debugging X crashes:  Xorg.0.log, xorg.conf,
+    lsmod, lspci, and /proc/version
+  * debian/patches/132_composite-no-clipping.diff:  Change the
+    semantics of manual-redirect Composite windows so that they do not
+    clip sibling or parent drawing.  Needed by hildon-desktop to prevent
+    home applets from clipping.
+
+ -- Bryce Harrington <bryce@ubuntu.com>  Mon,  2 Jul 2007 12:47:44 -0700
+
 xorg-server (2:1.3.0.0.dfsg-6) unstable; urgency=low
 
   * Change fglrx conflict to << 8.37.6 (closes: #424975).
@@ -3164,6 +8313,59 @@ xorg-server (2:1.3.0.0.dfsg-5) unstable;
 
  -- Julien Cristau <jcristau@debian.org>  Wed, 16 May 2007 15:17:55 +0200
 
+xorg-server (2:1.3.0.0.dfsg-4ubuntu2) gutsy; urgency=low
+
+  * Build-Depend on mesa 6.5.3
+  * Apply Mandriva patches to build against mesa 6.5.3
+    - 125_glx_remove-stray__GLinterface.diff
+    - 126_glxproxy_remove-stray__GLinterface.diff
+    - 127_mesa-6.5.3-compat.diff
+
+ -- Kyle McMartin <kyle@ubuntu.com>  Sat, 26 May 2007 18:12:35 +0000
+
+xorg-server (2:1.3.0.0.dfsg-4ubuntu1) gutsy; urgency=low
+
+  * Merge from Debian unstable. Remaining Ubuntu changes:
+    - debian/control:
+      + set Conflicts: xkb-data (<< 0.9), since xkb-path is
+        different from previous releases
+      + do not Conflict with xserver-xorg-video
+      + xvfb Depends on xauth, xfonts-base
+      + Set Maintainer to Ubuntu Core Developers
+    - debian/rules:
+      + build using -fno-stack-protector
+      + --with-os-vendor=Ubuntu
+    - debian/xserver-xorg-core.install:
+      + Add ioport, pcitweak, scanpci scripts & man pages
+    - debian/patches:
+      + 102_ubuntu_sharevts_load_cpu.patch:
+        close console fd only when ShareVTs
+      + 104_fedora_init_origins_fix.patch:
+        multihead initialization
+      + 106_ubuntu_fpic_libxf86config.patch:
+        Add -fPIC to makefiles for xfree86/parser
+      + 107_fedora_dont_backfill_bg_none.patch:
+        Re-enable to see if it helps with performance regressions.
+      + 108_fedora_gl_include_inferiors.patch,
+        110_fedora_no_move_damage.patch,
+        114_fedora_no_composite_in_xnest.patch:
+        further aiglx support
+      + 119_ubuntu_enable_composite.diff:
+        enable composite
+      + 120_fedora_disable_offscreen_pixmaps.patch:
+        update to the latest version from Fedora (rev. 1.6, was 1.1)
+        Despite being a hack, it works and is needed for compositing
+        managers to work properly.
+      + 121_only_switch_vt_when_active.diff:
+        Add a check to prevent the X server from changing the VT when killing
+        GDM from the console.
+      + 123_no_composite_for_xvfb_run.patch:
+        use "-extension Composite" to fix xvfb-run crashing
+  * Drop 124_fix-pdripriv_null_deref.patch.  Already fixed in GLX code.
+    See upstream FDO bug #8537
+
+ -- Bryce Harrington <bryce@ubuntu.com>  Mon, 14 May 2007 16:40:03 -0700
+
 xorg-server (2:1.3.0.0.dfsg-4) unstable; urgency=low
 
   * Cherry-pick patch from upstream git to fix security issue in the Xrender
@@ -3336,6 +8538,126 @@ xorg-server (2:1.2.0-4) experimental; ur
 
  -- David Nusinow <dnusinow@debian.org>  Wed, 21 Feb 2007 21:53:51 -0500
 
+xorg-server (2:1.2.0-3ubuntu8) feisty; urgency=low
+
+  * 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
+    CVE-2007-1003
+
+ -- Kees Cook <kees@ubuntu.com>  Thu, 29 Mar 2007 17:46:44 -0700
+
+xorg-server (2:1.2.0-3ubuntu7) feisty; urgency=low
+
+  * debian/patches/120_fedora_disable_offscreen_pixmaps.patch
+    - update to the latest version from Fedora (rev. 1.6, was 1.1)
+
+ -- Timo Aaltonen <tepsipakki@ubuntu.com>  Fri, 30 Mar 2007 10:39:01 +0300
+
+xorg-server (2:1.2.0-3ubuntu6) feisty; urgency=low
+
+  * debian/{rules,xsfbs/xsfbs.mk,serverminver,inputabiver}
+    - Import changes from current debian package, needed for the new intel
+      driver.
+    - Rename serverabiver to videoabiver, value 1.0.
+    - Set serverminver as this version.
+  * debian/patches:
+    129_remove_extra_i2c_bittimeout.patch
+    130_slow_down_ddc_i2c.patch
+    - Patches from server-1.3 branch, which make probing the monitor more
+      robust.
+
+ -- Timo Aaltonen <tepsipakki@ubuntu.com>  Thu, 29 Mar 2007 00:56:17 +0300
+
+xorg-server (2:1.2.0-3ubuntu5) feisty; urgency=low
+
+  * 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)
+
+ -- Timo Aaltonen <tepsipakki@ubuntu.com>  Tue, 27 Mar 2007 02:33:31 +0300
+
+xorg-server (2:1.2.0-3ubuntu4) feisty; urgency=low
+
+  * 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.
+
+ -- Timo Aaltonen <tepsipakki@ubuntu.com>  Sat, 17 Mar 2007 00:38:09 +0200
+
+xorg-server (2:1.2.0-3ubuntu3) feisty; urgency=low
+
+  * 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.
+
+ -- Timo Aaltonen <tepsipakki@ubuntu.com>  Wed, 28 Feb 2007 11:54:18 +0200
+
+xorg-server (2:1.2.0-3ubuntu2) feisty; urgency=low
+
+  * debian/control:
+    - xvfb Depends on xauth, xfonts-base
+
+ -- Sebastien Bacher <seb128@canonical.com>  Tue, 27 Feb 2007 23:31:06 +0100
+
+xorg-server (2:1.2.0-3ubuntu1) feisty; urgency=low
+
+  * 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.
+
+ -- Sebastien Bacher <seb128@canonical.com>  Mon, 26 Feb 2007 09:36:38 +0100
+
 xorg-server (2:1.2.0-3) experimental; urgency=low
 
   [ Julien Cristau ]
@@ -3754,6 +9076,228 @@ xorg-server (2:1.0.2-10) unstable; urgen
 
  -- David Nusinow <dnusinow@debian.org>  Tue, 22 Aug 2006 19:31:08 +0000
 
+xorg-server (1:1.1.1-0ubuntu14) feisty; urgency=low
+
+  * Add 'debian/patches/38_Fix-pDRIPriv_NULL_deref.patch': NULL-init DRI
+    screen private data, thanks to Tormod Volden (LP: #60288).
+
+ -- Kees Cook <kees@ubuntu.com>  Sat, 10 Feb 2007 20:27:44 -0800
+
+xorg-server (1:1.1.1-0ubuntu13) feisty; urgency=low
+
+  * 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)
+
+ -- Sebastien Bacher <seb128@canonical.com>  Fri, 12 Jan 2007 12:17:28 +0100
+
+xorg-server (1:1.1.1-0ubuntu12.1) edgy-security; urgency=low
+
+  * SECURITY UPDATE: Arbitrary code execution with root privileges via heap
+    overflows in DBE and Render extensions.
+  * Add 'debian/patches/021_ubuntu_dbe-render_overflows.diff' from
+    upstream
+  * References
+    CVE-2006-6101 CVE-2006-6102 CVE-2006-6103
+
+ -- Kees Cook <kees@ubuntu.com>  Mon,  8 Jan 2007 12:45:41 -0800
+
+xorg-server (1:1.1.1-0ubuntu12) edgy; urgency=low
+
+  * debian/patches/17_no_composite_for_xvfb.patch:
+    - fix a crasher by not using composite for Xvfb when using -render
+  * debian/patches/18_no_composite_for_xvfb_run.patch:
+    - use "-extension Composite" to fix xvfb-run crashing
+
+ -- Sebastien Bacher <seb128@canonical.com>  Fri, 13 Oct 2006 17:12:49 +0200
+
+xorg-server (1:1.1.1-0ubuntu11) edgy; urgency=low
+
+  * debian/patches/16_only_switch_vt_when_active.patch:
+    Add a check to prevent the X server from changing the VT when killing
+    GDM from the console.
+
+ -- Ryan Lortie <desrt@ubuntu.com>  Thu, 21 Sep 2006 01:26:35 -0400
+
+xorg-server (1:1.1.1-0ubuntu10) edgy; urgency=low
+
+  * Build xserver-xephyr from xorg-server package.  Malone: #57077, #57084
+
+ -- Tollef Fog Heen <tfheen@ubuntu.com>  Wed,  6 Sep 2006 12:57:32 +0200
+
+xorg-server (1:1.1.1-0ubuntu9) edgy; urgency=low
+
+  * Enable composite extension by default
+  * Add patch from fd.o bugzilla #7916 to avoid aiglx hangs on vt
+    switches
+
+ -- Matthew Garrett <mjg59@srcf.ucam.org>  Sat, 26 Aug 2006 03:20:31 +0100
+
+xorg-server (1:1.1.1-0ubuntu8) edgy; urgency=low
+
+  * Steal patch from Fedora to allow compiz to trigger the disabling of
+   XAA off-screen pixmaps
+
+ -- Matthew Garrett <mjg59@srcf.ucam.org>  Wed, 23 Aug 2006 21:26:08 +0100
+
+xorg-server (1:1.1.1-0ubuntu7) edgy; urgency=low
+
+  * (temporarily) Removed Breaks: section from xserver-xorg-core (necessary
+    until apt-get properly supports this feature)
+  * Tightened Build-Depends: mesa-swx11-source to >=
+    6.5.0.git.20060810-0ubuntu1
+  * Tightened Build-Depends of libgl1-mesa-dev to >=
+    6.5.0.git.20060810-0ubuntu1
+
+ -- Rodrigo Parra Novo <rodarvus@ubuntu.com>  Tue, 15 Aug 2006 07:26:07 -0300
+
+xorg-server (1:1.1.1-0ubuntu6) edgy; urgency=low
+
+  * Tightened Build-Depends of mesa-swx11-source to version 6.5.0.git.20060809
+  * Removed patch 003_fedora_root_window_black_pattern.patch (not necessary
+    for Ubuntu)
+
+ -- Rodrigo Parra Novo <rodarvus@ubuntu.com>  Fri, 11 Aug 2006 11:41:29 -0300
+
+xorg-server (1:1.1.1-0ubuntu5) edgy; urgency=low
+
+  * Renamed 003_ubuntu_sharevts_load_cpu.patch to
+    002_ubuntu_sharevts_load_cpu.patch
+  * Added 003_fedora_root_window_black_pattern.patch (black background
+    pattern instead of default X background pattern. Feel free to revert if
+    you feel strongly against this one)
+  * Added 005_fdo4320_composite_fastpath.patch and
+    016_fdo7482_xdmx_render_fix.patch (upstream bug fixes, bug numbers
+    annotated on patch names)
+  * Added 004_fedora_init_origins_fix.patch (multihead initialization)
+  * Added 006_ubuntu_fpic_libxf86config.patch
+  * Added 007_fedora_dont_backfill_bg_none.patch
+  * Added 008_fedora_gl_include_inferiors.patch,
+    009_fedora_mesa_copy_sub_buffer.patch,
+    010_fedora_no_move_damage.patch,
+    012_fedora_tfp_damage.patch and
+    014_fedora_no_composite_in_xnest.patch (further aiglx support)
+  * 011_fedora_pci_scan_fixes.patch (pci scan fixes - testing is needed to
+    check if an extra upstream patch for pci domains is also necessary)
+  * Added 015_fedora_sane_default_mode.patch (tweak default mode - please feel
+    free to revert this patch if you feel strongly against it)
+  * Added 017_fedora_add_missing_headers_to_sdk.patch
+  * Added 018_ubuntu_linux_kernel_include_fixes.patch and
+    013_ubuntu_symlink_mesa_source.patch (build fixes against current
+    linux-kernel-modules * mesa-swx11-source - these already existed before,
+    but were applied directly to the source tree, instead of being quilt
+    patches)
+  * Just for reference: debian patch #02 is candidate for removal on next
+    upload. I'll refrain from removing it now to diminish the chances of this
+    being a breaks-for-everyone release
+  * Moved SecurityPolicy example from /usr/share/doc/examples/ to
+    /usr/share/doc/xserver-xorg-core/
+
+ -- Rodrigo Parra Novo <rodarvus@ubuntu.com>  Mon,  7 Aug 2006 17:21:05 -0300
+
+xorg-server (1:1.1.1-0ubuntu4) edgy; urgency=low
+
+  * Added new Breaks: section to xorg-server-core:
+      xserver-xorg-driver-all, xserver-xorg-driver-apm,
+      xserver-xorg-driver-ark, xserver-xorg-driver-ati,
+      xserver-xorg-driver-chips, xserver-xorg-driver-cirrus,
+      xserver-xorg-driver-cyrix, xserver-xorg-driver-dummy,
+      xserver-xorg-driver-fbdev, xserver-xorg-driver-glint,
+      xserver-xorg-driver-i128, xserver-xorg-driver-i740,
+      xserver-xorg-driver-i810, xserver-xorg-driver-imstt,
+      xserver-xorg-driver-mga, xserver-xorg-driver-neomagic,
+      xserver-xorg-driver-newport, xserver-xorg-driver-nsc,
+      xserver-xorg-driver-nv, xserver-xorg-driver-rendition,
+      xserver-xorg-driver-s3, xserver-xorg-driver-s3virge,
+      xserver-xorg-driver-savage, xserver-xorg-driver-siliconmotion,
+      xserver-xorg-driver-sis, xserver-xorg-driver-sisusb,
+      xserver-xorg-driver-tdfx, xserver-xorg-driver-tga,
+      xserver-xorg-driver-trident, xserver-xorg-driver-tseng,
+      xserver-xorg-driver-v4l, xserver-xorg-driver-vesa,
+      xserver-xorg-driver-vga, xserver-xorg-driver-via,
+      xserver-xorg-driver-vmware, xserver-xorg-driver-voodoo,
+      xserver-xorg-video-all (<< 7.0.22ubuntu7),
+      xserver-xorg-video-apm (<< 1:1.1.1-0ubuntu1),
+      xserver-xorg-video-ark (<< 1:0.6.0-0ubuntu1),
+      xserver-xorg-video-ati (<< 1:6.6.1-0ubuntu1),
+      xserver-xorg-video-chips (<< 1:1.1.1-0ubuntu1),
+      xserver-xorg-video-cirrus (<< 1:1.1.0-0ubuntu1),
+      xserver-xorg-video-cyrix (<< 1:1.1.0-0ubuntu1),
+      xserver-xorg-video-dummy (<< 1:0.2.0-0ubuntu1),
+      xserver-xorg-video-fbdev (<< 1:0.3.0-0ubuntu1),
+      xserver-xorg-video-glint (<< 1:1.1.1-0ubuntu1),
+      xserver-xorg-video-i128 (<< 1:1.2.0-0ubuntu1),
+      xserver-xorg-video-i740 (<< 1:1.1.0-0ubuntu1),
+      xserver-xorg-video-i810 (<< 1:1.6.1-0ubuntu1),
+      xserver-xorg-video-imstt (<< 1:1.1.0-0ubuntu1),
+      xserver-xorg-video-mga (<< 1:1.4.1-0ubuntu1),
+      xserver-xorg-video-neomagic (<< 1:1.1.1-0ubuntu1),
+      xserver-xorg-video-newport (<< 1:0.2.0-0ubuntu1),
+      xserver-xorg-video-nsc (<< 1:2.8.1-0ubuntu1),
+      xserver-xorg-video-nv (<< 1:1.2.0-0ubuntu1),
+      xserver-xorg-video-rendition (<< 1:4.1.0-0ubuntu1),
+      xserver-xorg-video-s3 (<< 1:0.4.1-0ubuntu1),
+      xserver-xorg-video-s3virge (<< 1:1.9.1-0ubuntu1),
+      xserver-xorg-video-savage (<< 1:2.1.1-0ubuntu1),
+      xserver-xorg-video-siliconmotion (<< 1:1.4.1-0ubuntu1),
+      xserver-xorg-video-sis (<< 1:0.9.1-0ubuntu1),
+      xserver-xorg-video-sisusb (<< 1:0.8.1-0ubuntu1),
+      xserver-xorg-video-tdfx (<< 1:1.2.1-0ubuntu1),
+      xserver-xorg-video-tga (<< 1:1.1.0-0ubuntu1),
+      xserver-xorg-video-trident (<< 1:1.2.1-0ubuntu1),
+      xserver-xorg-video-tseng (<< 1:1.1.0-0ubuntu1),
+      xserver-xorg-video-v4l (<< 1:0.1.1-0ubuntu1),
+      xserver-xorg-video-vesa (<< 1:1.2.1-0ubuntu1),
+      xserver-xorg-video-vga (<< 1:4.1.0-0ubuntu1),
+      xserver-xorg-video-via (<< 1:0.2.1-0ubuntu1),
+      xserver-xorg-video-vmware (<< 1:10.13.0-0ubuntu1),
+      xserver-xorg-video-voodoo (<< 1:1.1.0-oubuntu1)
+
+ -- Rodrigo Parra Novo <rodarvus@ubuntu.com>  Tue,  1 Aug 2006 22:59:55 -0300
+
+xorg-server (1:1.1.1-0ubuntu3) edgy; urgency=low
+
+  * Build with -fno-stack-protector (see LP#54650)
+
+ -- Matt Zimmerman <mdz@ubuntu.com>  Mon, 31 Jul 2006 16:28:59 -0700
+
+xorg-server (1:1.1.1-0ubuntu2) edgy; urgency=low
+
+  * (sparc only) removed stale inclusion of asm/kbio.h on
+    hw/xfree86/os-support/linux/lnx_io.c and
+    hw/xfree86/os-support/linux/lnx_kbd.c
+  * Update debian/serverabiver to 1:1.1.1
+
+ -- Rodrigo Parra Novo <rodarvus@ubuntu.com>  Mon, 31 Jul 2006 12:53:22 -0300
+
+xorg-server (1:1.1.1-0ubuntu1) edgy; urgency=low
+
+  * New Upstream version
+  * Changed Build-Depends from mesa-swrast-source to mesa-swx11-source,
+    following Debian package nomenclature
+  * Re-did 12_security_policy_in_etc.diff for 1.1.1
+  * Dropped 15_security_allocate_local.diff (applied upstream)
+  * Dropped 16_SECURITY_setuid.diff (applied upstream)
+  * Dropped 000_ubuntu_fix_read_kernel_mapping.patch (applied upstream)
+  * Dropped 002_ubuntu_fix_for_certain_intel_chipsets.patch (applied upstream)
+  * Updated versioned Build-Depends on mesa-swx11-source to version
+    6.5.0.cvs.20060725-0ubuntu1
+  * Added arrayobj.c, arrayobj.h, bitset.h & rbadaptors.h to
+    GL/symlink-mesa.sh (linked from mesa-swx11-source)
+  * Added arrayobj.c to default build target on GL/mesa/main
+
+ -- Rodrigo Parra Novo <rodarvus@ubuntu.com>  Tue, 25 Jul 2006 20:06:28 -0300
+
+xorg-server (2:1.0.2-10) unstable; urgency=low
+
+  * Upload to unstable to fixed messed up last upload which was supposed to go
+    to experimental. Brown bag o' joy.
+
+ -- David Nusinow <dnusinow@debian.org>  Tue, 22 Aug 2006 19:31:08 +0000
+
 xorg-server (1:1.0.2-9) UNRELEASED; urgency=high
 
   [ Denis Barbier ]
@@ -3866,6 +9410,94 @@ xorg-server (1:1.0.2-1) experimental; ur
 
  -- David Nusinow <dnusinow@debian.org>  Mon, 20 Mar 2006 21:41:04 -0500
 
+xorg-server (1:1.0.2-0ubuntu10) dapper; urgency=low
+
+  * Backport a fix for Intel bridge handling:
+  debian/patches/002_fix_for_certain_intel_chipsets.patch
+  (Closes Ubuntu: #29880)
+
+ -- Paul Sladen <ubuntu@paul.sladen.org>  Sun, 14 May 2006 19:01:32 +0100
+
+xorg-server (1:1.0.2-0ubuntu9) dapper; urgency=low
+
+  * Add 1680x1050 60 and 85Hz Modelines. Thanks to Bart Verwilst for the data.
+  (Closes Ubuntu: #6096)
+
+ -- Fabio M. Di Nitto <fabbione@ubuntu.com>  Fri, 05 May 2006 12:38:22 +0200
+
+xorg-server (1:1.0.2-0ubuntu8) dapper; urgency=low
+
+  * Fix "XCB rendertest crashes server":
+    - Add patch 001-CVE-2006-1526.patch.dpatch.
+  (CVE-2006-1526)
+
+ -- Fabio M. Di Nitto <fabbione@ubuntu.com>  Wed, 03 May 2006 09:01:09 +0200
+
+xorg-server (1:1.0.2-0ubuntu7) dapper; urgency=low
+
+  * Ship again xorg.conf(5)
+  (Closes Ubuntu: #33703)
+
+ -- Fabio M. Di Nitto <fabbione@ubuntu.com>  Mon, 01 May 2006 13:37:40 +0200
+
+xorg-server (1:1.0.2-0ubuntu6) dapper; urgency=low
+
+  * Fix severe internal memory corruption:
+    - Add patch: 000-fix-read-kernel-mapping.patch.dpatch.
+    (freedesktop bugzilla: #6472)
+
+ -- Fabio M. Di Nitto <fabbione@ubuntu.com>  Fri, 21 Apr 2006 08:07:33 +0200
+
+xorg-server (1:1.0.2-0ubuntu5) dapper; urgency=low
+
+  * Fix CPU load when using -sharevts:
+    - Add patch: 991_sharevts-load-cpu.patch
+    (Thanks for the initial patch to Michael Witrant)
+    (Closes Ubuntu: #33611)
+
+ -- Fabio M. Di Nitto <fabbione@ubuntu.com>  Mon, 10 Apr 2006 13:30:26 +0200
+
+xorg-server (1:1.0.2-0ubuntu4) dapper; urgency=low
+
+  * Fix SecurityPolicy path to /etc/X11/xserver/SecurityPolicy
+    and ship an example. NOTE: this file is NOT installed by default,
+    the WARNING you see in Xorg.0.log is an harmless WARNING.
+    Add patch: 990_ubuntu_fix_security_policy_path.patch.
+    (Close Ubuntu: #31608)
+
+  * Readd manpages to the different packages.
+
+  * Ship again ioport, gtf, pcitweak and scanpci.
+    (Closes Ubuntu: #37720)
+
+ -- Fabio M. Di Nitto <fabbione@ubuntu.com>  Tue, 04 Apr 2006 16:33:00 +0200
+
+xorg-server (1:1.0.2-0ubuntu3) dapper; urgency=low
+
+  * What about shipping xorg-server.m4 to make developer life easier?
+
+ -- Fabio M. Di Nitto <fabbione@ubuntu.com>  Thu, 23 Mar 2006 10:32:55 +0100
+
+xorg-server (1:1.0.2-0ubuntu2) dapper; urgency=low
+
+  * xserver-xorg-dev Depends: x11proto-randr-dev.
+  (Closes Ubuntu: #35594)
+
+ -- Fabio M. Di Nitto <fabbione@ubuntu.com>  Wed, 22 Mar 2006 08:09:46 +0100
+
+xorg-server (1:1.0.2-0ubuntu1) dapper; urgency=low
+
+  * New upstream release:
+    - Drop patches:
+      + CVE-2006-0745
+      + add-missing-sparc-include
+      + fix-backtrace
+      + fix-crash-on-null-addr
+
+  * UVF execption granted by mdz.
+
+ -- Fabio M. Di Nitto <fabbione@ubuntu.com>  Tue, 21 Mar 2006 05:39:01 +0100
+
 xorg-server (1:1.0.1-2) experimental; urgency=low
 
   [ David Nusinow ]
@@ -3915,6 +9547,116 @@ xorg-server (1:1.0.1-1) experimental; ur
 
  -- David Nusinow <dnusinow@debian.org>  Mon, 20 Feb 2006 00:18:45 -0500
 
+xorg-server (1:1.0.1-0ubuntu8) dapper; urgency=low
+
+  * [SECURITY] Fix CVE-2006-0745.
+
+ -- Fabio M. Di Nitto <fabbione@ubuntu.com>  Tue, 21 Mar 2006 05:33:50 +0100
+
+xorg-server (1:1.0.1-0ubuntu7) dapper; urgency=low
+
+  * debian/control:
+    - xvfb Depends on xfonts-base too, fix pointed by fabbione
+
+ -- Sebastien Bacher <seb128@canonical.com>  Fri,  3 Mar 2006 22:21:56 +0100
+
+xorg-server (1:1.0.1-0ubuntu5) dapper; urgency=low
+
+  * Add missing include on sparc. Fix FTBFS.
+
+ -- Fabio M. Di Nitto <fabbione@ubuntu.com>  Wed, 01 Feb 2006 13:45:41 +0100
+
+xorg-server (1:1.0.1-0ubuntu4) dapper; urgency=low
+
+  * Backport from upstream HEAD at Daniel's request:
+    - Add forgotten HAVE_BACKTRACE define, so that we actually get
+      backtraces when Xorg segfaults.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Fri, 27 Jan 2006 13:47:56 +0000
+
+xorg-server (1:1.0.1-0ubuntu3) dapper; urgency=low
+
+  * Depend on x11-common rather than xorg-common and xserver-common
+
+ -- Tollef Fog Heen <tfheen@ubuntu.com>  Wed, 18 Jan 2006 17:13:12 +0100
+
+xorg-server (1:1.0.1-0ubuntu2) dapper; urgency=low
+
+  * Add flex to build-deps, fixing FTBFS.
+
+ -- Tollef Fog Heen <tfheen@ubuntu.com>  Wed, 18 Jan 2006 12:34:03 +0100
+
+xorg-server (1:1.0.1-0ubuntu1) dapper; urgency=low
+
+  * New upstream release.
+
+ -- Daniel Stone <daniel.stone@ubuntu.com>  Fri,  6 Jan 2006 08:00:52 +1100
+
+xorg-server (1:1.0.0-0ubuntu1) dapper; urgency=low
+
+  * New upstream release.
+    + fbCompositeGeneral is now around 97.3% less stuffed (closes:
+      Ubuntu#20286).
+    + 'Fix' mouse issues in the DIX by adding XFree86Server defines (sigh;
+      closes: Ubuntu#20200).
+    + Fix Emulate3Buttons mouse posting (closes: Ubuntu#11308).
+  * Bump Build-Depends on libxt-dev (appdefaultdir), libdrm-dev (libdrm2), and
+    mesa-swrast-source (new files).
+  * Add --with-fontdir and scotch --with-default-font-path to fix font paths
+    for non-Xorg servers (closes: Ubuntu#20157).
+  * Fix path to SecurityPolicy and RGB_DB.
+  * Move update-linux-hardened-support call to xserver-xorg-core postinst
+    (from xserver-xorg postinst).
+  * Add patch to os/access.c so we don't crash on a null-addressed interface
+    (closes: Ubuntu#20414).
+
+ -- Daniel Stone <daniel.stone@ubuntu.com>  Tue, 13 Dec 2005 07:27:13 +1100
+
+xorg-server (1:0.99.3-0ubuntu6) dapper; urgency=low
+
+  * Fix xserver-xorg-dev Depends field to only depend on the headers this
+    this package actually uses.
+  * Re-add xvfb-run to xfvb (closes: Ubuntu#20157).
+
+ -- Daniel Stone <daniel.stone@ubuntu.com>  Mon,  5 Dec 2005 15:04:14 +1100
+
+xorg-server (1:0.99.3-0ubuntu5) dapper; urgency=low
+
+  * Add -ffunction-sections where needed
+  * Depend: xserver-common: needed for dexconf and /usr/X11R6/bin/X
+
+ -- LaMont Jones <lamont@ubuntu.com>  Sat, 26 Nov 2005 05:15:36 +0000
+
+xorg-server (1:0.99.3-0ubuntu4) dapper; urgency=low
+
+  * Add two more dependencies to build the other half of the video drivers:
+    - x11proto-xext-dev, x11proto-video-dev
+
+ -- Adam Conrad <adconrad@ubuntu.com>  Fri, 25 Nov 2005 02:36:44 +1100
+
+xorg-server (1:0.99.3-0ubuntu3) dapper; urgency=low
+
+  * Add a few dependencies to xorg-server-dev as the path of least resistance
+    to get all the various input and video drivers to build again:
+    - For the video drivers: x11proto-randr-dev, x11proto-render-dev,
+      x11proto-fonts-dev, x11proto-xf86dri-dev, libdrm-dev
+    - For the input drivers: x11proto-core-dev, x11proto-input-dev,
+      x11proto-randr-dev (why do input drivers want randr?)
+
+ -- Adam Conrad <adconrad@ubuntu.com>  Thu, 24 Nov 2005 18:51:25 +1100
+
+xorg-server (1:0.99.3-0ubuntu2) dapper; urgency=low
+
+  * Add missing libfreetype6-dev build-depends.
+
+ -- Daniel Stone <daniel.stone@ubuntu.com>  Thu, 24 Nov 2005 10:26:44 +1100
+
+xorg-server (1:0.99.3-0ubuntu1) dapper; urgency=low
+
+  * New upstream release.
+
+ -- Daniel Stone <daniel.stone@ubuntu.com>  Mon, 21 Nov 2005 14:13:41 +1100
+
 xorg-server (1:0.99.2+cvs.20051025-3) dapper; urgency=low
 
   * Version mesa-swrast-source Build-Dep to 6.4.0 or higher, so GLcore is a
diff -pruN 2:21.1.3-2/debian/control 2:21.1.3-2ubuntu2/debian/control
--- 2:21.1.3-2/debian/control	2022-04-01 18:07:43.000000000 +0000
+++ 2:21.1.3-2ubuntu2/debian/control	2022-04-01 18:07:44.000000000 +0000
@@ -1,7 +1,8 @@
 Source: xorg-server
 Section: x11
 Priority: optional
-Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
+Maintainer: Ubuntu X-SWAT <ubuntu-x@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
 Build-Depends:
  debhelper-compat (= 12),
  po-debconf,
@@ -9,6 +10,7 @@ Build-Depends:
  pkg-config,
  bison,
  flex,
+ xauth,
  xutils-dev (>= 1:7.6+4),
  xfonts-utils (>= 1:7.5+1),
  x11proto-dev (>= 2021.5),
@@ -45,7 +47,7 @@ Build-Depends:
  libxinerama-dev,
  libxshmfence-dev (>= 1.1) [!hurd-i386],
 # glamor
- libepoxy-dev [linux-any kfreebsd-any],
+ libepoxy-dev (>= 1.5.4) [linux-any kfreebsd-any],
  libegl1-mesa-dev [linux-any kfreebsd-any],
  libgbm-dev (>= 10.2) [linux-any kfreebsd-any],
 # XCB bits for Xephyr
@@ -73,6 +75,7 @@ Build-Depends:
   libdbus-1-dev (>= 1.0) [linux-any],
 # systemd-daemon
   libsystemd-dev [linux-any],
+  libffi-dev,
 Build-Depends-Indep: xz-utils
 Standards-Version: 3.9.8
 Rules-Requires-Root: binary-targets
@@ -124,6 +127,7 @@ Description: Xorg X server - core server
 
 Package: xserver-xorg-core-udeb
 Package-Type: udeb
+Build-Profiles: <!noudeb>
 Section: debian-installer
 # exclude sparc because of linker errors
 Architecture: any
@@ -195,7 +199,10 @@ Depends:
  xserver-common (>= ${source:Version}),
  ${shlibs:Depends},
  ${misc:Depends},
-Recommends: xauth
+ xauth,
+ x11-xkb-utils
+Recommends:
+ libgl1-mesa-dri
 Provides: xserver
 Multi-Arch: foreign
 Description: Virtual Framebuffer 'fake' X server
diff -pruN 2:21.1.3-2/debian/gbp.conf 2:21.1.3-2ubuntu2/debian/gbp.conf
--- 2:21.1.3-2/debian/gbp.conf	2022-04-01 18:07:43.000000000 +0000
+++ 2:21.1.3-2ubuntu2/debian/gbp.conf	2022-04-01 18:07:44.000000000 +0000
@@ -2,7 +2,6 @@
 # the default branch for upstream sources:
 upstream-branch = upstream-experimental
 # the default branch for the debian patch:
-debian-branch = debian-experimental
+debian-branch = ubuntu
 # use pristine-tar:
 pristine-tar = True
-
diff -pruN 2:21.1.3-2/debian/local/xvfb-run 2:21.1.3-2ubuntu2/debian/local/xvfb-run
--- 2:21.1.3-2/debian/local/xvfb-run	2022-04-01 18:07:43.000000000 +0000
+++ 2:21.1.3-2ubuntu2/debian/local/xvfb-run	2022-04-01 18:07:44.000000000 +0000
@@ -181,7 +181,7 @@ done
 
 # Start the command and save its exit status.
 set +e
-DISPLAY=:$SERVERNUM XAUTHORITY=$AUTHFILE "$@"
+DISPLAY=:$SERVERNUM XAUTHORITY=$AUTHFILE "$@" 2>&1
 RETVAL=$?
 set -e
 
diff -pruN 2:21.1.3-2/debian/local/xvfb-run.1 2:21.1.3-2ubuntu2/debian/local/xvfb-run.1
--- 2:21.1.3-2/debian/local/xvfb-run.1	2022-04-01 18:07:43.000000000 +0000
+++ 2:21.1.3-2ubuntu2/debian/local/xvfb-run.1	2022-04-01 18:07:44.000000000 +0000
@@ -66,7 +66,11 @@ cookie removed, and the authority file d
 one to use).
 .B xvfb\-run
 then exits with the exit status of
-.IR command .
+.IR command ,
+except in error conditions (see
+.SM
+.B EXIT STATUS
+below).
 .PP
 .B xvfb\-run
 requires the
@@ -202,8 +206,6 @@ options are specified; see above.
 .B xvfb\-run
 uses its exit status as well as output to standard error to communicate
 diagnostics.
-The exit status of \(oq1\(cq is not used, and should be interpreted as failure
-of the specified command.
 .TP
 0
 .B xvfb\-run
@@ -213,6 +215,10 @@ option is given.
 In all other situations, this may be interpreted as success of the specified
 command.
 .TP
+1
+.B Xvfb
+did not start correctly.
+.TP
 2
 No command to run was specified.
 .TP
diff -pruN 2:21.1.3-2/debian/patches/168_glibc_trace_to_stderr.patch 2:21.1.3-2ubuntu2/debian/patches/168_glibc_trace_to_stderr.patch
--- 2:21.1.3-2/debian/patches/168_glibc_trace_to_stderr.patch	1970-01-01 00:00:00.000000000 +0000
+++ 2:21.1.3-2ubuntu2/debian/patches/168_glibc_trace_to_stderr.patch	2022-04-01 18:07:44.000000000 +0000
@@ -0,0 +1,16 @@
+Description: Report abort traces to stderr instead of terminal
+Author: Kees Cook <kees@ubuntu.com>
+Bug-Ubuntu: https://launchpad.net/bugs/345748
+
+--- a/hw/xfree86/common/xf86Init.c
++++ b/hw/xfree86/common/xf86Init.c
+@@ -767,6 +767,9 @@ OsVendorInit(void)
+ 
+     if (!beenHere) {
+         umask(022);
++        /* have glibc report internal abort traces to stderr instead of
++           the controlling terminal */
++        setenv("LIBC_FATAL_STDERR_", "1", 0);
+         xf86LogInit();
+     }
+ 
diff -pruN 2:21.1.3-2/debian/patches/226_fall_back_to_autoconfiguration.patch 2:21.1.3-2ubuntu2/debian/patches/226_fall_back_to_autoconfiguration.patch
--- 2:21.1.3-2/debian/patches/226_fall_back_to_autoconfiguration.patch	1970-01-01 00:00:00.000000000 +0000
+++ 2:21.1.3-2ubuntu2/debian/patches/226_fall_back_to_autoconfiguration.patch	2022-04-01 18:07:44.000000000 +0000
@@ -0,0 +1,81 @@
+Description: Fall back to autoconfiguration for graphics drivers in some cases instead of letting X fail when configuration files are available.
+Author: Alberto Milone <alberto.milone@canonical.com>
+
+--- a/hw/xfree86/common/xf86Globals.c
++++ b/hw/xfree86/common/xf86Globals.c
+@@ -158,6 +158,7 @@ InputDriverPtr *xf86InputDriverList = NU
+ int xf86NumInputDrivers = 0;
+ int xf86NumScreens = 0;
+ int xf86NumGPUScreens = 0;
++Bool xf86AttemptedFallback = FALSE;
+ 
+ const char *xf86VisualNames[] = {
+     "StaticGray",
+--- a/hw/xfree86/common/xf86Init.c
++++ b/hw/xfree86/common/xf86Init.c
+@@ -365,20 +365,34 @@ InitOutput(ScreenInfo * pScreenInfo, int
+             free(optionlist);
+         }
+ 
++ Fallback:
+         /* Load all driver modules specified in the config file */
+         /* If there aren't any specified in the config file, autoconfig them */
+         /* FIXME: Does not handle multiple active screen sections, but I'm not
+          * sure if we really want to handle that case*/
+         configured_device = xf86ConfigLayout.screens->screen->device;
+-        if ((!configured_device) || (!configured_device->driver)) {
++        if (xf86AttemptedFallback) {
++            configured_device->driver = NULL;
++            if (!autoConfigDevice(configured_device)) {
++                xf86Msg(X_ERROR, "Auto configuration on fallback failed\n");
++                return;
++            }
++        }
++        else if ((!configured_device) || (!configured_device->driver)) {
+             if (!autoConfigDevice(configured_device)) {
+                 xf86Msg(X_ERROR, "Automatic driver configuration failed\n");
+                 return;
+             }
+         }
+         if ((modulelist = xf86DriverlistFromConfig())) {
+-            xf86LoadModules(modulelist, NULL);
+-            free(modulelist);
++            if (!xf86LoadModules(modulelist, NULL) && !xf86AttemptedFallback) {
++                free(modulelist);
++                xf86AttemptedFallback = TRUE;
++                goto Fallback;
++            }
++            else {
++                free(modulelist);
++            }
+         }
+ 
+         /* Load all input driver modules specified in the config file. */
+@@ -441,8 +455,15 @@ InitOutput(ScreenInfo * pScreenInfo, int
+ 	if (want_hw_access)
+ 	    xorgHWAccess = xf86EnableIO();
+ 
+-        if (xf86BusConfig() == FALSE)
+-            return;
++        if (xf86BusConfig() == FALSE) {
++            if (!xf86AttemptedFallback) {
++                xf86AttemptedFallback = TRUE;
++                goto Fallback;
++            }
++            else {
++                return;
++            }
++        }
+ 
+         xf86PostProbe();
+ 
+--- a/hw/xfree86/common/xf86Priv.h
++++ b/hw/xfree86/common/xf86Priv.h
+@@ -86,6 +86,7 @@ extern _X_EXPORT int xf86NumDrivers;
+ extern _X_EXPORT Bool xf86Resetting;
+ extern Bool xf86Initialising;
+ extern _X_EXPORT int xf86NumScreens;
++extern _X_EXPORT Bool xf86AttemptedFallback;
+ extern _X_EXPORT const char *xf86VisualNames[];
+ extern _X_EXPORT int xf86Verbose;       /* verbosity level */
+ extern _X_EXPORT int xf86LogVerbose;    /* log file verbosity level */
diff -pruN 2:21.1.3-2/debian/patches/300-mi-sprite-SaveUnderCursor2.patch 2:21.1.3-2ubuntu2/debian/patches/300-mi-sprite-SaveUnderCursor2.patch
--- 2:21.1.3-2/debian/patches/300-mi-sprite-SaveUnderCursor2.patch	1970-01-01 00:00:00.000000000 +0000
+++ 2:21.1.3-2ubuntu2/debian/patches/300-mi-sprite-SaveUnderCursor2.patch	2022-04-01 18:07:44.000000000 +0000
@@ -0,0 +1,53 @@
+From 905bdb14876be1f01a444f473b0c20c651e169ba Mon Sep 17 00:00:00 2001
+From: Hyun Kwon <hyun.kwon@xilinx.com>
+Date: Mon, 25 Sep 2017 15:42:23 -0700
+Subject: [PATCH] mi: sprite: SaveUnderCursor2
+
+There is cursor bleeding for the devices which try to acclerate the
+Desktop environment using low powered ARM Mali GPUs. The area under
+the cusrsor is not updated for every swap call within the armsoc,
+resulting in the block artifact.
+
+Expose miDCSaveUnderCursor2 API, so that other graphics layer like
+armsoc can inoke and save the area under the cursor before actually
+performing a swap between the backbuffer and the frontbuffer.
+
+Signed-off-by: Hyun Kwon <hyun.kwon@xilinx.com>
+Signed-off-by: Madhurkiran Harikrishnan <madhurkiran.harikrishnan@xilinx.com>
+---
+ mi/mipointer.h |  2 ++
+ mi/misprite.c  | 17 +++++++++++++++++
+ 2 files changed, 19 insertions(+)
+
+--- a/mi/mipointer.h
++++ b/mi/mipointer.h
+@@ -127,4 +127,6 @@ extern _X_EXPORT DevPrivateKeyRec miPoin
+ 
+ #define miPointerScreenKey (&miPointerScreenKeyRec)
+ 
++extern _X_EXPORT void miDCSaveUnderCursor2(ScreenPtr pScreen);
++
+ #endif                          /* MIPOINTER_H */
+--- a/mi/misprite.c
++++ b/mi/misprite.c
+@@ -866,3 +866,20 @@ miSpriteComputeSaved(DeviceIntPtr pDev,
+     pCursorInfo->saved.x2 = pCursorInfo->saved.x1 + w + wpad * 2;
+     pCursorInfo->saved.y2 = pCursorInfo->saved.y1 + h + hpad * 2;
+ }
++
++void
++miDCSaveUnderCursor2(ScreenPtr pScreen)
++{
++	DeviceIntPtr pDev;
++	miCursorInfoPtr pCursorInfo;
++
++	for (pDev = inputInfo.devices; pDev; pDev = pDev->next) {
++		if (DevHasCursor(pDev)) {
++			pCursorInfo = GetSprite(pDev);
++			if (pCursorInfo && pCursorInfo->isUp
++			    && pCursorInfo->pScreen == pScreen) {
++				miSpriteSaveUnderCursor(pDev, pScreen);
++			}
++		}
++	}
++}
diff -pruN 2:21.1.3-2/debian/patches/fix-default-permissions.patch 2:21.1.3-2ubuntu2/debian/patches/fix-default-permissions.patch
--- 2:21.1.3-2/debian/patches/fix-default-permissions.patch	1970-01-01 00:00:00.000000000 +0000
+++ 2:21.1.3-2ubuntu2/debian/patches/fix-default-permissions.patch	2022-04-01 18:07:44.000000000 +0000
@@ -0,0 +1,19 @@
+Description: fix default permissions when creating the log directory.
+Author: Marc Deslauriers <marc.deslauriers@canonical.com>
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/session-migration/+bug/1735929
+
+--- a/hw/xfree86/common/xf86Helper.c
++++ b/hw/xfree86/common/xf86Helper.c
+@@ -1135,10 +1135,10 @@ static void xf86_mkdir_p(char *path)
+ 
+     while ((sep = strchr(sep + 1, '/'))) {
+         *sep = 0;
+-        (void)mkdir(path, 0777);
++        (void)mkdir(path, 0700);
+         *sep = '/';
+     }
+-    (void)mkdir(path, 0777);
++    (void)mkdir(path, 0700);
+ }
+ 
+ void
diff -pruN 2:21.1.3-2/debian/patches/fix-gtf-detection-for-edid-14.diff 2:21.1.3-2ubuntu2/debian/patches/fix-gtf-detection-for-edid-14.diff
--- 2:21.1.3-2/debian/patches/fix-gtf-detection-for-edid-14.diff	1970-01-01 00:00:00.000000000 +0000
+++ 2:21.1.3-2ubuntu2/debian/patches/fix-gtf-detection-for-edid-14.diff	2022-04-01 18:07:44.000000000 +0000
@@ -0,0 +1,13 @@
+diff --git a/hw/xfree86/ddc/interpret_edid.c b/hw/xfree86/ddc/interpret_edid.c
+index 19630471c..7259d2192 100644
+--- a/hw/xfree86/ddc/interpret_edid.c
++++ b/hw/xfree86/ddc/interpret_edid.c
+@@ -768,7 +768,7 @@ gtf_supported(xf86MonPtr mon)
+     } else {
+         for (i = 0; i < DET_TIMINGS; i++) {
+             struct detailed_monitor_section *det_timing_des = &(mon->det_mon[i]);
+-            if (det_timing_des && (det_timing_des->type == DS_RANGES) &&
++            if (det_timing_des && (det_timing_des->type == DS_RANGES) && (mon->features.msc & 0x1) &&
+                 (det_timing_des->section.ranges.display_range_timing_flags == DR_DEFAULT_GTF
+ 		|| det_timing_des->section.ranges.display_range_timing_flags == DR_SECONDARY_GTF))
+ 		    return TRUE;
diff -pruN 2:21.1.3-2/debian/patches/no-nv.patch 2:21.1.3-2ubuntu2/debian/patches/no-nv.patch
--- 2:21.1.3-2/debian/patches/no-nv.patch	1970-01-01 00:00:00.000000000 +0000
+++ 2:21.1.3-2ubuntu2/debian/patches/no-nv.patch	2022-04-01 18:07:44.000000000 +0000
@@ -0,0 +1,22 @@
+commit b770266fa9c3fab5374bdf109676e0b129ac4546
+Author: Bryce Harrington <bryce@canonical.com>
+Date:   Wed Apr 3 13:36:20 2013 -0700
+
+    Don't bother probing -nv on linux.
+    
+    For linux this driver is long obsolete now.  It may have some relevance
+    on non-linux systems.
+
+--- a/hw/xfree86/common/xf86pciBus.c
++++ b/hw/xfree86/common/xf86pciBus.c
+@@ -1230,8 +1230,9 @@ xf86VideoPtrToDriverList(struct pci_devi
+         }
+ 
+         driverList[idx++] = "nouveau";
+-#endif
++#else
+         driverList[idx++] = "nv";
++#endif
+         break;
+     }
+     case 0x1106:
diff -pruN 2:21.1.3-2/debian/patches/reset-transforms-in-closescreen.diff 2:21.1.3-2ubuntu2/debian/patches/reset-transforms-in-closescreen.diff
--- 2:21.1.3-2/debian/patches/reset-transforms-in-closescreen.diff	1970-01-01 00:00:00.000000000 +0000
+++ 2:21.1.3-2ubuntu2/debian/patches/reset-transforms-in-closescreen.diff	2022-04-01 18:07:44.000000000 +0000
@@ -0,0 +1,67 @@
+From aa010e50c989e7619caf9ef1b341b45342fe6118 Mon Sep 17 00:00:00 2001
+From: Olivier Fourdan <ofourdan@redhat.com>
+Date: Tue, 27 Nov 2018 17:20:09 +0100
+Subject: [PATCH] xfree86: Reset transforms in xf86CrtcCloseScreen
+
+The RRTransform are freed along the DIX crtc structures, but the
+xf86crtc may keep a pointer to those and try to reuse it on server reset
+after the last client is gone:
+
+ Invalid read of size 4
+    at 0x4C8478: xf86CrtcRotate (xf86Rotate.c:464)
+    by 0x5753010: drmmode_set_desired_modes (drmmode_display.c:3483)
+    by 0x574C55C: CreateScreenResources (driver.c:1346)
+    by 0x4B97DA: xf86CrtcCreateScreenResources (xf86Crtc.c:746)
+    by 0x43F0D8: dix_main (main.c:214)
+    by 0x4CFD412: (below main) (in /usr/lib64/libc-2.28.so)
+  Address 0x75e4268 is 56 bytes inside a block of size 96 free'd
+    at 0x4839A0C: free (vg_replace_malloc.c:530)
+    by 0x50D4C9: PictureResetFilters (filter.c:274)
+    by 0x511383: PictureCloseScreen (picture.c:94)
+    by 0x4B942B: xf86CrtcCloseScreen (xf86Crtc.c:791)
+    by 0x51AB02: present_close_screen (present_screen.c:70)
+    by 0x4D747D: CursorCloseScreen (cursor.c:205)
+    by 0x43F337: dix_main (main.c:325)
+    by 0x4CFD412: (below main) (in /usr/lib64/libc-2.28.so)
+  Block was alloc'd at
+    at 0x483AD19: realloc (vg_replace_malloc.c:826)
+    by 0x50D001: PictureAddFilter (filter.c:148)
+    by 0x50D486: PictureSetDefaultFilters (filter.c:262)
+    by 0x511F58: PictureInit (picture.c:701)
+    by 0x510128: miPictureInit (mipict.c:557)
+    by 0x5AD748C: fbPictureInit (fbpict.c:493)
+    by 0x574ACFB: ScreenInit (driver.c:1629)
+    by 0x43B5E6: AddScreen (dispatch.c:3915)
+    by 0x48CD2A: InitOutput (xf86Init.c:730)
+    by 0x43F02E: dix_main (main.c:193)
+    by 0x4CFD412: (below main) (in /usr/lib64/libc-2.28.so)
+
+Make sure we clear and free both the desired transform and actual
+transform so that we don't reuse a previously freed transform when
+re-creating the resources after the server has been reset.
+
+Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
+Closes: https://gitlab.freedesktop.org/xorg/xserver/issues/14
+---
+ hw/xfree86/modes/xf86Crtc.c | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+--- a/hw/xfree86/modes/xf86Crtc.c
++++ b/hw/xfree86/modes/xf86Crtc.c
+@@ -786,6 +786,16 @@ xf86CrtcCloseScreen(ScreenPtr screen)
+         xf86CrtcPtr crtc = config->crtc[c];
+ 
+         crtc->randr_crtc = NULL;
++
++        if (crtc->transformPresent) {
++            crtc->transformPresent = FALSE;
++            RRTransformFini(&crtc->transform);
++        }
++
++        if (crtc->desiredTransformPresent) {
++            crtc->desiredTransformPresent = FALSE;
++            RRTransformFini(&crtc->desiredTransform);
++        }
+     }
+ 
+     screen->CloseScreen = config->CloseScreen;
diff -pruN 2:21.1.3-2/debian/patches/series 2:21.1.3-2ubuntu2/debian/patches/series
--- 2:21.1.3-2/debian/patches/series	2022-04-01 18:07:43.000000000 +0000
+++ 2:21.1.3-2ubuntu2/debian/patches/series	2022-04-01 18:07:44.000000000 +0000
@@ -7,3 +7,22 @@
 06_use-intel-only-on-pre-gen4.diff
 07_use-modesetting-driver-by-default-on-GeForce.diff
 present-Check-for-NULL-to-prevent-crash.patch
+
+
+## Ubuntu patches, not upstreamable
+168_glibc_trace_to_stderr.patch
+226_fall_back_to_autoconfiguration.patch
+300-mi-sprite-SaveUnderCursor2.patch
+
+## send upstream
+xfree86-no-xv-for-gpuscreens.patch
+no-nv.patch
+
+## upstream patches
+
+# hybrid graphics fixes
+xf86-ignore-conflicting-rr-caps.patch
+
+xi2-resize-touch.patch
+fix-default-permissions.patch
+reset-transforms-in-closescreen.diff
diff -pruN 2:21.1.3-2/debian/patches/series_BACKUP_2065482 2:21.1.3-2ubuntu2/debian/patches/series_BACKUP_2065482
--- 2:21.1.3-2/debian/patches/series_BACKUP_2065482	1970-01-01 00:00:00.000000000 +0000
+++ 2:21.1.3-2ubuntu2/debian/patches/series_BACKUP_2065482	2022-04-01 18:07:44.000000000 +0000
@@ -0,0 +1,30 @@
+## Patches with a number < 100 are applied in debian.
+## Ubuntu patches start with 100.
+001_fedora_extramodes.patch
+02_kbsd-input-devd.diff
+03_static-nettle.diff
+05_Revert-Unload-submodules.diff
+06_use-intel-only-on-pre-gen4.diff
+07_use-modesetting-driver-by-default-on-GeForce.diff
+<<<<<<< HEAD
+
+## Ubuntu patches, not upstreamable
+168_glibc_trace_to_stderr.patch
+226_fall_back_to_autoconfiguration.patch
+300-mi-sprite-SaveUnderCursor2.patch
+
+## send upstream
+xfree86-no-xv-for-gpuscreens.patch
+no-nv.patch
+
+## upstream patches
+
+# hybrid graphics fixes
+xf86-ignore-conflicting-rr-caps.patch
+
+xi2-resize-touch.patch
+fix-default-permissions.patch
+reset-transforms-in-closescreen.diff
+=======
+present-Check-for-NULL-to-prevent-crash.patch
+>>>>>>> debian-unstable
diff -pruN 2:21.1.3-2/debian/patches/series_BASE_2065482 2:21.1.3-2ubuntu2/debian/patches/series_BASE_2065482
--- 2:21.1.3-2/debian/patches/series_BASE_2065482	1970-01-01 00:00:00.000000000 +0000
+++ 2:21.1.3-2ubuntu2/debian/patches/series_BASE_2065482	2022-04-01 18:07:44.000000000 +0000
@@ -0,0 +1,8 @@
+## Patches with a number < 100 are applied in debian.
+## Ubuntu patches start with 100.
+001_fedora_extramodes.patch
+02_kbsd-input-devd.diff
+03_static-nettle.diff
+05_Revert-Unload-submodules.diff
+06_use-intel-only-on-pre-gen4.diff
+07_use-modesetting-driver-by-default-on-GeForce.diff
diff -pruN 2:21.1.3-2/debian/patches/series_LOCAL_2065482 2:21.1.3-2ubuntu2/debian/patches/series_LOCAL_2065482
--- 2:21.1.3-2/debian/patches/series_LOCAL_2065482	1970-01-01 00:00:00.000000000 +0000
+++ 2:21.1.3-2ubuntu2/debian/patches/series_LOCAL_2065482	2022-04-01 18:07:44.000000000 +0000
@@ -0,0 +1,26 @@
+## Patches with a number < 100 are applied in debian.
+## Ubuntu patches start with 100.
+001_fedora_extramodes.patch
+02_kbsd-input-devd.diff
+03_static-nettle.diff
+05_Revert-Unload-submodules.diff
+06_use-intel-only-on-pre-gen4.diff
+07_use-modesetting-driver-by-default-on-GeForce.diff
+
+## Ubuntu patches, not upstreamable
+168_glibc_trace_to_stderr.patch
+226_fall_back_to_autoconfiguration.patch
+300-mi-sprite-SaveUnderCursor2.patch
+
+## send upstream
+xfree86-no-xv-for-gpuscreens.patch
+no-nv.patch
+
+## upstream patches
+
+# hybrid graphics fixes
+xf86-ignore-conflicting-rr-caps.patch
+
+xi2-resize-touch.patch
+fix-default-permissions.patch
+reset-transforms-in-closescreen.diff
diff -pruN 2:21.1.3-2/debian/patches/series_REMOTE_2065482 2:21.1.3-2ubuntu2/debian/patches/series_REMOTE_2065482
--- 2:21.1.3-2/debian/patches/series_REMOTE_2065482	1970-01-01 00:00:00.000000000 +0000
+++ 2:21.1.3-2ubuntu2/debian/patches/series_REMOTE_2065482	2022-04-01 18:07:44.000000000 +0000
@@ -0,0 +1,9 @@
+## Patches with a number < 100 are applied in debian.
+## Ubuntu patches start with 100.
+001_fedora_extramodes.patch
+02_kbsd-input-devd.diff
+03_static-nettle.diff
+05_Revert-Unload-submodules.diff
+06_use-intel-only-on-pre-gen4.diff
+07_use-modesetting-driver-by-default-on-GeForce.diff
+present-Check-for-NULL-to-prevent-crash.patch
diff -pruN 2:21.1.3-2/debian/patches/xf86-ignore-conflicting-rr-caps.patch 2:21.1.3-2ubuntu2/debian/patches/xf86-ignore-conflicting-rr-caps.patch
--- 2:21.1.3-2/debian/patches/xf86-ignore-conflicting-rr-caps.patch	1970-01-01 00:00:00.000000000 +0000
+++ 2:21.1.3-2ubuntu2/debian/patches/xf86-ignore-conflicting-rr-caps.patch	2022-04-01 18:07:44.000000000 +0000
@@ -0,0 +1,24 @@
+Description: Only set RR caps that are appropriate to main/gpu screen.
+Author: Maarten Lankhorst <maarten.lankhorst@ubuntu.com>
+Bug-Ubuntu: https://launchpad.net/bugs/1277014
+
+--- a/hw/xfree86/modes/xf86RandR12.c
++++ b/hw/xfree86/modes/xf86RandR12.c
+@@ -1755,10 +1755,16 @@ xf86RandR12CreateObjects12(ScreenPtr pSc
+     }
+ 
+     if (config->name) {
++        uint32_t caps = pScrn->capabilities;
+         config->randr_provider = RRProviderCreate(pScreen, config->name,
+                                                   strlen(config->name));
+ 
+-        RRProviderSetCapabilities(config->randr_provider, pScrn->capabilities);
++        if (!pScreen->isGPU)
++            caps &= RR_Capability_SinkOffload | RR_Capability_SourceOutput;
++        else
++            caps &= RR_Capability_SourceOffload | RR_Capability_SinkOutput;
++
++        RRProviderSetCapabilities(config->randr_provider, caps);
+     }
+ 
+     return TRUE;
diff -pruN 2:21.1.3-2/debian/patches/xfree86-no-xv-for-gpuscreens.patch 2:21.1.3-2ubuntu2/debian/patches/xfree86-no-xv-for-gpuscreens.patch
--- 2:21.1.3-2/debian/patches/xfree86-no-xv-for-gpuscreens.patch	1970-01-01 00:00:00.000000000 +0000
+++ 2:21.1.3-2ubuntu2/debian/patches/xfree86-no-xv-for-gpuscreens.patch	2022-04-01 18:07:44.000000000 +0000
@@ -0,0 +1,35 @@
+Description: Do not bother registering xv/xvmc on gpu screens.
+Author: Maarten Lankhorst <maarten.lankhorst@ubuntu.com>
+
+--- a/hw/xfree86/common/xf86xv.c
++++ b/hw/xfree86/common/xf86xv.c
+@@ -230,7 +230,7 @@ xf86XVScreenInit(ScreenPtr pScreen, XF86
+     ScrnInfoPtr pScrn;
+     XF86XVScreenPtr ScreenPriv;
+ 
+-    if (num <= 0 || noXvExtension)
++    if (num <= 0 || noXvExtension || pScreen->isGPU)
+         return FALSE;
+ 
+     if (Success != XvScreenInit(pScreen))
+--- a/hw/xfree86/common/xf86xvmc.c
++++ b/hw/xfree86/common/xf86xvmc.c
+@@ -148,11 +148,15 @@ xf86XvMCScreenInit(ScreenPtr pScreen,
+ {
+     XvMCAdaptorPtr pAdapt;
+     xf86XvMCScreenPtr pScreenPriv;
+-    XvScreenPtr pxvs = (XvScreenPtr) dixLookupPrivate(&pScreen->devPrivates,
+-                                                      XF86XvScreenKey);
++    XvScreenPtr pxvs;
+     int i, j;
+ 
+-    if (noXvExtension)
++    if (noXvExtension || pScreen->isGPU || !XF86XvScreenKey)
++        return FALSE;
++
++    pxvs = (XvScreenPtr) dixLookupPrivate(&pScreen->devPrivates,
++                                          XF86XvScreenKey);
++    if (!pxvs)
+         return FALSE;
+ 
+     if (!(pAdapt = xallocarray(num_adaptors, sizeof(XvMCAdaptorRec))))
diff -pruN 2:21.1.3-2/debian/patches/xi2-resize-touch.patch 2:21.1.3-2ubuntu2/debian/patches/xi2-resize-touch.patch
--- 2:21.1.3-2/debian/patches/xi2-resize-touch.patch	1970-01-01 00:00:00.000000000 +0000
+++ 2:21.1.3-2ubuntu2/debian/patches/xi2-resize-touch.patch	2022-04-01 18:07:44.000000000 +0000
@@ -0,0 +1,33 @@
+Description: Resize touch event history if the array is filled up.
+Author: Maarten Lankhorst <maarten.lankhorst@ubuntu.com>
+
+--- a/dix/touch.c
++++ b/dix/touch.c
+@@ -432,11 +432,25 @@ TouchEventHistoryPush(TouchPointInfoPtr
+     if (ev->flags & (TOUCH_CLIENT_ID | TOUCH_REPLAYING))
+         return;
+ 
++    if (ti->history_elements == ti->history_size - 1) {
++        DeviceEvent *hist = NULL;
++        size_t sz = ti->history_size * 2;
++
++        if (sz < 10000) {
++            hist = realloc(ti->history, sz * sizeof(*hist));
++
++            if (hist) {
++                ti->history = hist;
++                ti->history_size = sz;
++                memset(&hist[sz/2], 0, sizeof(*hist)*sz/2);
++            }
++        }
++    }
++
+     ti->history[ti->history_elements++] = *ev;
+-    /* FIXME: proper overflow fixes */
+     if (ti->history_elements > ti->history_size - 1) {
+         ti->history_elements = ti->history_size - 1;
+-        DebugF("source device %d: history size %zu overflowing for touch %u\n",
++        ErrorF("source device %d: history size %zu overflowing for touch %u\n",
+                ti->sourceid, ti->history_size, ti->client_id);
+     }
+ }
diff -pruN 2:21.1.3-2/debian/rules 2:21.1.3-2ubuntu2/debian/rules
--- 2:21.1.3-2/debian/rules	2022-04-01 18:07:43.000000000 +0000
+++ 2:21.1.3-2ubuntu2/debian/rules	2022-04-01 18:07:44.000000000 +0000
@@ -4,6 +4,10 @@ include debian/rules.flags
 
 include /usr/share/dpkg/architecture.mk
 
+ifeq (,$(filter noudeb, $(DEB_BUILD_PROFILES)))
+  with_udeb = yes
+endif
+
 %:
 	dh $@ --with quilt
 
@@ -30,14 +34,18 @@ override_dh_auto_configure:
 		$(confflags) \
 		$(confflags_main) \
 		$(vars)
+ifeq ($(with_udeb),yes)
 	dh_auto_configure --builddirectory=debian/build/udeb -- \
 		$(confflags) \
 		$(confflags_udeb) \
 		$(vars)
+endif
 
 override_dh_auto_build:
 	dh_auto_build --builddirectory=debian/build/main
+ifeq ($(with_udeb),yes)
 	dh_auto_build --builddirectory=debian/build/udeb
+endif
 
 override_dh_auto_test:
 	dh_auto_test -- -j1 VERBOSE=1
@@ -45,12 +53,15 @@ override_dh_auto_test:
 override_dh_auto_install:
 	dh_auto_install --builddirectory=debian/build/main \
 		--destdir=debian/tmp/main
+ifeq ($(with_udeb),yes)
 	dh_auto_install --builddirectory=debian/build/udeb \
 		--destdir=debian/tmp/udeb
+endif
 
 	# oh, yuck.
 	find debian/tmp/*/usr/lib/xorg -type f -name '*.la' -delete
 
+ifeq ($(with_udeb),yes)
 	# remove modules not needed in d-i
 	rm -rf debian/tmp/udeb/usr/lib/xorg/modules/multimedia
 	rm -f debian/tmp/udeb/usr/lib/xorg/modules/libxaa.so
@@ -66,14 +77,21 @@ override_dh_auto_install:
 	rm -rf debian/tmp/udeb/usr/share/aclocal
 	rm -rf debian/tmp/udeb/usr/share/man
 	rm -rf debian/tmp/udeb/usr/lib/*/pkgconfig
+endif
 
 	install -m 755 debian/local/xvfb-run debian/tmp/main/usr/bin
+	# Make sure Xvfb at least starts up
+	PATH=debian/tmp/main/usr/bin/:/bin:/usr/bin \
+	  debian/tmp/main/usr/bin/xvfb-run -s "-screen 0 1280x1024x24 -nolisten tcp -noreset" true
+
 	install debian/local/xvfb-run.1 debian/tmp/main/usr/share/man/man1
 ifneq ($(DEB_HOST_ARCH_OS), linux)
 	install -d debian/tmp/main/usr/share/X11/xorg.conf.d
 	install -m 644 debian/local/10-*.conf debian/tmp/main/usr/share/X11/xorg.conf.d
+  ifeq ($(with_udeb),yes)
 	install -d debian/tmp/udeb/usr/share/X11/xorg.conf.d
 	install -m 644 debian/local/10-*.conf debian/tmp/udeb/usr/share/X11/xorg.conf.d
+  endif
 endif
 
 # Only read the first line, the rest of the file is used to determine
@@ -105,7 +123,9 @@ override_dh_fixperms-arch:
 	chmod ug+s $(CURDIR)/debian/xserver-xorg-legacy/usr/lib/xorg/Xorg.wrap
 
 override_dh_install:
+ifeq ($(with_udeb),yes)
 	dh_install -pxserver-xorg-core-udeb --sourcedir=debian/tmp/udeb
+endif
 	dh_install --remaining-packages --sourcedir=debian/tmp/main
 	install -d $(CURDIR)/debian/xserver-xorg-dev/usr/share/xserver-xorg
 	# Extract only the major ABI version:
@@ -118,8 +138,10 @@ override_dh_install:
 		test -n "$$abi_xinput"; echo inputabi=xorg-input-abi-$$abi_xinput >> debian/xserver-xorg-core.substvars && \
 		echo "xorg-input-abi-$$abi_xinput, xserver-xorg-core (>= $(serverminver))" > debian/xserver-xorg-dev/usr/share/xserver-xorg/xinputdep
 
+ifeq ($(with_udeb),yes)
 	# The udeb uses the same substvars:
 	cp debian/xserver-xorg-core.substvars debian/xserver-xorg-core-udeb.substvars
+endif
 
 	# save the configure flags so that packages like vnc, tightvnc, tigervnc
 	# know how the package was built.
@@ -131,8 +153,10 @@ override_dh_install:
 ifeq ($(DEB_HOST_ARCH_OS), linux)
 	install -d debian/xserver-xorg-core/lib/udev/rules.d
 	install -m 644 debian/local/64-xorg-xkb.rules debian/xserver-xorg-core/lib/udev/rules.d
+  ifeq ($(with_udeb),yes)
 	install -d debian/xserver-xorg-core-udeb/lib/udev/rules.d
 	install -m 644 debian/local/64-xorg-xkb.rules debian/xserver-xorg-core-udeb/lib/udev/rules.d
+  endif
 endif
 
 override_dh_missing-indep:
@@ -145,3 +169,9 @@ override_dh_clean:
 	dh_clean
 	rm -rf debian/build
 	rm -rf build-source
+
+override_dh_builddeb:
+	dh_builddeb $(skip_packages)
+
+override_dh_gencontrol:
+	dh_gencontrol $(skip_packages)
diff -pruN 2:21.1.3-2/debian/rules.flags 2:21.1.3-2ubuntu2/debian/rules.flags
--- 2:21.1.3-2/debian/rules.flags	2022-04-01 18:07:43.000000000 +0000
+++ 2:21.1.3-2ubuntu2/debian/rules.flags	2022-04-01 18:07:44.000000000 +0000
@@ -1,7 +1,7 @@
 DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
 
 VENDOR = $(shell dpkg-vendor --query Vendor)
-SUPPORT = https://www.debian.org/support
+SUPPORT = For technical support please see http://www.ubuntu.com/support
 
 SOURCE_NAME    :=  xorg-server
 SOURCE_VERSION := $(shell dpkg-parsechangelog -S Version)
@@ -156,4 +156,4 @@ else
 	confflags += --enable-unit-tests
 endif
 
-vars = $(shell DEB_BUILD_MAINT_OPTIONS="hardening=+pie" DEB_LDFLAGS_MAINT_APPEND="-Wl,-Bsymbolic" DEB_CPPFLAGS_MAINT_APPEND="-DPRE_RELEASE=0 $(cppflags)" dpkg-buildflags --export=configure) LIBS="$(libs)"
+vars = $(shell DEB_BUILD_MAINT_OPTIONS="hardening=+pie optimize=-lto" DEB_LDFLAGS_MAINT_APPEND="-Wl,-Bsymbolic" DEB_CPPFLAGS_MAINT_APPEND="-DPRE_RELEASE=0 $(cppflags)" dpkg-buildflags --export=configure) LIBS="$(libs)"
