debian/changelog | 64 +++++++++++++++++++++++++++++++++++++ debian/scripts/vars.alpha | 13 ------- debian/scripts/vars.amd64 | 11 +++--- debian/scripts/vars.arm | 4 +- debian/scripts/vars.arm64 | 13 ++++--- debian/scripts/vars.armeb | 6 ++- debian/scripts/vars.armel | 8 ++-- debian/scripts/vars.armhf | 4 +- debian/scripts/vars.hppa | 4 -- debian/scripts/vars.hurd-i386 | 13 +------ debian/scripts/vars.i386 | 11 ++---- debian/scripts/vars.ia64 | 8 ++++ debian/scripts/vars.kfreebsd-amd64 | 13 +------ debian/scripts/vars.kfreebsd-i386 | 13 +------ debian/scripts/vars.m32r | 12 ------ debian/scripts/vars.m68k | 12 ------ debian/scripts/vars.mips | 13 ------- debian/scripts/vars.mipsel | 12 ------ debian/scripts/vars.powerpc | 2 - debian/scripts/vars.ppc64 | 4 -- debian/scripts/vars.sh4 | 13 ------- debian/scripts/vars.sparc | 13 ------- debian/scripts/vars.sparc64 | 13 ------- xsf-docs/howto/report-bugs.txt | 11 ++++++ 24 files changed, 129 insertions(+), 161 deletions(-)
New commits: commit 6f8db04dce78d4c7eb8129f1da42cd9a9ea4b950 Author: Timo Aaltonen <[email protected]> Date: Sat Jan 11 12:31:55 2014 +0200 import changes from distro diff --git a/debian/changelog b/debian/changelog index 5a4ac25..bf210d2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -xorg (1:7.7+1ubuntu6) UNRELEASED; urgency=low +xorg (1:7.7+1ubuntu8) UNRELEASED; urgency=low [ Bryce Harrington ] * scripts/vars.arm*: Don't include -ati or -nouveau, to save @@ -11,6 +11,18 @@ xorg (1:7.7+1ubuntu6) UNRELEASED; urgency=low -- Christopher James Halse Rogers <[email protected]> Mon, 18 Feb 2013 16:17:23 +0000 +xorg (1:7.7+1ubuntu7) trusty; urgency=medium + + * Just depend on xserver-xorg-video-dummy on ppc64el. + + -- Matthias Klose <[email protected]> Wed, 18 Dec 2013 12:11:13 +0100 + +xorg (1:7.7+1ubuntu6) saucy; urgency=low + + * Just depend on xserver-xorg-video-dummy on AArch64. + + -- Matthias Klose <[email protected]> Thu, 10 Oct 2013 15:56:36 +0200 + xorg (1:7.7+1ubuntu5) raring; urgency=low * Allow xserver-xorg-core-omap-revert and xserver-xorg-video-omap-revert to diff --git a/debian/scripts/vars.arm64 b/debian/scripts/vars.arm64 new file mode 100644 index 0000000..525866e --- /dev/null +++ b/debian/scripts/vars.arm64 @@ -0,0 +1,8 @@ + +# This file is NOT a shell script. +# +# This file gets included by both debian/rules (make) AND the scripts in +# debian/scripts (Bourne shell). +XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-dummy" + +XSERVER_XORG_INPUT_DEPENDS="xserver-xorg-input-void" diff --git a/debian/scripts/vars.ppc64el b/debian/scripts/vars.ppc64el new file mode 100644 index 0000000..525866e --- /dev/null +++ b/debian/scripts/vars.ppc64el @@ -0,0 +1,8 @@ + +# This file is NOT a shell script. +# +# This file gets included by both debian/rules (make) AND the scripts in +# debian/scripts (Bourne shell). +XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-dummy" + +XSERVER_XORG_INPUT_DEPENDS="xserver-xorg-input-void" commit 6fa6baee21b317dc311f528b826b7b01749378df Author: Julien Cristau <[email protected]> Date: Wed Dec 25 19:57:04 2013 +0100 Upload to unstable diff --git a/debian/changelog b/debian/changelog index 8b7ff1c..1abe9aa 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -xorg (1:7.7+5) UNRELEASED; urgency=medium +xorg (1:7.7+5) unstable; urgency=medium * Add minimal arm64 support (using fbdev/evdev drivers); closes: #731766. Thanks, Wookey! - -- Julien Cristau <[email protected]> Wed, 25 Dec 2013 19:53:43 +0100 + -- Julien Cristau <[email protected]> Wed, 25 Dec 2013 19:56:46 +0100 xorg (1:7.7+4) unstable; urgency=low commit 7bda7f24b64b9f20860e22e51219cd1588329bcd Author: Julien Cristau <[email protected]> Date: Wed Dec 25 19:55:51 2013 +0100 Add minimal arm64 support (using fbdev/evdev drivers) diff --git a/debian/changelog b/debian/changelog index e24c718..8b7ff1c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +xorg (1:7.7+5) UNRELEASED; urgency=medium + + * Add minimal arm64 support (using fbdev/evdev drivers); closes: #731766. + Thanks, Wookey! + + -- Julien Cristau <[email protected]> Wed, 25 Dec 2013 19:53:43 +0100 + xorg (1:7.7+4) unstable; urgency=low [ Julien Cristau ] diff --git a/debian/scripts/vars.arm64 b/debian/scripts/vars.arm64 new file mode 100644 index 0000000..3a9a86e --- /dev/null +++ b/debian/scripts/vars.arm64 @@ -0,0 +1,9 @@ +XSERVER_XORG_VIDEO_DEPENDS="\ + xserver-xorg-video-fbdev, \ + xserver-xorg-video-modesetting, \ +" + +XSERVER_XORG_INPUT_DEPENDS="\ + xserver-xorg-input-evdev, \ +" + commit 3d8373a67966ad2b4b169b233a8545d8bad306e9 Author: Julien Cristau <[email protected]> Date: Mon Sep 30 19:55:53 2013 +0200 Upload to unstable diff --git a/debian/changelog b/debian/changelog index b6baca7..e24c718 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,6 @@ -xorg (1:7.7+4) UNRELEASED; urgency=low +xorg (1:7.7+4) unstable; urgency=low + [ Julien Cristau ] * Remove unmaintained drivers from xserver-xorg-video-all: - xserver-xorg-video-apm - xserver-xorg-video-ark @@ -20,7 +21,14 @@ xorg (1:7.7+4) UNRELEASED; urgency=low - xserver-xorg-video-tseng - xserver-xorg-video-voodoo - -- Julien Cristau <[email protected]> Mon, 30 Sep 2013 19:36:18 +0200 + [ Michael Stapelberg ] + * report-bugs: tell people to file bugs upstream + + [ Maarten Lankhorst ] + * Add xserver-xorg-video-modesetting on amd64 armhf i386. + * Add xserver-xorg-video-qxl on amd64 i386. + + -- Julien Cristau <[email protected]> Mon, 30 Sep 2013 19:55:41 +0200 xorg (1:7.7+3) unstable; urgency=low commit e7289b45a2abf6648533f8a73f933d89b5fdb5c9 Author: Julien Cristau <[email protected]> Date: Mon Sep 30 19:53:39 2013 +0200 Remove unmaintained drivers from xserver-xorg-video-all: - xserver-xorg-video-apm - xserver-xorg-video-ark - xserver-xorg-video-chips - xserver-xorg-video-i128 - xserver-xorg-video-i740 - xserver-xorg-video-newport - xserver-xorg-video-rendition - xserver-xorg-video-s3 - xserver-xorg-video-s3virge - xserver-xorg-video-sis - xserver-xorg-video-suncg14 - xserver-xorg-video-suncg3 - xserver-xorg-video-suncg6 - xserver-xorg-video-sunleo - xserver-xorg-video-suntcx - xserver-xorg-video-tga - xserver-xorg-video-tseng - xserver-xorg-video-voodoo Reverts some partial changes from Maarten which were not done consistently across archs and weren't documented in changelog. diff --git a/debian/changelog b/debian/changelog index 7c91643..b6baca7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,27 @@ +xorg (1:7.7+4) UNRELEASED; urgency=low + + * Remove unmaintained drivers from xserver-xorg-video-all: + - xserver-xorg-video-apm + - xserver-xorg-video-ark + - xserver-xorg-video-chips + - xserver-xorg-video-i128 + - xserver-xorg-video-i740 + - xserver-xorg-video-newport + - xserver-xorg-video-rendition + - xserver-xorg-video-s3 + - xserver-xorg-video-s3virge + - xserver-xorg-video-sis + - xserver-xorg-video-suncg14 + - xserver-xorg-video-suncg3 + - xserver-xorg-video-suncg6 + - xserver-xorg-video-sunleo + - xserver-xorg-video-suntcx + - xserver-xorg-video-tga + - xserver-xorg-video-tseng + - xserver-xorg-video-voodoo + + -- Julien Cristau <[email protected]> Mon, 30 Sep 2013 19:36:18 +0200 + xorg (1:7.7+3) unstable; urgency=low * Add xserver-xorg-input-vmmouse to -all on i386 and amd64 (closes: diff --git a/debian/scripts/vars.alpha b/debian/scripts/vars.alpha index 3662d71..a08b7ec 100644 --- a/debian/scripts/vars.alpha +++ b/debian/scripts/vars.alpha @@ -3,28 +3,18 @@ # # 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-cirrus, \ xserver-xorg-video-fbdev, \ - xserver-xorg-video-i128, \ - 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-tga, \ 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.amd64 b/debian/scripts/vars.amd64 index 35566f0..b321199 100644 --- a/debian/scripts/vars.amd64 +++ b/debian/scripts/vars.amd64 @@ -14,10 +14,10 @@ XSERVER_XORG_VIDEO_DEPENDS=" \ xserver-xorg-video-nouveau, \ xserver-xorg-video-openchrome, \ xserver-xorg-video-qxl, \ - xserver-xorg-video-r128, \ xserver-xorg-video-savage, \ xserver-xorg-video-siliconmotion, \ xserver-xorg-video-sisusb, \ + xserver-xorg-video-tdfx, \ xserver-xorg-video-trident, \ xserver-xorg-video-vesa, \ xserver-xorg-video-vmware, \ diff --git a/debian/scripts/vars.arm b/debian/scripts/vars.arm index 7266e99..f415229 100644 --- a/debian/scripts/vars.arm +++ b/debian/scripts/vars.arm @@ -3,27 +3,18 @@ # # 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-cirrus, \ xserver-xorg-video-fbdev, \ - xserver-xorg-video-i128, \ - 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.armeb b/debian/scripts/vars.armeb index 7266e99..f415229 100644 --- a/debian/scripts/vars.armeb +++ b/debian/scripts/vars.armeb @@ -3,27 +3,18 @@ # # 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-cirrus, \ xserver-xorg-video-fbdev, \ - xserver-xorg-video-i128, \ - 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.armel b/debian/scripts/vars.armel index 95b630d..f415229 100644 --- a/debian/scripts/vars.armel +++ b/debian/scripts/vars.armel @@ -3,18 +3,16 @@ # # 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-cirrus, \ xserver-xorg-video-fbdev, \ - xserver-xorg-video-i128, \ - xserver-xorg-video-i740, \ xserver-xorg-video-mga, \ xserver-xorg-video-neomagic, \ xserver-xorg-video-savage, \ xserver-xorg-video-siliconmotion, \ xserver-xorg-video-sisusb, \ + xserver-xorg-video-tdfx, \ xserver-xorg-video-trident, \ xserver-xorg-video-vesa, \ " diff --git a/debian/scripts/vars.hppa b/debian/scripts/vars.hppa index f8b8ef5..6ad649d 100644 --- a/debian/scripts/vars.hppa +++ b/debian/scripts/vars.hppa @@ -6,10 +6,7 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-ati, \ xserver-xorg-video-fbdev, \ xserver-xorg-video-mga, \ - xserver-xorg-video-s3, \ - xserver-xorg-video-s3virge, \ xserver-xorg-video-savage, \ - xserver-xorg-video-sis, \ xserver-xorg-video-tdfx, \ xserver-xorg-video-trident, \ " diff --git a/debian/scripts/vars.hurd-i386 b/debian/scripts/vars.hurd-i386 index be39725..74c0a4d 100644 --- a/debian/scripts/vars.hurd-i386 +++ b/debian/scripts/vars.hurd-i386 @@ -3,27 +3,19 @@ # 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-cirrus, \ xserver-xorg-video-fbdev, \ - xserver-xorg-video-i128, \ - xserver-xorg-video-i740, \ xserver-xorg-video-mga, \ xserver-xorg-video-neomagic, \ xserver-xorg-video-openchrome, \ - 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-tdfx, \ xserver-xorg-video-trident, \ - xserver-xorg-video-tseng, \ xserver-xorg-video-vesa, \ xserver-xorg-video-vmware, \ - xserver-xorg-video-voodoo" +" XSERVER_XORG_INPUT_DEPENDS="xserver-xorg-input-kbd, \ xserver-xorg-input-mouse" diff --git a/debian/scripts/vars.i386 b/debian/scripts/vars.i386 index 855d113..9bbd637 100644 --- a/debian/scripts/vars.i386 +++ b/debian/scripts/vars.i386 @@ -14,10 +14,10 @@ XSERVER_XORG_VIDEO_DEPENDS=" \ xserver-xorg-video-nouveau, \ xserver-xorg-video-openchrome, \ xserver-xorg-video-qxl, \ - xserver-xorg-video-r128, \ xserver-xorg-video-savage, \ xserver-xorg-video-siliconmotion, \ xserver-xorg-video-sisusb, \ + xserver-xorg-video-tdfx, \ xserver-xorg-video-trident, \ xserver-xorg-video-vesa, \ xserver-xorg-video-vmware, \ diff --git a/debian/scripts/vars.ia64 b/debian/scripts/vars.ia64 index af5e5e7..4395278 100644 --- a/debian/scripts/vars.ia64 +++ b/debian/scripts/vars.ia64 @@ -3,24 +3,16 @@ # # 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-cirrus, \ xserver-xorg-video-fbdev, \ - xserver-xorg-video-i128, \ - 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-tdfx, \ xserver-xorg-video-trident, \ - xserver-xorg-video-tseng, \ xserver-xorg-video-vesa, \ " diff --git a/debian/scripts/vars.kfreebsd-amd64 b/debian/scripts/vars.kfreebsd-amd64 index 43a776f..49ee567 100644 --- a/debian/scripts/vars.kfreebsd-amd64 +++ b/debian/scripts/vars.kfreebsd-amd64 @@ -3,26 +3,18 @@ # # 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-cirrus, \ - xserver-xorg-video-i128, \ xserver-xorg-video-mga, \ xserver-xorg-video-neomagic, \ xserver-xorg-video-openchrome, \ - 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-tdfx, \ xserver-xorg-video-trident, \ - xserver-xorg-video-tseng, \ xserver-xorg-video-vesa, \ - xserver-xorg-video-voodoo" - +" XSERVER_XORG_INPUT_DEPENDS="xserver-xorg-input-kbd, \ xserver-xorg-input-mouse" diff --git a/debian/scripts/vars.kfreebsd-i386 b/debian/scripts/vars.kfreebsd-i386 index 3ab8551..799af0b 100644 --- a/debian/scripts/vars.kfreebsd-i386 +++ b/debian/scripts/vars.kfreebsd-i386 @@ -3,26 +3,18 @@ # # 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-cirrus, \ - xserver-xorg-video-i128, \ - xserver-xorg-video-i740, \ xserver-xorg-video-mga, \ xserver-xorg-video-neomagic, \ xserver-xorg-video-openchrome, \ - 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-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.m32r b/debian/scripts/vars.m32r index 7266e99..f415229 100644 --- a/debian/scripts/vars.m32r +++ b/debian/scripts/vars.m32r @@ -3,27 +3,18 @@ # # 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-cirrus, \ xserver-xorg-video-fbdev, \ - xserver-xorg-video-i128, \ - 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.m68k b/debian/scripts/vars.m68k index f20694e..70891e0 100644 --- a/debian/scripts/vars.m68k +++ b/debian/scripts/vars.m68k @@ -3,27 +3,18 @@ # # 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-cirrus, \ xserver-xorg-video-fbdev, \ - xserver-xorg-video-i128, \ - 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.mips b/debian/scripts/vars.mips index a850de8..55fbb44 100644 --- a/debian/scripts/vars.mips +++ b/debian/scripts/vars.mips @@ -3,28 +3,18 @@ # # 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-cirrus, \ xserver-xorg-video-fbdev, \ - xserver-xorg-video-i128, \ - xserver-xorg-video-i740, \ xserver-xorg-video-mga, \ xserver-xorg-video-neomagic, \ - xserver-xorg-video-newport, \ - 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.mipsel b/debian/scripts/vars.mipsel index 7266e99..f415229 100644 --- a/debian/scripts/vars.mipsel +++ b/debian/scripts/vars.mipsel @@ -3,27 +3,18 @@ # # 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-cirrus, \ xserver-xorg-video-fbdev, \ - xserver-xorg-video-i128, \ - 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.powerpc b/debian/scripts/vars.powerpc index eb86b08..fb34f2b 100644 --- a/debian/scripts/vars.powerpc +++ b/debian/scripts/vars.powerpc @@ -7,9 +7,9 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-ati, \ xserver-xorg-video-fbdev, \ xserver-xorg-video-mga, \ xserver-xorg-video-nouveau, \ - xserver-xorg-video-r128, \ xserver-xorg-video-savage, \ 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 81d1452..4ecd3b4 100644 --- a/debian/scripts/vars.ppc64 +++ b/debian/scripts/vars.ppc64 @@ -6,9 +6,9 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-ati, \ xserver-xorg-video-fbdev, \ xserver-xorg-video-mga, \ - xserver-xorg-video-r128, \ xserver-xorg-video-savage, \ xserver-xorg-video-sisusb, \ + xserver-xorg-video-tdfx, \ xserver-xorg-video-trident" diff --git a/debian/scripts/vars.sh4 b/debian/scripts/vars.sh4 index bc100b4..4a5a4b0 100644 --- a/debian/scripts/vars.sh4 +++ b/debian/scripts/vars.sh4 @@ -3,30 +3,20 @@ # # 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-cirrus, \ xserver-xorg-video-dummy, \ xserver-xorg-video-fbdev, \ - xserver-xorg-video-glint, \ - xserver-xorg-video-i128, \ - 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-vga, \ - xserver-xorg-video-voodoo, \ " # xserver-xorg-video-glide, diff --git a/debian/scripts/vars.sparc b/debian/scripts/vars.sparc index 1fcb8b5..99761d1 100644 --- a/debian/scripts/vars.sparc +++ b/debian/scripts/vars.sparc @@ -3,25 +3,15 @@ # # 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-cirrus, \ xserver-xorg-video-fbdev, \ - xserver-xorg-video-i128, \ - xserver-xorg-video-i740, \ xserver-xorg-video-mga, \ xserver-xorg-video-neomagic, \ - xserver-xorg-video-rendition, \ - xserver-xorg-video-s3virge, \ xserver-xorg-video-savage, \ xserver-xorg-video-siliconmotion, \ - xserver-xorg-video-suncg14, \ - xserver-xorg-video-suncg3, \ - xserver-xorg-video-suncg6, \ xserver-xorg-video-sunffb, \ - xserver-xorg-video-sunleo, \ - xserver-xorg-video-suntcx, \ xserver-xorg-video-tdfx, \ xserver-xorg-video-trident, \ xserver-xorg-video-vesa, \ diff --git a/debian/scripts/vars.sparc64 b/debian/scripts/vars.sparc64 index 1fcb8b5..99761d1 100644 --- a/debian/scripts/vars.sparc64 +++ b/debian/scripts/vars.sparc64 @@ -3,25 +3,15 @@ # # 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-cirrus, \ xserver-xorg-video-fbdev, \ - xserver-xorg-video-i128, \ - xserver-xorg-video-i740, \ xserver-xorg-video-mga, \ xserver-xorg-video-neomagic, \ - xserver-xorg-video-rendition, \ - xserver-xorg-video-s3virge, \ xserver-xorg-video-savage, \ xserver-xorg-video-siliconmotion, \ - xserver-xorg-video-suncg14, \ - xserver-xorg-video-suncg3, \ - xserver-xorg-video-suncg6, \ xserver-xorg-video-sunffb, \ - xserver-xorg-video-sunleo, \ - xserver-xorg-video-suntcx, \ xserver-xorg-video-tdfx, \ xserver-xorg-video-trident, \ xserver-xorg-video-vesa, \ commit 48594daf437f3285642bdfcce13a838233e3c2f3 Author: Maarten Lankhorst <[email protected]> Date: Thu Sep 26 01:24:37 2013 +0200 remove xserver-xorg-video-chips diff --git a/debian/scripts/vars.alpha b/debian/scripts/vars.alpha index adfe8fe..3662d71 100644 --- a/debian/scripts/vars.alpha +++ b/debian/scripts/vars.alpha @@ -6,7 +6,6 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \ xserver-xorg-video-ark, \ xserver-xorg-video-ati, \ - xserver-xorg-video-chips, \ xserver-xorg-video-cirrus, \ xserver-xorg-video-fbdev, \ xserver-xorg-video-i128, \ diff --git a/debian/scripts/vars.amd64 b/debian/scripts/vars.amd64 index afd4526..35566f0 100644 --- a/debian/scripts/vars.amd64 +++ b/debian/scripts/vars.amd64 @@ -5,7 +5,6 @@ # debian/scripts (Bourne shell). XSERVER_XORG_VIDEO_DEPENDS=" \ xserver-xorg-video-ati, \ - xserver-xorg-video-chips, \ xserver-xorg-video-cirrus, \ xserver-xorg-video-fbdev, \ xserver-xorg-video-intel, \ diff --git a/debian/scripts/vars.arm b/debian/scripts/vars.arm index 87c6ba7..7266e99 100644 --- a/debian/scripts/vars.arm +++ b/debian/scripts/vars.arm @@ -6,7 +6,6 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \ xserver-xorg-video-ark, \ xserver-xorg-video-ati, \ - xserver-xorg-video-chips, \ xserver-xorg-video-cirrus, \ xserver-xorg-video-fbdev, \ xserver-xorg-video-i128, \ diff --git a/debian/scripts/vars.armeb b/debian/scripts/vars.armeb index 87c6ba7..7266e99 100644 --- a/debian/scripts/vars.armeb +++ b/debian/scripts/vars.armeb @@ -6,7 +6,6 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \ xserver-xorg-video-ark, \ xserver-xorg-video-ati, \ - xserver-xorg-video-chips, \ xserver-xorg-video-cirrus, \ xserver-xorg-video-fbdev, \ xserver-xorg-video-i128, \ diff --git a/debian/scripts/vars.armel b/debian/scripts/vars.armel index 445fffd..95b630d 100644 --- a/debian/scripts/vars.armel +++ b/debian/scripts/vars.armel @@ -6,7 +6,6 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \ xserver-xorg-video-ark, \ xserver-xorg-video-ati, \ - xserver-xorg-video-chips, \ xserver-xorg-video-cirrus, \ xserver-xorg-video-fbdev, \ xserver-xorg-video-i128, \ diff --git a/debian/scripts/vars.hppa b/debian/scripts/vars.hppa index 506b340..f8b8ef5 100644 --- a/debian/scripts/vars.hppa +++ b/debian/scripts/vars.hppa @@ -4,7 +4,6 @@ # This file gets included by both debian/rules (make) AND the scripts in # debian/scripts (Bourne shell). XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-ati, \ - xserver-xorg-video-chips, \ xserver-xorg-video-fbdev, \ xserver-xorg-video-mga, \ xserver-xorg-video-s3, \ diff --git a/debian/scripts/vars.hurd-i386 b/debian/scripts/vars.hurd-i386 index 0e88246..be39725 100644 --- a/debian/scripts/vars.hurd-i386 +++ b/debian/scripts/vars.hurd-i386 @@ -5,7 +5,6 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \ xserver-xorg-video-ark, \ - xserver-xorg-video-chips, \ xserver-xorg-video-cirrus, \ xserver-xorg-video-fbdev, \ xserver-xorg-video-i128, \ diff --git a/debian/scripts/vars.i386 b/debian/scripts/vars.i386 index 03d7bd1..855d113 100644 --- a/debian/scripts/vars.i386 +++ b/debian/scripts/vars.i386 @@ -5,7 +5,6 @@ # debian/scripts (Bourne shell). XSERVER_XORG_VIDEO_DEPENDS=" \ xserver-xorg-video-ati, \ - xserver-xorg-video-chips, \ xserver-xorg-video-cirrus, \ xserver-xorg-video-fbdev, \ xserver-xorg-video-intel, \ diff --git a/debian/scripts/vars.ia64 b/debian/scripts/vars.ia64 index 393155d..af5e5e7 100644 --- a/debian/scripts/vars.ia64 +++ b/debian/scripts/vars.ia64 @@ -6,7 +6,6 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \ xserver-xorg-video-ark, \ xserver-xorg-video-ati, \ - xserver-xorg-video-chips, \ xserver-xorg-video-cirrus, \ xserver-xorg-video-fbdev, \ xserver-xorg-video-i128, \ diff --git a/debian/scripts/vars.kfreebsd-amd64 b/debian/scripts/vars.kfreebsd-amd64 index 8d4084d..43a776f 100644 --- a/debian/scripts/vars.kfreebsd-amd64 +++ b/debian/scripts/vars.kfreebsd-amd64 @@ -6,7 +6,6 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \ xserver-xorg-video-ark, \ xserver-xorg-video-ati, \ - xserver-xorg-video-chips, \ xserver-xorg-video-cirrus, \ xserver-xorg-video-i128, \ xserver-xorg-video-mga, \ diff --git a/debian/scripts/vars.kfreebsd-i386 b/debian/scripts/vars.kfreebsd-i386 index c1d1034..3ab8551 100644 --- a/debian/scripts/vars.kfreebsd-i386 +++ b/debian/scripts/vars.kfreebsd-i386 @@ -6,7 +6,6 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \ xserver-xorg-video-ark, \ xserver-xorg-video-ati, \ - xserver-xorg-video-chips, \ xserver-xorg-video-cirrus, \ xserver-xorg-video-i128, \ xserver-xorg-video-i740, \ diff --git a/debian/scripts/vars.m32r b/debian/scripts/vars.m32r index 87c6ba7..7266e99 100644 --- a/debian/scripts/vars.m32r +++ b/debian/scripts/vars.m32r @@ -6,7 +6,6 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \ xserver-xorg-video-ark, \ xserver-xorg-video-ati, \ - xserver-xorg-video-chips, \ xserver-xorg-video-cirrus, \ xserver-xorg-video-fbdev, \ xserver-xorg-video-i128, \ diff --git a/debian/scripts/vars.m68k b/debian/scripts/vars.m68k index b311a28..f20694e 100644 --- a/debian/scripts/vars.m68k +++ b/debian/scripts/vars.m68k @@ -6,7 +6,6 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \ xserver-xorg-video-ark, \ xserver-xorg-video-ati, \ - xserver-xorg-video-chips, \ xserver-xorg-video-cirrus, \ xserver-xorg-video-fbdev, \ xserver-xorg-video-i128, \ diff --git a/debian/scripts/vars.mips b/debian/scripts/vars.mips index e6c0f4d..a850de8 100644 --- a/debian/scripts/vars.mips +++ b/debian/scripts/vars.mips @@ -6,7 +6,6 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \ xserver-xorg-video-ark, \ xserver-xorg-video-ati, \ - xserver-xorg-video-chips, \ xserver-xorg-video-cirrus, \ xserver-xorg-video-fbdev, \ xserver-xorg-video-i128, \ diff --git a/debian/scripts/vars.mipsel b/debian/scripts/vars.mipsel index 87c6ba7..7266e99 100644 --- a/debian/scripts/vars.mipsel +++ b/debian/scripts/vars.mipsel @@ -6,7 +6,6 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \ xserver-xorg-video-ark, \ xserver-xorg-video-ati, \ - xserver-xorg-video-chips, \ xserver-xorg-video-cirrus, \ xserver-xorg-video-fbdev, \ xserver-xorg-video-i128, \ diff --git a/debian/scripts/vars.powerpc b/debian/scripts/vars.powerpc index 5141fba..eb86b08 100644 --- a/debian/scripts/vars.powerpc +++ b/debian/scripts/vars.powerpc -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: http://lists.debian.org/[email protected]
