debian/changelog |    7 +++++++
 debian/control   |    2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

New commits:
commit 7631c1062bdf8070161c8a75f8da22a7b11b4072
Author: David Nusinow <[EMAIL PROTECTED]>
Date:   Mon Dec 3 21:35:44 2007 -0500

    * Conflict with 915resolution. This driver now handles all of this itself
      and better. Closes: #452803

diff --git a/debian/changelog b/debian/changelog
index d655cb5..1b9217a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-video-intel (2:2.2.0-2) UNRELEASED; urgency=low
+
+  * Conflict with 915resolution. This driver now handles all of this itself
+    and better. Closes: #452803
+
+ -- David Nusinow <[EMAIL PROTECTED]>  Mon, 03 Dec 2007 21:35:07 -0500
+
 xserver-xorg-video-intel (2:2.2.0-1) unstable; urgency=low
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index 98c6585..1245664 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,7 @@ Architecture: alpha amd64 arm armeb armel hppa hurd-i386 i386 
ia64 kfreebsd-i386
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${xserver:Depends}
 Provides: ${xviddriver:Provides}
 Replaces: xserver-xorg (<< 6.8.2-35), xserver-xorg-video-i810 (<< 2:1.9.91-1), 
xserver-xorg-video-i810-modesetting, xserver-xorg-video-intel-modesetting, 
xserver-xorg-driver-i810
-Conflicts: xserver-xorg-video-i810 (<< 2:1.9.91-1), 
xserver-xorg-video-i810-modesetting, xserver-xorg-video-intel-modesetting, 
xserver-xorg-driver-i810
+Conflicts: xserver-xorg-video-i810 (<< 2:1.9.91-1), 
xserver-xorg-video-i810-modesetting, xserver-xorg-video-intel-modesetting, 
xserver-xorg-driver-i810, 915resolution
 Description: X.Org X server -- Intel i8xx, i9xx display driver
  This package provides the driver for the Intel i8xx and i9xx family
  of chipsets, including i810, i815, i830, i845, i855, i865, i915, i945


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

Reply via email to