xorg: Changes to 'debian-unstable'
debian/scripts/vars.amd64 | 17 ++++++-----------
debian/scripts/vars.armel | 7 -------
debian/scripts/vars.armhf | 1 +
debian/scripts/vars.i386 | 15 ++++-----------
debian/scripts/vars.powerpc | 5 +----
debian/scripts/vars.ppc64 | 5 +----
6 files changed, 13 insertions(+), 37 deletions(-)
New commits:
commit f9b7ebd8084d46dd3230c69286cb524a4be65096
Author: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Date: Wed Sep 25 17:40:51 2013 +0200
add modesetting for armhf
diff --git a/debian/scripts/vars.armhf b/debian/scripts/vars.armhf
index ae27e54..3c97ea4 100644
--- a/debian/scripts/vars.armhf
+++ b/debian/scripts/vars.armhf
@@ -5,6 +5,7 @@
# debian/scripts (Bourne shell).
XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-ati, \
xserver-xorg-video-fbdev, \
+ xserver-xorg-video-modesetting, \
xserver-xorg-video-nouveau, \
xserver-xorg-video-vesa, \
"
commit 358d144ba6da20b9d06281502e1523ffb046c942
Author: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Date: Wed Sep 25 17:36:14 2013 +0200
update i386, amd64, powerpc, powerpc4, armel list of drivers.
diff --git a/debian/scripts/vars.amd64 b/debian/scripts/vars.amd64
index ed4600b..afd4526 100644
--- a/debian/scripts/vars.amd64
+++ b/debian/scripts/vars.amd64
@@ -3,31 +3,26 @@
#
# This file gets included by both debian/rules (make) AND the scripts in
# debian/scripts (Bourne shell).
-XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \
- xserver-xorg-video-ark, \
+XSERVER_XORG_VIDEO_DEPENDS=" \
xserver-xorg-video-ati, \
xserver-xorg-video-chips, \
xserver-xorg-video-cirrus, \
xserver-xorg-video-fbdev, \
- xserver-xorg-video-i128, \
xserver-xorg-video-intel, \
xserver-xorg-video-mga, \
+ xserver-xorg-video-modesetting, \
xserver-xorg-video-neomagic, \
xserver-xorg-video-nouveau, \
xserver-xorg-video-openchrome, \
- xserver-xorg-video-rendition, \
- xserver-xorg-video-s3, \
- xserver-xorg-video-s3virge, \
+ xserver-xorg-video-qxl, \
+ xserver-xorg-video-r128, \
xserver-xorg-video-savage, \
xserver-xorg-video-siliconmotion, \
- xserver-xorg-video-sis, \
xserver-xorg-video-sisusb, \
- xserver-xorg-video-tdfx, \
xserver-xorg-video-trident, \
- xserver-xorg-video-tseng, \
xserver-xorg-video-vesa, \
- xserver-xorg-video-voodoo, \
- xserver-xorg-video-vmware"
+ xserver-xorg-video-vmware, \
+"
XSERVER_XORG_VIDEO_RECOMMENDS=""
diff --git a/debian/scripts/vars.armel b/debian/scripts/vars.armel
index 87c6ba7..445fffd 100644
--- a/debian/scripts/vars.armel
+++ b/debian/scripts/vars.armel
@@ -13,18 +13,11 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \
xserver-xorg-video-i740, \
xserver-xorg-video-mga, \
xserver-xorg-video-neomagic, \
- xserver-xorg-video-rendition, \
- xserver-xorg-video-s3, \
- xserver-xorg-video-s3virge, \
xserver-xorg-video-savage, \
xserver-xorg-video-siliconmotion, \
- xserver-xorg-video-sis, \
xserver-xorg-video-sisusb, \
- xserver-xorg-video-tdfx, \
xserver-xorg-video-trident, \
- xserver-xorg-video-tseng, \
xserver-xorg-video-vesa, \
- xserver-xorg-video-voodoo, \
"
# xserver-xorg-video-glide,
diff --git a/debian/scripts/vars.i386 b/debian/scripts/vars.i386
index ec8d7ed..03d7bd1 100644
--- a/debian/scripts/vars.i386
+++ b/debian/scripts/vars.i386
@@ -3,31 +3,24 @@
#
# This file gets included by both debian/rules (make) AND the scripts in
# debian/scripts (Bourne shell).
-XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \
- xserver-xorg-video-ark, \
+XSERVER_XORG_VIDEO_DEPENDS=" \
xserver-xorg-video-ati, \
xserver-xorg-video-chips, \
xserver-xorg-video-cirrus, \
xserver-xorg-video-fbdev, \
- xserver-xorg-video-i128, \
- xserver-xorg-video-i740, \
xserver-xorg-video-intel, \
xserver-xorg-video-mga, \
+ xserver-xorg-video-modesetting, \
xserver-xorg-video-neomagic, \
xserver-xorg-video-nouveau, \
xserver-xorg-video-openchrome, \
- xserver-xorg-video-rendition, \
- xserver-xorg-video-s3, \
- xserver-xorg-video-s3virge, \
+ xserver-xorg-video-qxl, \
+ xserver-xorg-video-r128, \
xserver-xorg-video-savage, \
xserver-xorg-video-siliconmotion, \
- xserver-xorg-video-sis, \
xserver-xorg-video-sisusb, \
- xserver-xorg-video-tdfx, \
xserver-xorg-video-trident, \
- xserver-xorg-video-tseng, \
xserver-xorg-video-vesa, \
- xserver-xorg-video-voodoo, \
xserver-xorg-video-vmware, \
"
diff --git a/debian/scripts/vars.powerpc b/debian/scripts/vars.powerpc
index 65e45d7..5141fba 100644
--- a/debian/scripts/vars.powerpc
+++ b/debian/scripts/vars.powerpc
@@ -8,12 +8,9 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-ati, \
xserver-xorg-video-fbdev, \
xserver-xorg-video-mga, \
xserver-xorg-video-nouveau, \
- xserver-xorg-video-s3, \
- xserver-xorg-video-s3virge, \
+ xserver-xorg-video-r128, \
xserver-xorg-video-savage, \
- xserver-xorg-video-sis, \
xserver-xorg-video-sisusb, \
- xserver-xorg-video-tdfx, \
xserver-xorg-video-trident, \
"
diff --git a/debian/scripts/vars.ppc64 b/debian/scripts/vars.ppc64
index 9006b79..3f58a73 100644
--- a/debian/scripts/vars.ppc64
+++ b/debian/scripts/vars.ppc64
@@ -7,12 +7,9 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-ati, \
xserver-xorg-video-chips, \
xserver-xorg-video-fbdev, \
xserver-xorg-video-mga, \
- xserver-xorg-video-s3, \
- xserver-xorg-video-s3virge, \
+ xserver-xorg-video-r128, \
xserver-xorg-video-savage, \
- xserver-xorg-video-sis, \
xserver-xorg-video-sisusb, \
- xserver-xorg-video-tdfx, \
xserver-xorg-video-trident"
Reply to: