diff -Nru xorg-7.6+12ubuntu1/debian/changelog xorg-7.6+12ubuntu2/debian/changelog
--- xorg-7.6+12ubuntu1/debian/changelog	2012-03-22 17:42:24.000000000 +0000
+++ xorg-7.6+12ubuntu2/debian/changelog	2013-01-03 15:43:35.000000000 +0000
@@ -1,3 +1,15 @@
+xorg (1:7.6+12ubuntu2) precise-proposed; urgency=low
+
+  * Update package to enable support for quantal backport stack (LP: #1095686)
+  * Add xserver-xorg-lts-precise which can be installed to rollback from renamed stack
+    - depends on unrenamed xserver-xorg, recommends unrenamed versions of packages
+  * Allow xserver-xorg-renamed to satisfy xorg's xserver-xorg dependency
+  * Require unrenamed versions of packages in xserver-xorg
+  * Add conflicts/replaces in xserver-xorg to xorg-renamed-package,
+    and provide xserver-xorg-renamed
+
+ -- Maarten Lankhorst <maarten.lankhorst@ubuntu.com>  Thu, 22 Nov 2012 00:00:43 +0100
+
 xorg (1:7.6+12ubuntu1) precise; urgency=low
 
   * Merge from Debian unstable.
diff -Nru xorg-7.6+12ubuntu1/debian/control xorg-7.6+12ubuntu2/debian/control
--- xorg-7.6+12ubuntu1/debian/control	2012-01-20 14:56:22.000000000 +0000
+++ xorg-7.6+12ubuntu2/debian/control	2012-11-26 10:42:24.000000000 +0000
@@ -34,9 +34,9 @@
 Architecture: any
 Depends:
  xserver-xorg-core (>= 2:1.11),
- xserver-xorg-video-all | xorg-driver-video,
- xserver-xorg-input-all | xorg-driver-input,
- xserver-xorg-input-evdev [linux-any],
+ xserver-xorg-video-all (>= 0~) | xorg-driver-video,
+ xserver-xorg-input-all (>= 0~) | xorg-driver-input,
+ xserver-xorg-input-evdev (>= 0~) [linux-any],
  hal (>= 0.5.14-4~) [kfreebsd-any],
  ${shlibs:Depends},
  ${misc:Depends},
@@ -44,7 +44,28 @@
  x11-xkb-utils
 Recommends:
  libgl1-mesa-dri,
-Provides: xserver
+Provides:
+ xserver-xorg-renamed,
+ xserver,
+Replaces:
+ xserver-xorg-renamed,
+ xorg-renamed-package,
+Conflicts:
+ xserver-xorg-renamed,
+ xorg-renamed-package,
+Description: X.Org X server
+ This package depends on the full suite of the server and drivers for the
+ X.Org X server.  It does not provide the actual server itself.
+
+Package: xserver-xorg-lts-precise
+Architecture: any
+Depends:
+ xserver-xorg (>= 0~),
+Recommends:
+ libgl1-mesa-dri (>= 0~),
+ libgl1-mesa-glx (>= 0~),
+ xserver-xorg-video-all (>= 0~),
+ xserver-xorg-input-all (>= 0~),
 Description: X.Org X server
  This package depends on the full suite of the server and drivers for the
  X.Org X server.  It does not provide the actual server itself.
@@ -78,7 +99,7 @@
 Package: xorg
 Architecture: any
 Depends:
- xserver-xorg (>= ${binary:Version}),
+ xserver-xorg (>= ${binary:Version}) | xserver-xorg-renamed,
  libgl1-mesa-glx | libgl1,
  libgl1-mesa-dri,
  libglu1-mesa,