debian/changelog | 7 +++++++ debian/scripts/vars.alpha | 1 - debian/scripts/vars.amd64 | 1 - debian/scripts/vars.arm | 1 - debian/scripts/vars.armeb | 1 - debian/scripts/vars.armel | 1 - debian/scripts/vars.hppa | 1 - debian/scripts/vars.hurd-i386 | 1 - debian/scripts/vars.i386 | 1 - debian/scripts/vars.ia64 | 1 - debian/scripts/vars.kfreebsd-amd64 | 1 - debian/scripts/vars.kfreebsd-i386 | 1 - debian/scripts/vars.m32r | 1 - debian/scripts/vars.m68k | 1 - debian/scripts/vars.mips | 1 - debian/scripts/vars.mipsel | 1 - debian/scripts/vars.powerpc | 1 - debian/scripts/vars.ppc64 | 1 - debian/scripts/vars.sh4 | 1 - debian/scripts/vars.sparc | 1 - 20 files changed, 7 insertions(+), 19 deletions(-)
New commits: commit 3457d61c33c2883c6d18fdf0efac0cf6d251e038 Author: Julien Cristau <jcris...@debian.org> Date: Sat Apr 17 17:28:00 2010 +0200 Drop radeonhd from xserver-xorg-video-all. We switched to kernel modesetting for radeon, and that clashes with this driver. diff --git a/debian/changelog b/debian/changelog index 54fab9e..9d7aa9e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +xorg (1:7.5+6) UNRELEASED; urgency=low + + * Drop radeonhd from xserver-xorg-video-all. We switched to kernel + modesetting for radeon, and that clashes with this driver. + + -- Julien Cristau <jcris...@debian.org> Sat, 17 Apr 2010 17:27:16 +0200 + xorg (1:7.5+5) unstable; urgency=low * Fix typo in Xsession.d/50x11-common_determine-startup, closes: #573899. diff --git a/debian/scripts/vars.alpha b/debian/scripts/vars.alpha index 553b18a..7198581 100755 --- a/debian/scripts/vars.alpha +++ b/debian/scripts/vars.alpha @@ -14,7 +14,6 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \ xserver-xorg-video-mga, \ xserver-xorg-video-neomagic, \ xserver-xorg-video-nv, \ - xserver-xorg-video-radeonhd, \ xserver-xorg-video-rendition, \ xserver-xorg-video-s3, \ xserver-xorg-video-s3virge, \ diff --git a/debian/scripts/vars.amd64 b/debian/scripts/vars.amd64 index e14e7f1..d1db431 100755 --- a/debian/scripts/vars.amd64 +++ b/debian/scripts/vars.amd64 @@ -14,7 +14,6 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \ xserver-xorg-video-mga, \ xserver-xorg-video-neomagic, \ xserver-xorg-video-nv, \ - xserver-xorg-video-radeonhd, \ xserver-xorg-video-rendition, \ xserver-xorg-video-s3, \ xserver-xorg-video-s3virge, \ diff --git a/debian/scripts/vars.arm b/debian/scripts/vars.arm index e267434..52277a8 100755 --- a/debian/scripts/vars.arm +++ b/debian/scripts/vars.arm @@ -14,7 +14,6 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \ xserver-xorg-video-mga, \ xserver-xorg-video-neomagic, \ xserver-xorg-video-nv, \ - xserver-xorg-video-radeonhd, \ xserver-xorg-video-rendition, \ xserver-xorg-video-s3, \ xserver-xorg-video-s3virge, \ diff --git a/debian/scripts/vars.armeb b/debian/scripts/vars.armeb index e267434..52277a8 100644 --- a/debian/scripts/vars.armeb +++ b/debian/scripts/vars.armeb @@ -14,7 +14,6 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \ xserver-xorg-video-mga, \ xserver-xorg-video-neomagic, \ xserver-xorg-video-nv, \ - xserver-xorg-video-radeonhd, \ xserver-xorg-video-rendition, \ xserver-xorg-video-s3, \ xserver-xorg-video-s3virge, \ diff --git a/debian/scripts/vars.armel b/debian/scripts/vars.armel index e267434..52277a8 100644 --- a/debian/scripts/vars.armel +++ b/debian/scripts/vars.armel @@ -14,7 +14,6 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \ xserver-xorg-video-mga, \ xserver-xorg-video-neomagic, \ xserver-xorg-video-nv, \ - xserver-xorg-video-radeonhd, \ xserver-xorg-video-rendition, \ xserver-xorg-video-s3, \ xserver-xorg-video-s3virge, \ diff --git a/debian/scripts/vars.hppa b/debian/scripts/vars.hppa index 10a92a5..ad2ae2c 100755 --- a/debian/scripts/vars.hppa +++ b/debian/scripts/vars.hppa @@ -8,7 +8,6 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-ati, \ xserver-xorg-video-fbdev, \ xserver-xorg-video-mga, \ xserver-xorg-video-nv, \ - xserver-xorg-video-radeonhd, \ xserver-xorg-video-s3, \ xserver-xorg-video-s3virge, \ xserver-xorg-video-savage, \ diff --git a/debian/scripts/vars.hurd-i386 b/debian/scripts/vars.hurd-i386 index bc6b2da..9b95ab5 100644 --- a/debian/scripts/vars.hurd-i386 +++ b/debian/scripts/vars.hurd-i386 @@ -14,7 +14,6 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \ xserver-xorg-video-mga, \ xserver-xorg-video-neomagic, \ xserver-xorg-video-nv, \ - xserver-xorg-video-radeonhd, \ xserver-xorg-video-rendition, \ xserver-xorg-video-s3, \ xserver-xorg-video-s3virge, \ diff --git a/debian/scripts/vars.i386 b/debian/scripts/vars.i386 index 791c6c6..2e52268 100755 --- a/debian/scripts/vars.i386 +++ b/debian/scripts/vars.i386 @@ -15,7 +15,6 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \ xserver-xorg-video-mga, \ xserver-xorg-video-neomagic, \ xserver-xorg-video-nv, \ - xserver-xorg-video-radeonhd, \ xserver-xorg-video-rendition, \ xserver-xorg-video-s3, \ xserver-xorg-video-s3virge, \ diff --git a/debian/scripts/vars.ia64 b/debian/scripts/vars.ia64 index 8afff0b..462e67c 100755 --- a/debian/scripts/vars.ia64 +++ b/debian/scripts/vars.ia64 @@ -14,7 +14,6 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \ xserver-xorg-video-mga, \ xserver-xorg-video-neomagic, \ xserver-xorg-video-nv, \ - xserver-xorg-video-radeonhd, \ xserver-xorg-video-rendition, \ xserver-xorg-video-s3, \ xserver-xorg-video-s3virge, \ diff --git a/debian/scripts/vars.kfreebsd-amd64 b/debian/scripts/vars.kfreebsd-amd64 index 4f5dcc5..179064b 100755 --- a/debian/scripts/vars.kfreebsd-amd64 +++ b/debian/scripts/vars.kfreebsd-amd64 @@ -12,7 +12,6 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \ xserver-xorg-video-mga, \ xserver-xorg-video-neomagic, \ xserver-xorg-video-nv, \ - xserver-xorg-video-radeonhd, \ xserver-xorg-video-rendition, \ xserver-xorg-video-s3, \ xserver-xorg-video-s3virge, \ diff --git a/debian/scripts/vars.kfreebsd-i386 b/debian/scripts/vars.kfreebsd-i386 index bfbb066..ae7b901 100755 --- a/debian/scripts/vars.kfreebsd-i386 +++ b/debian/scripts/vars.kfreebsd-i386 @@ -13,7 +13,6 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \ xserver-xorg-video-mga, \ xserver-xorg-video-neomagic, \ xserver-xorg-video-nv, \ - xserver-xorg-video-radeonhd, \ xserver-xorg-video-rendition, \ xserver-xorg-video-s3, \ xserver-xorg-video-s3virge, \ diff --git a/debian/scripts/vars.m32r b/debian/scripts/vars.m32r index e267434..52277a8 100755 --- a/debian/scripts/vars.m32r +++ b/debian/scripts/vars.m32r @@ -14,7 +14,6 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \ xserver-xorg-video-mga, \ xserver-xorg-video-neomagic, \ xserver-xorg-video-nv, \ - xserver-xorg-video-radeonhd, \ xserver-xorg-video-rendition, \ xserver-xorg-video-s3, \ xserver-xorg-video-s3virge, \ diff --git a/debian/scripts/vars.m68k b/debian/scripts/vars.m68k index 72b2427..9b4df42 100755 --- a/debian/scripts/vars.m68k +++ b/debian/scripts/vars.m68k @@ -14,7 +14,6 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \ xserver-xorg-video-mga, \ xserver-xorg-video-neomagic, \ xserver-xorg-video-nv, \ - xserver-xorg-video-radeonhd, \ xserver-xorg-video-rendition, \ xserver-xorg-video-s3, \ xserver-xorg-video-s3virge, \ diff --git a/debian/scripts/vars.mips b/debian/scripts/vars.mips index 8cd1d93..38bdced 100755 --- a/debian/scripts/vars.mips +++ b/debian/scripts/vars.mips @@ -15,7 +15,6 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \ xserver-xorg-video-neomagic, \ xserver-xorg-video-newport, \ xserver-xorg-video-nv, \ - xserver-xorg-video-radeonhd, \ xserver-xorg-video-rendition, \ xserver-xorg-video-s3, \ xserver-xorg-video-s3virge, \ diff --git a/debian/scripts/vars.mipsel b/debian/scripts/vars.mipsel index e267434..52277a8 100755 --- a/debian/scripts/vars.mipsel +++ b/debian/scripts/vars.mipsel @@ -14,7 +14,6 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \ xserver-xorg-video-mga, \ xserver-xorg-video-neomagic, \ xserver-xorg-video-nv, \ - xserver-xorg-video-radeonhd, \ xserver-xorg-video-rendition, \ xserver-xorg-video-s3, \ xserver-xorg-video-s3virge, \ diff --git a/debian/scripts/vars.powerpc b/debian/scripts/vars.powerpc index 70b88cd..a3513d7 100755 --- a/debian/scripts/vars.powerpc +++ b/debian/scripts/vars.powerpc @@ -8,7 +8,6 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-ati, \ xserver-xorg-video-fbdev, \ xserver-xorg-video-mga, \ xserver-xorg-video-nv, \ - xserver-xorg-video-radeonhd, \ xserver-xorg-video-s3, \ xserver-xorg-video-s3virge, \ xserver-xorg-video-savage, \ diff --git a/debian/scripts/vars.ppc64 b/debian/scripts/vars.ppc64 index f27e03c..d331787 100755 --- a/debian/scripts/vars.ppc64 +++ b/debian/scripts/vars.ppc64 @@ -8,7 +8,6 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-ati, \ xserver-xorg-video-fbdev, \ xserver-xorg-video-mga, \ xserver-xorg-video-nv, \ - xserver-xorg-video-radeonhd, \ xserver-xorg-video-s3, \ xserver-xorg-video-s3virge, \ xserver-xorg-video-savage, \ diff --git a/debian/scripts/vars.sh4 b/debian/scripts/vars.sh4 index 9c44a4a..dca8071 100644 --- a/debian/scripts/vars.sh4 +++ b/debian/scripts/vars.sh4 @@ -16,7 +16,6 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \ xserver-xorg-video-mga, \ xserver-xorg-video-neomagic, \ xserver-xorg-video-nv, \ - xserver-xorg-video-radeonhd, \ xserver-xorg-video-rendition, \ xserver-xorg-video-s3, \ xserver-xorg-video-s3virge, \ diff --git a/debian/scripts/vars.sparc b/debian/scripts/vars.sparc index 9227c03..1e3f99a 100755 --- a/debian/scripts/vars.sparc +++ b/debian/scripts/vars.sparc @@ -14,7 +14,6 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \ xserver-xorg-video-mga, \ xserver-xorg-video-neomagic, \ xserver-xorg-video-nv, \ - xserver-xorg-video-radeonhd, \ xserver-xorg-video-rendition, \ xserver-xorg-video-s3virge, \ xserver-xorg-video-savage, \ -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/e1o39wp-0000ei...@alioth.debian.org