xserver-xorg-video-intel: Changes to 'debian-unstable'
debian/changelog | 6 +++++-
debian/control | 4 ++--
2 files changed, 7 insertions(+), 3 deletions(-)
New commits:
commit c503c38a5b28c1efd81c7215a77624b396fa75b9
Author: Timo Aaltonen <tjaalton@deckard.hut.fi>
Date: Tue Apr 24 13:30:54 2007 +0300
Replaces/Conflicts: xserver-xorg-driver-i810.
diff --git a/debian/changelog b/debian/changelog
index 0061fc8..10cab2d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,13 @@
xserver-xorg-video-intel (2:2.0.0-2) UNRELEASED; urgency=low
+ [ Julien Cristau ]
* Build xserver-xorg-video-i810 in binary-indep instead of binary-arch
(closes: #420240). Thanks, Aaron M. Ucko!
- -- Julien Cristau <jcristau@debian.org> Sat, 21 Apr 2007 14:38:47 +0200
+ [ Timo Aaltonen ]
+ * Replaces/Conflicts: xserver-xorg-driver-i810.
+
+ -- Timo Aaltonen <tjaalton@cc.hut.fi> Tue, 24 Apr 2007 13:30:27 +0300
xserver-xorg-video-intel (2:2.0.0-1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 006e596..ebde864 100644
--- a/debian/control
+++ b/debian/control
@@ -12,8 +12,8 @@ Package: xserver-xorg-video-intel
Architecture: alpha amd64 arm armeb armel hppa hurd-i386 i386 ia64 kfreebsd-i386 m68k mips mipsel netbsd-i386 powerpc
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
-Conflicts: xserver-xorg-video-i810 (<< 2:1.9.91-1), xserver-xorg-video-i810-modesetting, xserver-xorg-video-intel-modesetting
+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
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, and
Reply to: