diff -Nru /tmp/pWco7tSwWU/xorg-7.1.1ubuntu6/debian/changelog /tmp/xWZxVN8tsc/xorg-7.1.1ubuntu6.1/debian/changelog
--- /tmp/pWco7tSwWU/xorg-7.1.1ubuntu6/debian/changelog	2006-10-20 18:22:34.000000000 +0200
+++ /tmp/xWZxVN8tsc/xorg-7.1.1ubuntu6.1/debian/changelog	2006-11-01 15:08:56.000000000 +0100
@@ -1,3 +1,18 @@
+xorg (1:7.1.1ubuntu6.1) edgy-proposed; urgency=low
+
+  [Matt Zimmerman]
+
+  * Tighten dependencies on xserver-xorg to include all video and input
+    drivers, to help ensure that they aren't inadvertently removed
+  (Closes: LP#68430)
+
+  [Michael Vogt]
+
+  * add "xserver-xorg-driver-all" transitional package
+  (Closes: LP#68430)
+
+ -- Fabio M. Di Nitto <fabbione@ubuntu.com>  Wed, 01 Nov 2006 15:08:51 +0100
+
 xorg (1:7.1.1ubuntu6) edgy; urgency=low
 
   * debian/control: fix Replaces typo for xinit's version.
diff -Nru /tmp/pWco7tSwWU/xorg-7.1.1ubuntu6/debian/control /tmp/xWZxVN8tsc/xorg-7.1.1ubuntu6.1/debian/control
--- /tmp/pWco7tSwWU/xorg-7.1.1ubuntu6/debian/control	2006-10-20 18:06:40.000000000 +0200
+++ /tmp/xWZxVN8tsc/xorg-7.1.1ubuntu6.1/debian/control	2006-11-01 15:06:29.000000000 +0100
@@ -29,7 +29,7 @@
 Conflicts: xserver-xfree86 (<< 6.8.2.dfsg.1-1), xserver-common
 Replaces: xserver-common
 Pre-Depends: x11-common (>= 7.0.0-0ubuntu3)
-Depends: xserver-xorg-core, xserver-xorg-video-all | xserver-xorg-video, xserver-xorg-input-all | xserver-xorg-input, debconf, xkb-data | xkb-data-legacy, xbase-clients, ${F:XServer-Xorg-Detect-Depends}
+Depends: xserver-xorg-core, xserver-xorg-video-all, xserver-xorg-input-all, debconf, xkb-data | xkb-data-legacy, xbase-clients, ${F:XServer-Xorg-Detect-Depends}
 Recommends: laptop-detect, xresprobe, mdetect, discover1 | discover
 Description: the X.Org X server
  This package depends on the full suite of the server and drivers for the
@@ -44,11 +44,18 @@
 Description: transitional package for moving from XFree86 to X.Org
  This package smooths upgrades from Debian 3.1 by depending on xserver-xorg.
 
+Package: xserver-xorg-driver-all
+Architecture: any
+Depends: ${F:XServer-Xorg-Video-Depends}
+Description: the X.Org X server -- output driver transitional metapackage
+ This package depends on the full suite of output drivers for the X.Org X server
+ (Xorg).  It does not provide any drivers itself, and may be removed if you wish
+ to only have certain drivers installed.
+
 Package: xserver-xorg-video-all
 Architecture: any
 Depends: ${F:XServer-Xorg-Video-Depends}
 Replaces: xserver-xorg-driver-all
-Conflicts: xserver-xorg-driver-all
 Description: the X.Org X server -- output driver metapackage
  This package depends on the full suite of output drivers for the X.Org X server
  (Xorg).  It does not provide any drivers itself, and may be removed if you wish