debian/changelog | 14 ++++++++++++++ debian/control | 4 ++++ debian/rules | 4 +++- debian/scripts/vars.alpha | 7 ++++--- debian/scripts/vars.amd64 | 11 +++++++---- debian/scripts/vars.arm | 7 ++++--- debian/scripts/vars.armeb | 7 ++++--- debian/scripts/vars.armel | 7 ++++--- debian/scripts/vars.hppa | 7 ++++--- debian/scripts/vars.hurd-i386 | 1 - debian/scripts/vars.i386 | 12 +++++++----- debian/scripts/vars.ia64 | 7 ++++--- debian/scripts/vars.kfreebsd-amd64 | 1 - debian/scripts/vars.kfreebsd-i386 | 1 - debian/scripts/vars.m32r | 7 ++++--- debian/scripts/vars.m68k | 1 - debian/scripts/vars.mips | 7 ++++--- debian/scripts/vars.mipsel | 7 ++++--- debian/scripts/vars.powerpc | 12 ++++++++---- debian/scripts/vars.ppc64 | 1 - debian/scripts/vars.sh4 | 7 ++++--- debian/scripts/vars.sparc | 7 ++++--- debian/scripts/vars.sparc64 | 7 ++++--- 23 files changed, 91 insertions(+), 55 deletions(-)
New commits: commit d6106e363de645813517ca08004f05bd2303f427 Author: Cyril Brulebois <[email protected]> Date: Tue Nov 9 16:13:12 2010 +0100 Upload to experimental. diff --git a/debian/changelog b/debian/changelog index fd91027..ffa76a9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -xorg (1:7.6~2) UNRELEASED; urgency=low +xorg (1:7.6~2) experimental; urgency=low * Drop xserver-xorg-video-nv, it's no longer supported. * Add variables to handle Recommends. @@ -10,7 +10,7 @@ xorg (1:7.6~2) UNRELEASED; urgency=low installable again. This input driver will probably be promoted to Depends again when it is ready™. - -- Cyril Brulebois <[email protected]> Tue, 09 Nov 2010 15:12:14 +0100 + -- Cyril Brulebois <[email protected]> Tue, 09 Nov 2010 16:13:06 +0100 xorg (1:7.6~1) experimental; urgency=low commit 122e9a6de3c9ebcec330869651181c47acad38bd Author: Cyril Brulebois <[email protected]> Date: Tue Nov 9 16:09:30 2010 +0100 Downgrade xserver-xorg-input-wacom from Depends to Recommends. This is only an interim measure aiming at making xserver-xorg-input-all installable again. This input driver will probably be promoted to Depends again when it is ready™. diff --git a/debian/changelog b/debian/changelog index 9a74ee6..fd91027 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,10 @@ xorg (1:7.6~2) UNRELEASED; urgency=low * Downgrade xserver-xorg-video-nouveau from Depends to Recommends. The frequent ABI changes make it difficult to manage, but that shouldn't stop people from using the xserver-xorg-video-all metapackage. + * Downgrade xserver-xorg-input-wacom from Depends to Recommends. This is + only an interim measure aiming at making xserver-xorg-input-all + installable again. This input driver will probably be promoted to + Depends again when it is ready™. -- Cyril Brulebois <[email protected]> Tue, 09 Nov 2010 15:12:14 +0100 diff --git a/debian/scripts/vars.alpha b/debian/scripts/vars.alpha index b97f064..adfe8fe 100755 --- a/debian/scripts/vars.alpha +++ b/debian/scripts/vars.alpha @@ -31,5 +31,7 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \ # , xserver-xorg-video-glide, XSERVER_XORG_INPUT_DEPENDS="xserver-xorg-input-evdev, \ - xserver-xorg-input-synaptics, \ - xserver-xorg-input-wacom" + xserver-xorg-input-synaptics" + + +XSERVER_XORG_INPUT_RECOMMENDS="xserver-xorg-input-wacom" diff --git a/debian/scripts/vars.amd64 b/debian/scripts/vars.amd64 index 9d95aab..0d0c0bf 100755 --- a/debian/scripts/vars.amd64 +++ b/debian/scripts/vars.amd64 @@ -33,5 +33,7 @@ XSERVER_XORG_VIDEO_RECOMMENDS="xserver-xorg-video-nouveau" XSERVER_XORG_INPUT_DEPENDS="xserver-xorg-input-evdev, \ - xserver-xorg-input-synaptics, \ - xserver-xorg-input-wacom" + xserver-xorg-input-synaptics" + + +XSERVER_XORG_INPUT_RECOMMENDS="xserver-xorg-input-wacom" diff --git a/debian/scripts/vars.arm b/debian/scripts/vars.arm index 36121db..87c6ba7 100755 --- a/debian/scripts/vars.arm +++ b/debian/scripts/vars.arm @@ -30,5 +30,7 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \ # xserver-xorg-video-glide, XSERVER_XORG_INPUT_DEPENDS="xserver-xorg-input-evdev, \ - xserver-xorg-input-synaptics, \ - xserver-xorg-input-wacom" + xserver-xorg-input-synaptics" + + +XSERVER_XORG_INPUT_RECOMMENDS="xserver-xorg-input-wacom" diff --git a/debian/scripts/vars.armeb b/debian/scripts/vars.armeb index 36121db..87c6ba7 100644 --- a/debian/scripts/vars.armeb +++ b/debian/scripts/vars.armeb @@ -30,5 +30,7 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \ # xserver-xorg-video-glide, XSERVER_XORG_INPUT_DEPENDS="xserver-xorg-input-evdev, \ - xserver-xorg-input-synaptics, \ - xserver-xorg-input-wacom" + xserver-xorg-input-synaptics" + + +XSERVER_XORG_INPUT_RECOMMENDS="xserver-xorg-input-wacom" diff --git a/debian/scripts/vars.armel b/debian/scripts/vars.armel index 36121db..87c6ba7 100644 --- a/debian/scripts/vars.armel +++ b/debian/scripts/vars.armel @@ -30,5 +30,7 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \ # xserver-xorg-video-glide, XSERVER_XORG_INPUT_DEPENDS="xserver-xorg-input-evdev, \ - xserver-xorg-input-synaptics, \ - xserver-xorg-input-wacom" + xserver-xorg-input-synaptics" + + +XSERVER_XORG_INPUT_RECOMMENDS="xserver-xorg-input-wacom" diff --git a/debian/scripts/vars.hppa b/debian/scripts/vars.hppa index a8c85a4..506b340 100755 --- a/debian/scripts/vars.hppa +++ b/debian/scripts/vars.hppa @@ -16,5 +16,7 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-ati, \ " XSERVER_XORG_INPUT_DEPENDS="xserver-xorg-input-evdev, \ - xserver-xorg-input-synaptics, \ - xserver-xorg-input-wacom" + xserver-xorg-input-synaptics" + + +XSERVER_XORG_INPUT_RECOMMENDS="xserver-xorg-input-wacom" diff --git a/debian/scripts/vars.i386 b/debian/scripts/vars.i386 index 3eceeac..e31560e 100755 --- a/debian/scripts/vars.i386 +++ b/debian/scripts/vars.i386 @@ -36,5 +36,7 @@ XSERVER_XORG_VIDEO_RECOMMENDS="xserver-xorg-video-nouveau" XSERVER_XORG_INPUT_DEPENDS="xserver-xorg-input-evdev, \ - xserver-xorg-input-synaptics, \ - xserver-xorg-input-wacom" + xserver-xorg-input-synaptics" + + +XSERVER_XORG_INPUT_RECOMMENDS="xserver-xorg-input-wacom" diff --git a/debian/scripts/vars.ia64 b/debian/scripts/vars.ia64 index 391a00e..393155d 100755 --- a/debian/scripts/vars.ia64 +++ b/debian/scripts/vars.ia64 @@ -26,5 +26,7 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \ " XSERVER_XORG_INPUT_DEPENDS="xserver-xorg-input-evdev, \ - xserver-xorg-input-synaptics, \ - xserver-xorg-input-wacom" + xserver-xorg-input-synaptics" + + +XSERVER_XORG_INPUT_RECOMMENDS="xserver-xorg-input-wacom" diff --git a/debian/scripts/vars.m32r b/debian/scripts/vars.m32r index 36121db..87c6ba7 100755 --- a/debian/scripts/vars.m32r +++ b/debian/scripts/vars.m32r @@ -30,5 +30,7 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \ # xserver-xorg-video-glide, XSERVER_XORG_INPUT_DEPENDS="xserver-xorg-input-evdev, \ - xserver-xorg-input-synaptics, \ - xserver-xorg-input-wacom" + xserver-xorg-input-synaptics" + + +XSERVER_XORG_INPUT_RECOMMENDS="xserver-xorg-input-wacom" diff --git a/debian/scripts/vars.mips b/debian/scripts/vars.mips index e731073..e6c0f4d 100755 --- a/debian/scripts/vars.mips +++ b/debian/scripts/vars.mips @@ -31,5 +31,7 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \ # xserver-xorg-video-glide XSERVER_XORG_INPUT_DEPENDS="xserver-xorg-input-evdev, \ - xserver-xorg-input-synaptics, \ - xserver-xorg-input-wacom" + xserver-xorg-input-synaptics" + + +XSERVER_XORG_INPUT_RECOMMENDS="xserver-xorg-input-wacom" diff --git a/debian/scripts/vars.mipsel b/debian/scripts/vars.mipsel index 36121db..87c6ba7 100755 --- a/debian/scripts/vars.mipsel +++ b/debian/scripts/vars.mipsel @@ -30,5 +30,7 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \ # xserver-xorg-video-glide, XSERVER_XORG_INPUT_DEPENDS="xserver-xorg-input-evdev, \ - xserver-xorg-input-synaptics, \ - xserver-xorg-input-wacom" + xserver-xorg-input-synaptics" + + +XSERVER_XORG_INPUT_RECOMMENDS="xserver-xorg-input-wacom" diff --git a/debian/scripts/vars.powerpc b/debian/scripts/vars.powerpc index 5a8aded..2242497 100755 --- a/debian/scripts/vars.powerpc +++ b/debian/scripts/vars.powerpc @@ -21,5 +21,7 @@ XSERVER_XORG_VIDEO_RECOMMENDS="xserver-xorg-video-nouveau" XSERVER_XORG_INPUT_DEPENDS="xserver-xorg-input-evdev, \ - xserver-xorg-input-synaptics, \ - xserver-xorg-input-wacom" + xserver-xorg-input-synaptics" + + +XSERVER_XORG_INPUT_RECOMMENDS="xserver-xorg-input-wacom" diff --git a/debian/scripts/vars.sh4 b/debian/scripts/vars.sh4 index 44b0d25..a2d2d06 100644 --- a/debian/scripts/vars.sh4 +++ b/debian/scripts/vars.sh4 @@ -33,5 +33,7 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \ # xserver-xorg-video-glide, XSERVER_XORG_INPUT_DEPENDS="xserver-xorg-input-evdev, \ - xserver-xorg-input-synaptics, \ - xserver-xorg-input-wacom" + xserver-xorg-input-synaptics" + + +XSERVER_XORG_INPUT_RECOMMENDS="xserver-xorg-input-wacom" diff --git a/debian/scripts/vars.sparc b/debian/scripts/vars.sparc index b5088a5..cf8e0d1 100755 --- a/debian/scripts/vars.sparc +++ b/debian/scripts/vars.sparc @@ -29,5 +29,7 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \ " XSERVER_XORG_INPUT_DEPENDS="xserver-xorg-input-evdev, \ - xserver-xorg-input-synaptics, \ - xserver-xorg-input-wacom" + xserver-xorg-input-synaptics" + + +XSERVER_XORG_INPUT_RECOMMENDS="xserver-xorg-input-wacom" diff --git a/debian/scripts/vars.sparc64 b/debian/scripts/vars.sparc64 index b5088a5..cf8e0d1 100644 --- a/debian/scripts/vars.sparc64 +++ b/debian/scripts/vars.sparc64 @@ -29,5 +29,7 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \ " XSERVER_XORG_INPUT_DEPENDS="xserver-xorg-input-evdev, \ - xserver-xorg-input-synaptics, \ - xserver-xorg-input-wacom" + xserver-xorg-input-synaptics" + + +XSERVER_XORG_INPUT_RECOMMENDS="xserver-xorg-input-wacom" commit c4280b71c48b66e52fd7e01ee64ed46017e70530 Author: Cyril Brulebois <[email protected]> Date: Tue Nov 9 15:35:57 2010 +0100 Downgrade xserver-xorg-video-nouveau from Depends to Recommends. The frequent ABI changes make it difficult to manage, but that shouldn't stop people from using the xserver-xorg-video-all metapackage. diff --git a/debian/changelog b/debian/changelog index 5bcdd47..9a74ee6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,9 @@ xorg (1:7.6~2) UNRELEASED; urgency=low * Drop xserver-xorg-video-nv, it's no longer supported. * Add variables to handle Recommends. + * Downgrade xserver-xorg-video-nouveau from Depends to Recommends. The + frequent ABI changes make it difficult to manage, but that shouldn't + stop people from using the xserver-xorg-video-all metapackage. -- Cyril Brulebois <[email protected]> Tue, 09 Nov 2010 15:12:14 +0100 diff --git a/debian/scripts/vars.amd64 b/debian/scripts/vars.amd64 index 3b35fa9..9d95aab 100755 --- a/debian/scripts/vars.amd64 +++ b/debian/scripts/vars.amd64 @@ -13,7 +13,6 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \ xserver-xorg-video-intel, \ xserver-xorg-video-mga, \ xserver-xorg-video-neomagic, \ - xserver-xorg-video-nouveau, \ xserver-xorg-video-rendition, \ xserver-xorg-video-s3, \ xserver-xorg-video-s3virge, \ @@ -30,6 +29,9 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \ xserver-xorg-video-vmware" +XSERVER_XORG_VIDEO_RECOMMENDS="xserver-xorg-video-nouveau" + + XSERVER_XORG_INPUT_DEPENDS="xserver-xorg-input-evdev, \ xserver-xorg-input-synaptics, \ xserver-xorg-input-wacom" diff --git a/debian/scripts/vars.i386 b/debian/scripts/vars.i386 index 427f883..3eceeac 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-intel, \ xserver-xorg-video-mga, \ xserver-xorg-video-neomagic, \ - xserver-xorg-video-nouveau, \ xserver-xorg-video-rendition, \ xserver-xorg-video-s3, \ xserver-xorg-video-s3virge, \ @@ -32,7 +31,9 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \ xserver-xorg-video-vmware, \ " -# xserver-xorg-video-glide, + +XSERVER_XORG_VIDEO_RECOMMENDS="xserver-xorg-video-nouveau" + XSERVER_XORG_INPUT_DEPENDS="xserver-xorg-input-evdev, \ xserver-xorg-input-synaptics, \ diff --git a/debian/scripts/vars.powerpc b/debian/scripts/vars.powerpc index 5845f53..5a8aded 100755 --- a/debian/scripts/vars.powerpc +++ b/debian/scripts/vars.powerpc @@ -7,7 +7,6 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-ati, \ xserver-xorg-video-chips, \ xserver-xorg-video-fbdev, \ xserver-xorg-video-mga, \ - xserver-xorg-video-nouveau, \ xserver-xorg-video-s3, \ xserver-xorg-video-s3virge, \ xserver-xorg-video-savage, \ @@ -17,6 +16,10 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-ati, \ xserver-xorg-video-trident, \ " + +XSERVER_XORG_VIDEO_RECOMMENDS="xserver-xorg-video-nouveau" + + XSERVER_XORG_INPUT_DEPENDS="xserver-xorg-input-evdev, \ xserver-xorg-input-synaptics, \ xserver-xorg-input-wacom" commit aef6809d1ff445f4778cda9c40561fab5aee8226 Author: Cyril Brulebois <[email protected]> Date: Tue Nov 9 15:29:38 2010 +0100 Add variables to handle Recommends. diff --git a/debian/changelog b/debian/changelog index ed2435b..5bcdd47 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ xorg (1:7.6~2) UNRELEASED; urgency=low * Drop xserver-xorg-video-nv, it's no longer supported. + * Add variables to handle Recommends. -- Cyril Brulebois <[email protected]> Tue, 09 Nov 2010 15:12:14 +0100 diff --git a/debian/control b/debian/control index e9a6cde..6a23ba5 100644 --- a/debian/control +++ b/debian/control @@ -44,6 +44,8 @@ Architecture: any Depends: ${F:XServer-Xorg-Video-Depends}, ${misc:Depends}, +Recommends: + ${F:XServer-Xorg-Video-Recommends}, Replaces: xserver-xorg-driver-all Conflicts: xserver-xorg-driver-all Description: the X.Org X server -- output driver metapackage @@ -56,6 +58,8 @@ Architecture: any Depends: ${F:XServer-Xorg-Input-Depends}, ${misc:Depends}, +Recommends: + ${F:XServer-Xorg-Input-Recommends}, Description: the X.Org X server -- input driver metapackage This package depends on the full suite of input drivers for the X.Org X server (Xorg). It does not provide any drivers itself, and may be removed if you wish diff --git a/debian/rules b/debian/rules index 8e3927f..28c49e0 100755 --- a/debian/rules +++ b/debian/rules @@ -120,7 +120,9 @@ endif dh_installdeb dh_shlibdeps dh_gencontrol -- -VF:XServer-Xorg-Video-Depends=$(XSERVER_XORG_VIDEO_DEPENDS) \ - -VF:XServer-Xorg-Input-Depends=$(XSERVER_XORG_INPUT_DEPENDS) + -VF:XServer-Xorg-Input-Depends=$(XSERVER_XORG_INPUT_DEPENDS) \ + -VF:XServer-Xorg-Video-Recommends=$(XSERVER_XORG_VIDEO_RECOMMENDS) \ + -VF:XServer-Xorg-Input-Recommends=$(XSERVER_XORG_INPUT_RECOMMENDS) dh_md5sums dh_builddeb touch $...@-stamp commit b882de327f6b31d9d5108a14eb752d70030e85f2 Author: Cyril Brulebois <[email protected]> Date: Tue Nov 9 15:12:54 2010 +0100 Drop xserver-xorg-video-nv, it's no longer supported. diff --git a/debian/changelog b/debian/changelog index 0e2bfb3..ed2435b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +xorg (1:7.6~2) UNRELEASED; urgency=low + + * Drop xserver-xorg-video-nv, it's no longer supported. + + -- Cyril Brulebois <[email protected]> Tue, 09 Nov 2010 15:12:14 +0100 + xorg (1:7.6~1) experimental; urgency=low [ Julien Cristau ] diff --git a/debian/scripts/vars.alpha b/debian/scripts/vars.alpha index 98949a3..b97f064 100755 --- a/debian/scripts/vars.alpha +++ b/debian/scripts/vars.alpha @@ -13,7 +13,6 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \ xserver-xorg-video-i740, \ xserver-xorg-video-mga, \ xserver-xorg-video-neomagic, \ - xserver-xorg-video-nv, \ 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 1c59d2d..3b35fa9 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-nouveau, \ - xserver-xorg-video-nv, \ 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 c496170..36121db 100755 --- a/debian/scripts/vars.arm +++ b/debian/scripts/vars.arm @@ -13,7 +13,6 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \ xserver-xorg-video-i740, \ xserver-xorg-video-mga, \ xserver-xorg-video-neomagic, \ - xserver-xorg-video-nv, \ 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 c496170..36121db 100644 --- a/debian/scripts/vars.armeb +++ b/debian/scripts/vars.armeb @@ -13,7 +13,6 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \ xserver-xorg-video-i740, \ xserver-xorg-video-mga, \ xserver-xorg-video-neomagic, \ - xserver-xorg-video-nv, \ 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 c496170..36121db 100644 --- a/debian/scripts/vars.armel +++ b/debian/scripts/vars.armel @@ -13,7 +13,6 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \ xserver-xorg-video-i740, \ xserver-xorg-video-mga, \ xserver-xorg-video-neomagic, \ - xserver-xorg-video-nv, \ 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 2b23472..a8c85a4 100755 --- a/debian/scripts/vars.hppa +++ b/debian/scripts/vars.hppa @@ -7,7 +7,6 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-ati, \ xserver-xorg-video-chips, \ xserver-xorg-video-fbdev, \ xserver-xorg-video-mga, \ - xserver-xorg-video-nv, \ 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 9b95ab5..91ae07a 100644 --- a/debian/scripts/vars.hurd-i386 +++ b/debian/scripts/vars.hurd-i386 @@ -13,7 +13,6 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \ xserver-xorg-video-i740, \ xserver-xorg-video-mga, \ xserver-xorg-video-neomagic, \ - xserver-xorg-video-nv, \ 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 39ae3e0..427f883 100755 --- a/debian/scripts/vars.i386 +++ b/debian/scripts/vars.i386 @@ -16,7 +16,6 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \ xserver-xorg-video-mga, \ xserver-xorg-video-neomagic, \ xserver-xorg-video-nouveau, \ - xserver-xorg-video-nv, \ 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 f9c0afd..391a00e 100755 --- a/debian/scripts/vars.ia64 +++ b/debian/scripts/vars.ia64 @@ -13,7 +13,6 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \ xserver-xorg-video-i740, \ xserver-xorg-video-mga, \ xserver-xorg-video-neomagic, \ - xserver-xorg-video-nv, \ 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 179064b..8ae146e 100755 --- a/debian/scripts/vars.kfreebsd-amd64 +++ b/debian/scripts/vars.kfreebsd-amd64 @@ -11,7 +11,6 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \ xserver-xorg-video-i128, \ xserver-xorg-video-mga, \ xserver-xorg-video-neomagic, \ - xserver-xorg-video-nv, \ 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 ae7b901..cdc7c38 100755 --- a/debian/scripts/vars.kfreebsd-i386 +++ b/debian/scripts/vars.kfreebsd-i386 @@ -12,7 +12,6 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \ xserver-xorg-video-i740, \ xserver-xorg-video-mga, \ xserver-xorg-video-neomagic, \ - xserver-xorg-video-nv, \ 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 c496170..36121db 100755 --- a/debian/scripts/vars.m32r +++ b/debian/scripts/vars.m32r @@ -13,7 +13,6 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \ xserver-xorg-video-i740, \ xserver-xorg-video-mga, \ xserver-xorg-video-neomagic, \ - xserver-xorg-video-nv, \ 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 79a666c..b311a28 100755 --- a/debian/scripts/vars.m68k +++ b/debian/scripts/vars.m68k @@ -13,7 +13,6 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \ xserver-xorg-video-i740, \ xserver-xorg-video-mga, \ xserver-xorg-video-neomagic, \ - xserver-xorg-video-nv, \ 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 e24f058..e731073 100755 --- a/debian/scripts/vars.mips +++ b/debian/scripts/vars.mips @@ -14,7 +14,6 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \ xserver-xorg-video-mga, \ xserver-xorg-video-neomagic, \ xserver-xorg-video-newport, \ - xserver-xorg-video-nv, \ 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 c496170..36121db 100755 --- a/debian/scripts/vars.mipsel +++ b/debian/scripts/vars.mipsel @@ -13,7 +13,6 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \ xserver-xorg-video-i740, \ xserver-xorg-video-mga, \ xserver-xorg-video-neomagic, \ - xserver-xorg-video-nv, \ 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 054a26a..5845f53 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-nouveau, \ - xserver-xorg-video-nv, \ 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 20ac61d..9006b79 100755 --- a/debian/scripts/vars.ppc64 +++ b/debian/scripts/vars.ppc64 @@ -7,7 +7,6 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-ati, \ xserver-xorg-video-chips, \ xserver-xorg-video-fbdev, \ xserver-xorg-video-mga, \ - xserver-xorg-video-nv, \ 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 6ff75c2..44b0d25 100644 --- a/debian/scripts/vars.sh4 +++ b/debian/scripts/vars.sh4 @@ -15,7 +15,6 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \ xserver-xorg-video-i740, \ xserver-xorg-video-mga, \ xserver-xorg-video-neomagic, \ - xserver-xorg-video-nv, \ 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 5cb831a..b5088a5 100755 --- a/debian/scripts/vars.sparc +++ b/debian/scripts/vars.sparc @@ -13,7 +13,6 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \ xserver-xorg-video-i740, \ xserver-xorg-video-mga, \ xserver-xorg-video-neomagic, \ - xserver-xorg-video-nv, \ xserver-xorg-video-rendition, \ xserver-xorg-video-s3virge, \ xserver-xorg-video-savage, \ diff --git a/debian/scripts/vars.sparc64 b/debian/scripts/vars.sparc64 index 5cb831a..b5088a5 100644 --- a/debian/scripts/vars.sparc64 +++ b/debian/scripts/vars.sparc64 @@ -13,7 +13,6 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \ xserver-xorg-video-i740, \ xserver-xorg-video-mga, \ xserver-xorg-video-neomagic, \ - xserver-xorg-video-nv, \ xserver-xorg-video-rendition, \ xserver-xorg-video-s3virge, \ xserver-xorg-video-savage, \ -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: http://lists.debian.org/[email protected]
