xorg: Changes to 'ubuntu'
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.lpia | 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 -
21 files changed, 6 insertions(+), 21 deletions(-)
New commits:
commit 910079585f5350279dcf979c7ef66eb556c1ce00
Author: Timo Aaltonen <tjaalton@cc.hut.fi>
Date: Tue Oct 7 20:55:06 2008 +0300
Drop radeonhd from video-all.
diff --git a/debian/changelog b/debian/changelog
index 1f16f5a..b0f0145 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,13 @@
xorg (1:7.4~2ubuntu6) UNRELEASED; urgency=low
+ [ Bryce Harrington ]
* failsafeXinit: 'Standby' should be 'Stand by'
- -- Bryce Harrington <bryce@ubuntu.com> Thu, 02 Oct 2008 18:09:23 -0700
+ [ Timo Aaltonen ]
+ * scripts/vars*: Drop radeonhd from video-all, otherwise it would end
+ up being used instead of radeon. (LP: #279707)
+
+ -- Timo Aaltonen <tepsipakki@ubuntu.com> Tue, 07 Oct 2008 20:53:14 +0300
xorg (1:7.4~2ubuntu5) intrepid; urgency=low
diff --git a/debian/scripts/vars.alpha b/debian/scripts/vars.alpha
index 4b0d6d6..d14e47c 100755
--- a/debian/scripts/vars.alpha
+++ b/debian/scripts/vars.alpha
@@ -15,7 +15,6 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \
xserver-xorg-video-neomagic, \
xserver-xorg-video-nsc, \
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 3765b3f..0618281 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 e9ed229..56ab05e 100755
--- a/debian/scripts/vars.arm
+++ b/debian/scripts/vars.arm
@@ -15,7 +15,6 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \
xserver-xorg-video-neomagic, \
xserver-xorg-video-nsc, \
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 e9ed229..56ab05e 100644
--- a/debian/scripts/vars.armeb
+++ b/debian/scripts/vars.armeb
@@ -15,7 +15,6 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \
xserver-xorg-video-neomagic, \
xserver-xorg-video-nsc, \
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 e9ed229..56ab05e 100644
--- a/debian/scripts/vars.armel
+++ b/debian/scripts/vars.armel
@@ -15,7 +15,6 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \
xserver-xorg-video-neomagic, \
xserver-xorg-video-nsc, \
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 c5c86e2..648118e 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 2859fb9..6f3ce51 100644
--- a/debian/scripts/vars.hurd-i386
+++ b/debian/scripts/vars.hurd-i386
@@ -15,7 +15,6 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \
xserver-xorg-video-neomagic, \
xserver-xorg-video-nsc, \
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 fe0e8f6..f47f8c1 100755
--- a/debian/scripts/vars.i386
+++ b/debian/scripts/vars.i386
@@ -17,7 +17,6 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \
xserver-xorg-video-neomagic, \
xserver-xorg-video-nsc, \
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 9738cba..17f123b 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 e48005d..5d486d3 100755
--- a/debian/scripts/vars.kfreebsd-amd64
+++ b/debian/scripts/vars.kfreebsd-amd64
@@ -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.kfreebsd-i386 b/debian/scripts/vars.kfreebsd-i386
index 44ceceb..b0d00da 100755
--- a/debian/scripts/vars.kfreebsd-i386
+++ b/debian/scripts/vars.kfreebsd-i386
@@ -15,7 +15,6 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \
xserver-xorg-video-neomagic, \
xserver-xorg-video-nsc, \
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.lpia b/debian/scripts/vars.lpia
index eb1ad55..b32d94e 100755
--- a/debian/scripts/vars.lpia
+++ b/debian/scripts/vars.lpia
@@ -17,7 +17,6 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \
xserver-xorg-video-neomagic, \
xserver-xorg-video-nsc, \
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 e9ed229..56ab05e 100755
--- a/debian/scripts/vars.m32r
+++ b/debian/scripts/vars.m32r
@@ -15,7 +15,6 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \
xserver-xorg-video-neomagic, \
xserver-xorg-video-nsc, \
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 ecc5813..c3d7c03 100755
--- a/debian/scripts/vars.m68k
+++ b/debian/scripts/vars.m68k
@@ -15,7 +15,6 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \
xserver-xorg-video-neomagic, \
xserver-xorg-video-nsc, \
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 237dd7d..35792bd 100755
--- a/debian/scripts/vars.mips
+++ b/debian/scripts/vars.mips
@@ -16,7 +16,6 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \
xserver-xorg-video-newport, \
xserver-xorg-video-nsc, \
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 e9ed229..56ab05e 100755
--- a/debian/scripts/vars.mipsel
+++ b/debian/scripts/vars.mipsel
@@ -15,7 +15,6 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \
xserver-xorg-video-neomagic, \
xserver-xorg-video-nsc, \
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 2fdf370..620ac64 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 9e32a8b..8ad1666 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 9b87468..424107a 100644
--- a/debian/scripts/vars.sh4
+++ b/debian/scripts/vars.sh4
@@ -17,7 +17,6 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \
xserver-xorg-video-neomagic, \
xserver-xorg-video-nsc, \
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 ee362f2..74b81cd 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, \
Reply to: