Author: dnusinow
Date: 2006-04-17 12:30:57 -0400 (Mon, 17 Apr 2006)
New Revision: 1838
Modified:
trunk/debian/xorg/debian/changelog
trunk/debian/xorg/debian/rules
trunk/debian/xorg/debian/scripts/vars.alpha
trunk/debian/xorg/debian/scripts/vars.amd64
trunk/debian/xorg/debian/scripts/vars.arm
trunk/debian/xorg/debian/scripts/vars.hppa
trunk/debian/xorg/debian/scripts/vars.i386
trunk/debian/xorg/debian/scripts/vars.ia64
trunk/debian/xorg/debian/scripts/vars.m68k
trunk/debian/xorg/debian/scripts/vars.mips
trunk/debian/xorg/debian/scripts/vars.mipsel
trunk/debian/xorg/debian/scripts/vars.powerpc
trunk/debian/xorg/debian/scripts/vars.s390
trunk/debian/xorg/debian/scripts/vars.sparc
Log:
* Have xserver-xorg-input-all pull in synaptics driver on all arches that
it's set to build on. This required not loading the plain vars file in
debian/rules, and having the variable listing the input drivers moved to
the arch-specific vars files.
Modified: trunk/debian/xorg/debian/changelog
===================================================================
--- trunk/debian/xorg/debian/changelog 2006-04-17 16:16:19 UTC (rev 1837)
+++ trunk/debian/xorg/debian/changelog 2006-04-17 16:30:57 UTC (rev 1838)
@@ -15,8 +15,12 @@
and will be removed upon the release of etch.
* Make x11-common not depend on laptop-detect. This is now only recommended
by xserver-xorg. Thanks Marc Wilson. (closes: #363081)
+ * Have xserver-xorg-input-all pull in synaptics driver on all arches that
+ it's set to build on. This required not loading the plain vars file in
+ debian/rules, and having the variable listing the input drivers moved to
+ the arch-specific vars files.
- -- David Nusinow <[EMAIL PROTECTED]> Mon, 17 Apr 2006 11:59:39 -0400
+ -- David Nusinow <[EMAIL PROTECTED]> Mon, 17 Apr 2006 12:30:06 -0400
xorg (1:7.0.13) unstable; urgency=low
Modified: trunk/debian/xorg/debian/rules
===================================================================
--- trunk/debian/xorg/debian/rules 2006-04-17 16:16:19 UTC (rev 1837)
+++ trunk/debian/xorg/debian/rules 2006-04-17 16:30:57 UTC (rev 1838)
@@ -34,7 +34,7 @@
endif
# Read in important variables.
-include debian/scripts/vars
+#include debian/scripts/vars
# Read in architecture-specific variables of importance.
include debian/scripts/vars.$(ARCH)
Modified: trunk/debian/xorg/debian/scripts/vars.alpha
===================================================================
--- trunk/debian/xorg/debian/scripts/vars.alpha 2006-04-17 16:16:19 UTC (rev
1837)
+++ trunk/debian/xorg/debian/scripts/vars.alpha 2006-04-17 16:30:57 UTC (rev
1838)
@@ -6,3 +6,7 @@
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-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-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-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
Modified: trunk/debian/xorg/debian/scripts/vars.amd64
===================================================================
--- trunk/debian/xorg/debian/scripts/vars.amd64 2006-04-17 16:16:19 UTC (rev
1837)
+++ trunk/debian/xorg/debian/scripts/vars.amd64 2006-04-17 16:30:57 UTC (rev
1838)
@@ -6,3 +6,7 @@
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-i810,
xserver-xorg-video-mga, xserver-xorg-video-neomagic, xserver-xorg-video-nv,
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-vga"
# 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
Modified: trunk/debian/xorg/debian/scripts/vars.arm
===================================================================
--- trunk/debian/xorg/debian/scripts/vars.arm 2006-04-17 16:16:19 UTC (rev
1837)
+++ trunk/debian/xorg/debian/scripts/vars.arm 2006-04-17 16:30:57 UTC (rev
1838)
@@ -6,3 +6,7 @@
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-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-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-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
Modified: trunk/debian/xorg/debian/scripts/vars.hppa
===================================================================
--- trunk/debian/xorg/debian/scripts/vars.hppa 2006-04-17 16:16:19 UTC (rev
1837)
+++ trunk/debian/xorg/debian/scripts/vars.hppa 2006-04-17 16:30:57 UTC (rev
1838)
@@ -6,3 +6,7 @@
XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-ati, xserver-xorg-video-chips,
xserver-xorg-video-fbdev, xserver-xorg-video-glint, xserver-xorg-video-imstt,
xserver-xorg-video-mga, xserver-xorg-video-nv, 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-vga"
# 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
Modified: trunk/debian/xorg/debian/scripts/vars.i386
===================================================================
--- trunk/debian/xorg/debian/scripts/vars.i386 2006-04-17 16:16:19 UTC (rev
1837)
+++ trunk/debian/xorg/debian/scripts/vars.i386 2006-04-17 16:30:57 UTC (rev
1838)
@@ -6,3 +6,7 @@
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-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-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-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
Modified: trunk/debian/xorg/debian/scripts/vars.ia64
===================================================================
--- trunk/debian/xorg/debian/scripts/vars.ia64 2006-04-17 16:16:19 UTC (rev
1837)
+++ trunk/debian/xorg/debian/scripts/vars.ia64 2006-04-17 16:30:57 UTC (rev
1838)
@@ -6,3 +6,7 @@
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-newport, xserver-xorg-video-nv,
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-vga,
xserver-xorg-video-via, xserver-xorg-video-vmware"
# 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
Modified: trunk/debian/xorg/debian/scripts/vars.m68k
===================================================================
--- trunk/debian/xorg/debian/scripts/vars.m68k 2006-04-17 16:16:19 UTC (rev
1837)
+++ trunk/debian/xorg/debian/scripts/vars.m68k 2006-04-17 16:30:57 UTC (rev
1838)
@@ -6,3 +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-cyrix, xserver-xorg-video-dummy, xserver-xorg-video-fbdev,
xserver-xorg-video-glint, xserver-xorg-video-i128, xserver-xorg-video-i740,
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-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-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-wacom
Modified: trunk/debian/xorg/debian/scripts/vars.mips
===================================================================
--- trunk/debian/xorg/debian/scripts/vars.mips 2006-04-17 16:16:19 UTC (rev
1837)
+++ trunk/debian/xorg/debian/scripts/vars.mips 2006-04-17 16:30:57 UTC (rev
1838)
@@ -5,4 +5,7 @@
# 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-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-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-via, xserver-xorg-video-voodoo,
xserver-xorg-video-vmware"
-# xserver-xorg-video-v4l, xserver-xorg-video-glide,
+# 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
Modified: trunk/debian/xorg/debian/scripts/vars.mipsel
===================================================================
--- trunk/debian/xorg/debian/scripts/vars.mipsel 2006-04-17 16:16:19 UTC
(rev 1837)
+++ trunk/debian/xorg/debian/scripts/vars.mipsel 2006-04-17 16:30:57 UTC
(rev 1838)
@@ -6,3 +6,7 @@
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-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-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-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
Modified: trunk/debian/xorg/debian/scripts/vars.powerpc
===================================================================
--- trunk/debian/xorg/debian/scripts/vars.powerpc 2006-04-17 16:16:19 UTC
(rev 1837)
+++ trunk/debian/xorg/debian/scripts/vars.powerpc 2006-04-17 16:30:57 UTC
(rev 1838)
@@ -6,3 +6,7 @@
XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-ati, xserver-xorg-video-chips,
xserver-xorg-video-fbdev, xserver-xorg-video-glint, xserver-xorg-video-imstt,
xserver-xorg-video-mga, xserver-xorg-video-nv, 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-vga"
# 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
Modified: trunk/debian/xorg/debian/scripts/vars.s390
===================================================================
--- trunk/debian/xorg/debian/scripts/vars.s390 2006-04-17 16:16:19 UTC (rev
1837)
+++ trunk/debian/xorg/debian/scripts/vars.s390 2006-04-17 16:30:57 UTC (rev
1838)
@@ -6,3 +6,6 @@
XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-dummy"
# 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-wacom, xserver-xorg-input-synaptics"
Modified: trunk/debian/xorg/debian/scripts/vars.sparc
===================================================================
--- trunk/debian/xorg/debian/scripts/vars.sparc 2006-04-17 16:16:19 UTC (rev
1837)
+++ trunk/debian/xorg/debian/scripts/vars.sparc 2006-04-17 16:30:57 UTC (rev
1838)
@@ -5,3 +5,7 @@
# 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-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-newport, xserver-xorg-video-nv,
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-tga,
xserver-xorg-video-trident, xserver-xorg-video-vesa, xserver-xorg-video-vga,
xserver-xorg-video-vmware"
# 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
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
