xorg: Changes to 'ubuntu'
debian/changelog | 114 +++
debian/control | 6
debian/local/rgb.txt | 754 ---------------------
debian/po/be.po | 27
debian/po/bg.po | 22
debian/po/ca.po | 21
debian/po/dz.po | 11
debian/po/fr.po | 25
debian/po/he.po | 24
debian/po/it.po | 168 +---
debian/po/ml.po | 646 +-----------------
debian/po/sv.po | 1285 -------------------------------------
debian/po/vi.po | 18
debian/po/zh_CN.po | 24
debian/scripts/vars.alpha | 36 -
debian/scripts/vars.amd64 | 37 +
debian/scripts/vars.arm | 36 -
debian/scripts/vars.armeb | 36 -
debian/scripts/vars.armel | 36 -
debian/scripts/vars.hppa | 21
debian/scripts/vars.hurd-i386 | 33
debian/scripts/vars.i386 | 42 +
debian/scripts/vars.ia64 | 33
debian/scripts/vars.kfreebsd-amd64 | 29
debian/scripts/vars.kfreebsd-i386 | 32
debian/scripts/vars.lpia | 42 +
debian/scripts/vars.m32r | 36 -
debian/scripts/vars.m68k | 35 -
debian/scripts/vars.mips | 37 +
debian/scripts/vars.mipsel | 36 -
debian/scripts/vars.powerpc | 22
debian/scripts/vars.ppc64 | 34
debian/scripts/vars.sh4 | 39 +
debian/scripts/vars.sparc | 35 -
debian/x11-common.install | 1
debian/xserver-xorg.postinst.in | 3
debian/xsfbs/xsfbs-autoreconf.mk | 150 ----
37 files changed, 1032 insertions(+), 2954 deletions(-)
New commits:
commit e1b955ed653e7d5d926448fef4369482b6648813
Author: Timo Aaltonen <tjaalton@pris.hut.fi>
Date: Tue Jul 1 21:45:28 2008 +0300
Split the variables in vars.* files
diff --git a/debian/changelog b/debian/changelog
index bf98a87..7765f4d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -25,7 +25,11 @@ xorg (1:7.4~1) UNRELEASED; urgency=low
* Add xutils preinst to drop obsolete /etc/X11/rstart/ files,
closes: #382360.
- -- Brice Goglin <bgoglin@debian.org> Sun, 22 Jun 2008 10:17:19 +0200
+ [ Timo Aaltonen ]
+ * Split the variables in vars.* files to span multiple lines. Makes
+ them a lot easier to read and merge.
+
+ -- Timo Aaltonen <tepsipakki@ubuntu.com> Tue, 01 Jul 2008 21:42:13 +0300
xorg (1:7.3+12) unstable; urgency=low
diff --git a/debian/scripts/vars.alpha b/debian/scripts/vars.alpha
index 3c21bba..53a3938 100755
--- a/debian/scripts/vars.alpha
+++ b/debian/scripts/vars.alpha
@@ -3,8 +3,40 @@
#
# 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-ati, xserver-xorg-video-chips, xserver-xorg-video-cirrus, xserver-xorg-video-cyrix, xserver-xorg-video-fbdev, xserver-xorg-video-i128, xserver-xorg-video-i740, xserver-xorg-video-imstt, xserver-xorg-video-mga, xserver-xorg-video-neomagic, 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, 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-via, xserver-xorg-video-voodoo, xserver-xorg-video-v4l"
+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-cyrix, \
+ xserver-xorg-video-fbdev, \
+ xserver-xorg-video-i128, \
+ xserver-xorg-video-i740, \
+ xserver-xorg-video-imstt, \
+ xserver-xorg-video-mga, \
+ 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, \
+ 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-v4l"
# , xserver-xorg-video-glide,
-XSERVER_XORG_INPUT_DEPENDS="xserver-xorg-input-evdev, xserver-xorg-input-kbd, xserver-xorg-input-mouse, xserver-xorg-input-synaptics, xserver-xorg-input-wacom"
+XSERVER_XORG_INPUT_DEPENDS="xserver-xorg-input-evdev, \
+ xserver-xorg-input-kbd, \
+ xserver-xorg-input-mouse, \
+ xserver-xorg-input-synaptics, \
+ xserver-xorg-input-wacom"
diff --git a/debian/scripts/vars.amd64 b/debian/scripts/vars.amd64
index c77afd4..0bc7ef7 100755
--- a/debian/scripts/vars.amd64
+++ b/debian/scripts/vars.amd64
@@ -3,9 +3,41 @@
#
# 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-ati, xserver-xorg-video-chips, xserver-xorg-video-cirrus, xserver-xorg-video-cyrix, xserver-xorg-video-fbdev, xserver-xorg-video-i128, xserver-xorg-video-intel | xserver-xorg-video-i810, 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, 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-via, xserver-xorg-video-voodoo, xserver-xorg-video-v4l, xserver-xorg-video-vmware"
+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-cyrix, \
+ xserver-xorg-video-fbdev, \
+ xserver-xorg-video-i128, \
+ xserver-xorg-video-intel | xserver-xorg-video-i810, \
+ 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, \
+ 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-openchrome | xserver-xorg-video-via, \
+ xserver-xorg-video-voodoo, \
+ xserver-xorg-video-v4l, \
+ xserver-xorg-video-vmware"
-XSERVER_XORG_INPUT_DEPENDS="xserver-xorg-input-evdev, xserver-xorg-input-kbd, xserver-xorg-input-mouse, xserver-xorg-input-synaptics, xserver-xorg-input-wacom"
+XSERVER_XORG_INPUT_DEPENDS="xserver-xorg-input-evdev, \
+ xserver-xorg-input-kbd, \
+ xserver-xorg-input-mouse, \
+ xserver-xorg-input-synaptics, \
+ xserver-xorg-input-wacom"
XSERVER_XORG_DETECT_DEPENDS="dmidecode"
diff --git a/debian/scripts/vars.arm b/debian/scripts/vars.arm
index 9890b32..783440f 100755
--- a/debian/scripts/vars.arm
+++ b/debian/scripts/vars.arm
@@ -3,8 +3,40 @@
#
# 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-ati, xserver-xorg-video-chips, xserver-xorg-video-cirrus, xserver-xorg-video-cyrix, xserver-xorg-video-fbdev, xserver-xorg-video-i128, xserver-xorg-video-i740, xserver-xorg-video-imstt, xserver-xorg-video-mga, xserver-xorg-video-neomagic, 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, 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-via, xserver-xorg-video-voodoo, xserver-xorg-video-v4l"
+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-cyrix, \
+ xserver-xorg-video-fbdev, \
+ xserver-xorg-video-i128, \
+ xserver-xorg-video-i740, \
+ xserver-xorg-video-imstt, \
+ xserver-xorg-video-mga, \
+ 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, \
+ 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-v4l"
# xserver-xorg-video-glide,
-XSERVER_XORG_INPUT_DEPENDS="xserver-xorg-input-evdev, xserver-xorg-input-kbd, xserver-xorg-input-mouse, xserver-xorg-input-synaptics, xserver-xorg-input-wacom"
+XSERVER_XORG_INPUT_DEPENDS="xserver-xorg-input-evdev, \
+ xserver-xorg-input-kbd, \
+ xserver-xorg-input-mouse, \
+ xserver-xorg-input-synaptics, \
+ xserver-xorg-input-wacom"
diff --git a/debian/scripts/vars.armeb b/debian/scripts/vars.armeb
index 9890b32..783440f 100644
--- a/debian/scripts/vars.armeb
+++ b/debian/scripts/vars.armeb
@@ -3,8 +3,40 @@
#
# 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-ati, xserver-xorg-video-chips, xserver-xorg-video-cirrus, xserver-xorg-video-cyrix, xserver-xorg-video-fbdev, xserver-xorg-video-i128, xserver-xorg-video-i740, xserver-xorg-video-imstt, xserver-xorg-video-mga, xserver-xorg-video-neomagic, 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, 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-via, xserver-xorg-video-voodoo, xserver-xorg-video-v4l"
+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-cyrix, \
+ xserver-xorg-video-fbdev, \
+ xserver-xorg-video-i128, \
+ xserver-xorg-video-i740, \
+ xserver-xorg-video-imstt, \
+ xserver-xorg-video-mga, \
+ 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, \
+ 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-v4l"
# xserver-xorg-video-glide,
-XSERVER_XORG_INPUT_DEPENDS="xserver-xorg-input-evdev, xserver-xorg-input-kbd, xserver-xorg-input-mouse, xserver-xorg-input-synaptics, xserver-xorg-input-wacom"
+XSERVER_XORG_INPUT_DEPENDS="xserver-xorg-input-evdev, \
+ xserver-xorg-input-kbd, \
+ xserver-xorg-input-mouse, \
+ xserver-xorg-input-synaptics, \
+ xserver-xorg-input-wacom"
diff --git a/debian/scripts/vars.armel b/debian/scripts/vars.armel
index 9890b32..783440f 100644
--- a/debian/scripts/vars.armel
+++ b/debian/scripts/vars.armel
@@ -3,8 +3,40 @@
#
# 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-ati, xserver-xorg-video-chips, xserver-xorg-video-cirrus, xserver-xorg-video-cyrix, xserver-xorg-video-fbdev, xserver-xorg-video-i128, xserver-xorg-video-i740, xserver-xorg-video-imstt, xserver-xorg-video-mga, xserver-xorg-video-neomagic, 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, 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-via, xserver-xorg-video-voodoo, xserver-xorg-video-v4l"
+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-cyrix, \
+ xserver-xorg-video-fbdev, \
+ xserver-xorg-video-i128, \
+ xserver-xorg-video-i740, \
+ xserver-xorg-video-imstt, \
+ xserver-xorg-video-mga, \
+ 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, \
+ 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-v4l"
# xserver-xorg-video-glide,
-XSERVER_XORG_INPUT_DEPENDS="xserver-xorg-input-evdev, xserver-xorg-input-kbd, xserver-xorg-input-mouse, xserver-xorg-input-synaptics, xserver-xorg-input-wacom"
+XSERVER_XORG_INPUT_DEPENDS="xserver-xorg-input-evdev, \
+ xserver-xorg-input-kbd, \
+ xserver-xorg-input-mouse, \
+ xserver-xorg-input-synaptics, \
+ xserver-xorg-input-wacom"
diff --git a/debian/scripts/vars.hppa b/debian/scripts/vars.hppa
index 6d19f19..a1b1e1b 100755
--- a/debian/scripts/vars.hppa
+++ b/debian/scripts/vars.hppa
@@ -3,8 +3,25 @@
#
# 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-imstt, xserver-xorg-video-mga, xserver-xorg-video-nv, xserver-xorg-video-radeonhd, xserver-xorg-video-s3, xserver-xorg-video-s3virge, xserver-xorg-video-savage, xserver-xorg-video-sis, xserver-xorg-video-tdfx, xserver-xorg-video-trident, xserver-xorg-video-v4l"
+XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-ati, \
+ xserver-xorg-video-chips, \
+ xserver-xorg-video-fbdev, \
+ xserver-xorg-video-imstt, \
+ xserver-xorg-video-mga, \
+ xserver-xorg-video-nv, \
+ xserver-xorg-video-radeonhd, \
+ xserver-xorg-video-s3, \
+ xserver-xorg-video-s3virge, \
+ xserver-xorg-video-savage, \
+ xserver-xorg-video-sis, \
+ xserver-xorg-video-tdfx, \
+ xserver-xorg-video-trident, \
+ xserver-xorg-video-v4l"
-XSERVER_XORG_INPUT_DEPENDS="xserver-xorg-input-evdev, xserver-xorg-input-kbd, xserver-xorg-input-mouse, xserver-xorg-input-synaptics, xserver-xorg-input-wacom"
+XSERVER_XORG_INPUT_DEPENDS="xserver-xorg-input-evdev, \
+ xserver-xorg-input-kbd, \
+ xserver-xorg-input-mouse, \
+ xserver-xorg-input-synaptics, \
+ xserver-xorg-input-wacom"
XSERVER_XORG_DETECT_DEPENDS="fbset"
diff --git a/debian/scripts/vars.hurd-i386 b/debian/scripts/vars.hurd-i386
index ef01d76..0881ec2 100644
--- a/debian/scripts/vars.hurd-i386
+++ b/debian/scripts/vars.hurd-i386
@@ -3,6 +3,35 @@
# 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, server-xorg-video-ark, xserver-xorg-video-ati, xserver-xorg-video-chips, xserver-xorg-video-cirrus, xserver-xorg-video-cyrix, xserver-xorg-video-i128, xserver-xorg-video-i740, xserver-xorg-video-i810 | xserver-xorg-video-intel | xserver-xorg-video-i810-modesetting | xserver-xorg-video-intel-modesetting, xserver-xorg-video-imstt, xserver-xorg-video-mga, xserver-xorg-video-neomagic, 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, 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-via, xserver-xorg-video-voodoo"
+XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \
+ server-xorg-video-ark, \
+ xserver-xorg-video-ati, \
+ xserver-xorg-video-chips, \
+ xserver-xorg-video-cirrus, \
+ xserver-xorg-video-cyrix, \
+ xserver-xorg-video-i128, \
+ xserver-xorg-video-i740, \
+ xserver-xorg-video-i810 | xserver-xorg-video-intel | xserver-xorg-video-i810-modesetting | xserver-xorg-video-intel-modesetting, \
+ xserver-xorg-video-imstt, \
+ xserver-xorg-video-mga, \
+ 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, \
+ 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-openchrome | xserver-xorg-video-via, \
+ xserver-xorg-video-voodoo"
-XSERVER_XORG_INPUT_DEPENDS="xserver-xorg-input-kbd, xserver-xorg-input-mouse"
+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 c337655..42709f0 100755
--- a/debian/scripts/vars.i386
+++ b/debian/scripts/vars.i386
@@ -3,11 +3,46 @@
#
# 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-ati, xserver-xorg-video-chips, xserver-xorg-video-cirrus, xserver-xorg-video-cyrix, xserver-xorg-video-fbdev, xserver-xorg-video-i128, xserver-xorg-video-i740, xserver-xorg-video-intel | xserver-xorg-video-i810, xserver-xorg-video-imstt, xserver-xorg-video-mga, xserver-xorg-video-neomagic, 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, 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-via, xserver-xorg-video-voodoo, xserver-xorg-video-vmware, xserver-xorg-video-v4l"
+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-cyrix, \
+ xserver-xorg-video-fbdev, \
+ xserver-xorg-video-i128, \
+ xserver-xorg-video-i740, \
+ xserver-xorg-video-intel | xserver-xorg-video-i810, \
+ xserver-xorg-video-imstt, \
+ xserver-xorg-video-mga, \
+ 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, \
+ 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-openchrome | xserver-xorg-video-via, \
+ xserver-xorg-video-voodoo, \
+ xserver-xorg-video-vmware, \
+ xserver-xorg-video-v4l"
# xserver-xorg-video-glide,
-XSERVER_XORG_INPUT_DEPENDS="xserver-xorg-input-evdev, xserver-xorg-input-kbd, xserver-xorg-input-mouse, xserver-xorg-input-synaptics, xserver-xorg-input-wacom"
+XSERVER_XORG_INPUT_DEPENDS="xserver-xorg-input-evdev, \
+ xserver-xorg-input-kbd, \
+ xserver-xorg-input-mouse, \
+ xserver-xorg-input-synaptics, \
+ xserver-xorg-input-wacom"
XSERVER_XORG_DETECT_DEPENDS="dmidecode"
diff --git a/debian/scripts/vars.ia64 b/debian/scripts/vars.ia64
index fa3f560..07e34b2 100755
--- a/debian/scripts/vars.ia64
+++ b/debian/scripts/vars.ia64
@@ -3,9 +3,38 @@
#
# 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-ati, xserver-xorg-video-chips, xserver-xorg-video-cirrus, xserver-xorg-video-cyrix, xserver-xorg-video-fbdev, xserver-xorg-video-i128, xserver-xorg-video-i740, xserver-xorg-video-imstt, xserver-xorg-video-mga, 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, xserver-xorg-video-savage, xserver-xorg-video-siliconmotion, xserver-xorg-video-sis, xserver-xorg-video-tdfx, xserver-xorg-video-tga, xserver-xorg-video-trident, xserver-xorg-video-tseng, xserver-xorg-video-vesa, xserver-xorg-video-via, xserver-xorg-video-v4l"
+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-cyrix, \
+ xserver-xorg-video-fbdev, \
+ xserver-xorg-video-i128, \
+ xserver-xorg-video-i740, \
+ xserver-xorg-video-imstt, \
+ 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, \
+ xserver-xorg-video-savage, \
+ xserver-xorg-video-siliconmotion, \
+ xserver-xorg-video-sis, \
+ xserver-xorg-video-tdfx, \
+ xserver-xorg-video-tga, \
+ xserver-xorg-video-trident, \
+ xserver-xorg-video-tseng, \
+ xserver-xorg-video-vesa, \
+ xserver-xorg-video-v4l"
-XSERVER_XORG_INPUT_DEPENDS="xserver-xorg-input-evdev, xserver-xorg-input-kbd, xserver-xorg-input-mouse, xserver-xorg-input-synaptics, xserver-xorg-input-wacom"
+XSERVER_XORG_INPUT_DEPENDS="xserver-xorg-input-evdev, \
+ xserver-xorg-input-kbd, \
+ xserver-xorg-input-mouse, \
+ xserver-xorg-input-synaptics, \
+ xserver-xorg-input-wacom"
XSERVER_XORG_DETECT_DEPENDS="dmidecode"
diff --git a/debian/scripts/vars.kfreebsd-amd64 b/debian/scripts/vars.kfreebsd-amd64
index f4b0625..b261cda 100755
--- a/debian/scripts/vars.kfreebsd-amd64
+++ b/debian/scripts/vars.kfreebsd-amd64
@@ -3,7 +3,32 @@
#
# 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-ati, xserver-xorg-video-chips, xserver-xorg-video-cirrus, xserver-xorg-video-cyrix, xserver-xorg-video-i128, xserver-xorg-video-i810 | xserver-xorg-video-intel | xserver-xorg-video-i810-modesetting | xserver-xorg-video-intel-modesetting, 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, xserver-xorg-video-savage, xserver-xorg-video-siliconmotion, xserver-xorg-video-sis, xserver-xorg-video-tdfx, xserver-xorg-video-tga, xserver-xorg-video-trident, xserver-xorg-video-tseng, xserver-xorg-video-vesa, xserver-xorg-video-via, xserver-xorg-video-voodoo"
+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-cyrix, \
+ xserver-xorg-video-i128, \
+ xserver-xorg-video-i810 | xserver-xorg-video-intel | xserver-xorg-video-i810-modesetting | xserver-xorg-video-intel-modesetting, \
+ 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, \
+ xserver-xorg-video-savage, \
+ xserver-xorg-video-siliconmotion, \
+ xserver-xorg-video-sis, \
+ xserver-xorg-video-tdfx, \
+ xserver-xorg-video-tga, \
+ xserver-xorg-video-trident, \
+ xserver-xorg-video-tseng, \
+ xserver-xorg-video-vesa, \
+ xserver-xorg-video-openchrome | xserver-xorg-video-via, \
+ xserver-xorg-video-voodoo"
-XSERVER_XORG_INPUT_DEPENDS="xserver-xorg-input-kbd, xserver-xorg-input-mouse"
+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 e25f1ab..6de956a 100755
--- a/debian/scripts/vars.kfreebsd-i386
+++ b/debian/scripts/vars.kfreebsd-i386
@@ -3,8 +3,36 @@
#
# 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-ati, xserver-xorg-video-chips, xserver-xorg-video-cirrus, xserver-xorg-video-cyrix, xserver-xorg-video-i128, xserver-xorg-video-i740, xserver-xorg-video-i810 | xserver-xorg-video-intel | xserver-xorg-video-i810-modesetting | xserver-xorg-video-intel-modesetting, xserver-xorg-video-imstt, xserver-xorg-video-mga, xserver-xorg-video-neomagic, 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, xserver-xorg-video-savage, xserver-xorg-video-siliconmotion, xserver-xorg-video-sis, xserver-xorg-video-tdfx, xserver-xorg-video-tga, xserver-xorg-video-trident, xserver-xorg-video-tseng, xserver-xorg-video-vesa, xserver-xorg-video-via, xserver-xorg-video-voodoo"
+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-cyrix, \
+ xserver-xorg-video-i128, \
+ xserver-xorg-video-i740, \
+ xserver-xorg-video-i810 | xserver-xorg-video-intel | xserver-xorg-video-i810-modesetting | xserver-xorg-video-intel-modesetting, \
+ xserver-xorg-video-imstt, \
+ xserver-xorg-video-mga, \
+ 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, \
+ xserver-xorg-video-savage, \
+ xserver-xorg-video-siliconmotion, \
+ xserver-xorg-video-sis, \
+ xserver-xorg-video-tdfx, \
+ xserver-xorg-video-tga, \
+ xserver-xorg-video-trident, \
+ xserver-xorg-video-tseng, \
+ xserver-xorg-video-vesa, \
+ xserver-xorg-video-openchrome | xserver-xorg-video-via, \
+ xserver-xorg-video-voodoo"
# xserver-xorg-video-glide,
-XSERVER_XORG_INPUT_DEPENDS="xserver-xorg-input-kbd, xserver-xorg-input-mouse"
+XSERVER_XORG_INPUT_DEPENDS="xserver-xorg-input-kbd, \
+ xserver-xorg-input-mouse"
diff --git a/debian/scripts/vars.m32r b/debian/scripts/vars.m32r
index 9890b32..783440f 100755
--- a/debian/scripts/vars.m32r
+++ b/debian/scripts/vars.m32r
@@ -3,8 +3,40 @@
#
# 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-ati, xserver-xorg-video-chips, xserver-xorg-video-cirrus, xserver-xorg-video-cyrix, xserver-xorg-video-fbdev, xserver-xorg-video-i128, xserver-xorg-video-i740, xserver-xorg-video-imstt, xserver-xorg-video-mga, xserver-xorg-video-neomagic, 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, 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-via, xserver-xorg-video-voodoo, xserver-xorg-video-v4l"
+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-cyrix, \
+ xserver-xorg-video-fbdev, \
+ xserver-xorg-video-i128, \
+ xserver-xorg-video-i740, \
+ xserver-xorg-video-imstt, \
+ xserver-xorg-video-mga, \
+ 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, \
+ 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-v4l"
# xserver-xorg-video-glide,
-XSERVER_XORG_INPUT_DEPENDS="xserver-xorg-input-evdev, xserver-xorg-input-kbd, xserver-xorg-input-mouse, xserver-xorg-input-synaptics, xserver-xorg-input-wacom"
+XSERVER_XORG_INPUT_DEPENDS="xserver-xorg-input-evdev, \
+ xserver-xorg-input-kbd, \
+ xserver-xorg-input-mouse, \
+ xserver-xorg-input-synaptics, \
+ xserver-xorg-input-wacom"
diff --git a/debian/scripts/vars.m68k b/debian/scripts/vars.m68k
index 3938176..c1d2533 100755
--- a/debian/scripts/vars.m68k
+++ b/debian/scripts/vars.m68k
@@ -3,9 +3,40 @@
#
# 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-ati, xserver-xorg-video-chips, xserver-xorg-video-cirrus, xserver-xorg-video-cyrix, xserver-xorg-video-fbdev, xserver-xorg-video-i128, xserver-xorg-video-i740, xserver-xorg-video-imstt, xserver-xorg-video-mga, xserver-xorg-video-neomagic, 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, 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-via, xserver-xorg-video-voodoo, xserver-xorg-video-v4l"
+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-cyrix, \
+ xserver-xorg-video-fbdev, \
+ xserver-xorg-video-i128, \
+ xserver-xorg-video-i740, \
+ xserver-xorg-video-imstt, \
+ xserver-xorg-video-mga, \
+ 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, \
+ 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-v4l"
# xserver-xorg-video-glide,
-XSERVER_XORG_INPUT_DEPENDS="xserver-xorg-input-evdev, xserver-xorg-input-kbd, xserver-xorg-input-mouse, xserver-xorg-input-synaptics"
+XSERVER_XORG_INPUT_DEPENDS="xserver-xorg-input-evdev, \
+ xserver-xorg-input-kbd, \
+ xserver-xorg-input-mouse, \
+ xserver-xorg-input-synaptics"
# xserver-xorg-input-wacom
diff --git a/debian/scripts/vars.mips b/debian/scripts/vars.mips
index 5e6cabd..5279dee 100755
--- a/debian/scripts/vars.mips
+++ b/debian/scripts/vars.mips
@@ -3,8 +3,41 @@
#
# 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-ati, xserver-xorg-video-chips, xserver-xorg-video-cirrus, xserver-xorg-video-cyrix, xserver-xorg-video-fbdev, xserver-xorg-video-i128, xserver-xorg-video-i740, xserver-xorg-video-imstt, xserver-xorg-video-mga, xserver-xorg-video-neomagic, 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, 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-via, xserver-xorg-video-voodoo, xserver-xorg-video-v4l"
+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-cyrix, \
+ xserver-xorg-video-fbdev, \
+ xserver-xorg-video-i128, \
+ xserver-xorg-video-i740, \
+ xserver-xorg-video-imstt, \
+ xserver-xorg-video-mga, \
+ xserver-xorg-video-neomagic, \
+ 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, \
+ 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-v4l"
# xserver-xorg-video-glide
-XSERVER_XORG_INPUT_DEPENDS="xserver-xorg-input-evdev, xserver-xorg-input-kbd, xserver-xorg-input-mouse, xserver-xorg-input-synaptics, xserver-xorg-input-wacom"
+XSERVER_XORG_INPUT_DEPENDS="xserver-xorg-input-evdev, \
+ xserver-xorg-input-kbd, \
+ xserver-xorg-input-mouse, \
+ xserver-xorg-input-synaptics, \
+ xserver-xorg-input-wacom"
diff --git a/debian/scripts/vars.mipsel b/debian/scripts/vars.mipsel
index 9890b32..783440f 100755
--- a/debian/scripts/vars.mipsel
+++ b/debian/scripts/vars.mipsel
@@ -3,8 +3,40 @@
#
# 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-ati, xserver-xorg-video-chips, xserver-xorg-video-cirrus, xserver-xorg-video-cyrix, xserver-xorg-video-fbdev, xserver-xorg-video-i128, xserver-xorg-video-i740, xserver-xorg-video-imstt, xserver-xorg-video-mga, xserver-xorg-video-neomagic, 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, 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-via, xserver-xorg-video-voodoo, xserver-xorg-video-v4l"
+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-cyrix, \
+ xserver-xorg-video-fbdev, \
+ xserver-xorg-video-i128, \
+ xserver-xorg-video-i740, \
+ xserver-xorg-video-imstt, \
+ xserver-xorg-video-mga, \
+ 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, \
+ 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-v4l"
# xserver-xorg-video-glide,
-XSERVER_XORG_INPUT_DEPENDS="xserver-xorg-input-evdev, xserver-xorg-input-kbd, xserver-xorg-input-mouse, xserver-xorg-input-synaptics, xserver-xorg-input-wacom"
+XSERVER_XORG_INPUT_DEPENDS="xserver-xorg-input-evdev, \
+ xserver-xorg-input-kbd, \
+ xserver-xorg-input-mouse, \
+ xserver-xorg-input-synaptics, \
+ xserver-xorg-input-wacom"
diff --git a/debian/scripts/vars.powerpc b/debian/scripts/vars.powerpc
index e6d7df3..b4f481a 100755
--- a/debian/scripts/vars.powerpc
+++ b/debian/scripts/vars.powerpc
@@ -3,6 +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-ati, xserver-xorg-video-chips, xserver-xorg-video-fbdev, xserver-xorg-video-imstt, xserver-xorg-video-mga, xserver-xorg-video-nv, xserver-xorg-video-radeonhd, xserver-xorg-video-s3, xserver-xorg-video-s3virge, xserver-xorg-video-savage, xserver-xorg-video-sis, xserver-xorg-video-sisusb, xserver-xorg-video-tdfx, xserver-xorg-video-trident, xserver-xorg-video-v4l"
+XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-ati, \
+ xserver-xorg-video-chips, \
+ xserver-xorg-video-fbdev, \
+ xserver-xorg-video-imstt, \
+ xserver-xorg-video-mga, \
+ xserver-xorg-video-nv, \
+ xserver-xorg-video-radeonhd, \
+ xserver-xorg-video-s3, \
+ xserver-xorg-video-s3virge, \
+ xserver-xorg-video-savage, \
+ xserver-xorg-video-sis, \
+ xserver-xorg-video-sisusb, \
+ xserver-xorg-video-tdfx, \
+ xserver-xorg-video-trident, \
+ xserver-xorg-video-v4l"
-XSERVER_XORG_INPUT_DEPENDS="xserver-xorg-input-evdev, xserver-xorg-input-kbd, xserver-xorg-input-mouse, xserver-xorg-input-synaptics, xserver-xorg-input-wacom"
+XSERVER_XORG_INPUT_DEPENDS="xserver-xorg-input-evdev, \
+ xserver-xorg-input-kbd, \
+ xserver-xorg-input-mouse, \
+ xserver-xorg-input-synaptics, \
+ xserver-xorg-input-wacom"
diff --git a/debian/scripts/vars.ppc64 b/debian/scripts/vars.ppc64
index af9ebe7..c6907ce 100755
--- a/debian/scripts/vars.ppc64
+++ b/debian/scripts/vars.ppc64
@@ -3,11 +3,28 @@
#
# 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-imstt, xserver-xorg-video-mga, xserver-xorg-video-nv, xserver-xorg-video-radeonhd, xserver-xorg-video-s3, xserver-xorg-video-s3virge, xserver-xorg-video-savage, xserver-xorg-video-sis, xserver-xorg-video-sisusb, xserver-xorg-video-tdfx, xserver-xorg-video-trident"
+XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-ati, \
+ xserver-xorg-video-chips, \
+ xserver-xorg-video-fbdev, \
+ xserver-xorg-video-imstt, \
+ xserver-xorg-video-mga, \
+ xserver-xorg-video-nv, \
+ xserver-xorg-video-radeonhd, \
+ xserver-xorg-video-s3, \
+ xserver-xorg-video-s3virge, \
+ xserver-xorg-video-savage, \
+ xserver-xorg-video-sis, \
+ xserver-xorg-video-sisusb, \
+ xserver-xorg-video-tdfx, \
+ xserver-xorg-video-trident"
-# xserver-xorg-video-v4l,
+# xserver-xorg-video-v4l, \
+
-XSERVER_XORG_INPUT_DEPENDS="xserver-xorg-input-evdev, xserver-xorg-input-kbd, xserver-xorg-input-mouse, xserver-xorg-input-synaptics"
+XSERVER_XORG_INPUT_DEPENDS="xserver-xorg-input-evdev, \
+ xserver-xorg-input-kbd, \
+ xserver-xorg-input-mouse, \
+ xserver-xorg-input-synaptics"
# , xserver-xorg-input-wacom
@@ -15,7 +32,12 @@ XSERVER_XORG_INPUT_DEPENDS="xserver-xorg-input-evdev, xserver-xorg-input-kbd, xs
#
# This file gets included by both debian/rules (make) AND the scripts in
# debian/scripts (Bourne shell).
-XWSC_SPECIAL_DEPENDS="xserver-xorg, xlibmesa-dri, "
-XWSD_SPECIAL_DEPENDS="xlibosmesa4-dbg, xlibosmesa-dev, "
-XLIBMESA_GL_SPECIAL_DEPENDS="xlibmesa-dri, "
+XWSC_SPECIAL_DEPENDS="xserver-xorg, \
+ xlibmesa-dri, \
+ "
+XWSD_SPECIAL_DEPENDS="xlibosmesa4-dbg, \
+ xlibosmesa-dev, \
+ "
+XLIBMESA_GL_SPECIAL_DEPENDS="xlibmesa-dri, \
+ "
diff --git a/debian/scripts/vars.sh4 b/debian/scripts/vars.sh4
index 3bcc94e..82d6a7d 100644
--- a/debian/scripts/vars.sh4
+++ b/debian/scripts/vars.sh4
@@ -3,8 +3,43 @@
#
# 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-ati, xserver-xorg-video-chips, xserver-xorg-video-cirrus, xserver-xorg-video-cyrix, xserver-xorg-video-dummy, xserver-xorg-video-fbdev, xserver-xorg-video-glint, xserver-xorg-video-i128, xserver-xorg-video-i740, xserver-xorg-video-imstt, xserver-xorg-video-mga, 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, 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-vga, xserver-xorg-video-voodoo, xserver-xorg-video-v4l"
+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-cyrix, \
+ xserver-xorg-video-dummy, \
+ xserver-xorg-video-fbdev, \
+ xserver-xorg-video-glint, \
+ xserver-xorg-video-i128, \
+ xserver-xorg-video-i740, \
+ xserver-xorg-video-imstt, \
+ xserver-xorg-video-mga, \
+ 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, \
+ 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-vga, \
+ xserver-xorg-video-voodoo, \
+ xserver-xorg-video-v4l"
# xserver-xorg-video-glide,
-XSERVER_XORG_INPUT_DEPENDS="xserver-xorg-input-evdev, xserver-xorg-input-kbd, xserver-xorg-input-mouse, xserver-xorg-input-synaptics, xserver-xorg-input-wacom"
+XSERVER_XORG_INPUT_DEPENDS="xserver-xorg-input-evdev, \
+ xserver-xorg-input-kbd, \
+ xserver-xorg-input-mouse, \
+ xserver-xorg-input-synaptics, \
+ xserver-xorg-input-wacom"
diff --git a/debian/scripts/vars.sparc b/debian/scripts/vars.sparc
index cbcd9bb..8090a49 100755
--- a/debian/scripts/vars.sparc
+++ b/debian/scripts/vars.sparc
@@ -3,6 +3,37 @@
#
# 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-ati, xserver-xorg-video-chips, xserver-xorg-video-cirrus, xserver-xorg-video-fbdev, xserver-xorg-video-i128, xserver-xorg-video-i740, xserver-xorg-video-imstt, 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, xserver-xorg-video-siliconmotion, xserver-xorg-video-sunbw2, 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, xserver-xorg-video-v4l"
+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, \
+ xserver-xorg-video-i740, \
+ xserver-xorg-video-imstt, \
+ 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, \
+ xserver-xorg-video-siliconmotion, \
+ xserver-xorg-video-sunbw2, \
+ 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, \
+ xserver-xorg-video-v4l"
-XSERVER_XORG_INPUT_DEPENDS="xserver-xorg-input-evdev, xserver-xorg-input-kbd, xserver-xorg-input-mouse, xserver-xorg-input-synaptics, xserver-xorg-input-wacom"
+XSERVER_XORG_INPUT_DEPENDS="xserver-xorg-input-evdev, \
+ xserver-xorg-input-kbd, \
+ xserver-xorg-input-mouse, \
+ xserver-xorg-input-synaptics, \
+ xserver-xorg-input-wacom"
commit 817d32ea81bd58eb1681913f117d7780c988a03d
Author: Christian Perrier <bubulle@debian.org>
Date: Mon Jun 30 08:47:27 2008 +0200
Dzongkha translation. Sent directly by the translator
diff --git a/debian/changelog b/debian/changelog
index 897d24f..23a927d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ xorg (1:7.3+13) UNRELEASED; urgency=low
* Malayalam. Closes: #486830
* Italian. Closes: #487877
* Swedish. Closes: #488550
+ * Dzongkha.
[ Brice Goglin ]
* Remove obsolete xserver-xorg startup links, closes: #487453.
diff --git a/debian/po/dz.po b/debian/po/dz.po
index f76ed76..1287b3f 100644
--- a/debian/po/dz.po
+++ b/debian/po/dz.po
@@ -16,14 +16,13 @@ msgstr ""
"Project-Id-Version: xorg.pot\n"
"Report-Msgid-Bugs-To: xorg@packages.debian.org\n"
"POT-Creation-Date: 2008-06-08 22:20+0200\n"
-"PO-Revision-Date: 2006-09-17 22:58+0530\n"
-"Last-Translator: Jurmey Rabgay <jur_gay@yahoo.com>\n"
+"PO-Revision-Date: 2008-06-30 09:48+0530\n"
+"Last-Translator: Jurmey Rabgay(Bongop) (DIT,BHUTAN) <jur_gay@yahoo.co.uk>\n"
"Language-Team: dzongkha <pgeyleg@dit.gov.bt>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2;plural=(n!=1)\n"
-"X-Poedit-Language: dzongkha\n"
"X-Poedit-Country: bhutan\n"
"X-Poedit-SourceCharset: utf-8\n"
"X-Poedit-Bookmarks: -1,-1,-1,95,-1,-1,-1,-1,-1,-1\n"
@@ -165,11 +164,8 @@ msgstr ""
#. Type: string
#. Description
#: ../xserver-xorg.templates:6001
-#, fuzzy
-#| msgid ""
-#| "Users of U.S. English keyboards should generally leave this entry blank."
msgid "Users of most keyboards should enter \"xorg\"."
-msgstr "ཡུ་ཨེསི་ཨིང་ལིཤ་ལྡེ་སྒྲོམ་གྱི་ལག་ལེན་པ་ཚུ་གིས་ ཐོ་འགོད་སྟོངམ་འདི་མང་ཆེ་བ་སྦེ་བཞག་དགོ"
+msgstr "ལག་ལེན་པ་ཚུ་གིས་ ལྡེ་སྒྲོམ་མང་ཤོས་ཅིག་ནང་ \"xorg\" འདི་ བཙུགས་དགོ།"
#. Type: string
#. Description
@@ -208,23 +204,6 @@ msgstr ""
#. Type: string
#. Description
#: ../xserver-xorg.templates:7001
-#, fuzzy
-#| msgid ""
-#| " With the \"xorg\" rule set:\n"
-#| " - pc101: traditional IBM PC/AT style keyboard with 101 keys, common in\n"
-#| " the United States. Has no \"logo\" or \"menu\" keys;\n"
-#| " - pc104: similar to pc101 model, with additional keys, usually engraved\n"
-#| " with a \"logo\" symbol and a \"menu\" symbol;\n"
-#| " - pc102: similar to pc101 and often found in Europe. Includes a \"< >\" "
-#| "key;\n"
-#| " - pc105: similar to pc104 and often found in Europe. Includes a \"< >\" "
-#| "key;\n"
-#| " - macintosh: Macintosh keyboards using the new input layer with Linux\n"
-#| " keycodes;\n"
-#| " - macintosh_old: Macintosh keyboards not using the new input layer.\n"
-#| " With the \"sun\" rule set:\n"
-#| " - type4: Sun Type4 keyboards;\n"
-#| " - type5: Sun Type5 keyboards."
msgid ""
" With the \"xorg\" rule set:\n"
" - pc101: traditional IBM PC/AT style keyboard with 101 keys, common in\n"
@@ -255,7 +234,6 @@ msgstr ""
" - མེཀ་ཨིན་ཏོཤ་: མེཀ་ཨིན་ཏོཤ་གིས་ ལི་ནགསི་\n"
"ལྡེ་ཨང་དང་གཅིག་ཁར་ ཨིན་པུཊི་བང་རིམ་གསརཔ་ ལག་ལེན་འཐབ་པའི་བསྒང་\n"
" - མེཀ་ཨིན་ཏོཤ་རྙིངམ་: མེཀ་ཨིན་ཏོཤ་ལྡེ་སྒྲོམ་ཚུ་གིས་ ཨིན་པུཊི་བང་རིམ་གསརཔ་ ལག་ལེན་འཐབ་ནི་མིན་འདུག\n"
Reply to: