xorg: Changes to 'debian-experimental'
debian/changelog | 4 ++++
debian/rules | 2 --
debian/scripts/vars | 15 ---------------
debian/scripts/vars.alpha | 2 --
debian/scripts/vars.amd64 | 2 --
debian/scripts/vars.arm | 2 --
debian/scripts/vars.armeb | 2 --
debian/scripts/vars.armel | 2 --
debian/scripts/vars.hppa | 2 --
debian/scripts/vars.i386 | 2 --
debian/scripts/vars.ia64 | 2 --
debian/scripts/vars.m32r | 2 --
debian/scripts/vars.m68k | 2 --
debian/scripts/vars.mips | 2 --
debian/scripts/vars.mipsel | 2 --
debian/scripts/vars.powerpc | 2 --
debian/scripts/vars.ppc64 | 2 --
debian/scripts/vars.s390 | 3 ---
debian/scripts/vars.sh4 | 2 --
debian/scripts/vars.sparc | 2 --
20 files changed, 4 insertions(+), 52 deletions(-)
New commits:
commit f559a6be53c343c6b0685019c9f282a07442cd2a
Author: Timo Aaltonen <tjaalton@cc.hut.fi>
Date: Sun Jan 25 21:38:19 2009 +0200
scripts/vars, rules: Remove scripts/vars, hasn't been used since it was split.
diff --git a/debian/changelog b/debian/changelog
index 152dc4b..db65547 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ xorg (1:7.4~6) UNRELEASED; urgency=low
support has been deleted from xserver 1.6.
* scripts/vars.*: Drop mouse & kbd from input-all except for non-Linux
archs.
+ * scripts/vars, rules: Remove scripts/vars, hasn't been used since
+ it was split.
-- Timo Aaltonen <tjaalton@ubuntu.com> Fri, 23 Jan 2009 14:53:45 +0200
diff --git a/debian/rules b/debian/rules
index 2bc22d5..b6595c8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -41,8 +41,6 @@ else
endif
endif
-# Read in important variables.
-#include debian/scripts/vars
# Read in architecture-specific variables of importance.
include debian/scripts/vars.$(ARCH)
diff --git a/debian/scripts/vars b/debian/scripts/vars
deleted file mode 100755
index 747eeea..0000000
--- a/debian/scripts/vars
+++ /dev/null
@@ -1,15 +0,0 @@
-
-# This file is NOT a shell script.
-#
-# This file gets included by both debian/rules (make) AND the scripts in
-# debian/scripts (Bourne shell).
-#
-# SOURCE_DIR is where to cd to, before unpacking the source.
-#
-# SOURCE_TREE is the combination of SOURCE_DIR and the dir that is embedded
-# into the X tarballs.
-#
-# STAMP_DIR is where to place all the 'stamp' files that allows
-# debian/rules to know when certain targets are done.
-
-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-evtouch, xserver-xorg-input-elographics"
commit 3a21cf58d1f4011130561f62f315f4b187b37d82
Author: Timo Aaltonen <tjaalton@cc.hut.fi>
Date: Sun Jan 25 21:32:40 2009 +0200
scripts/vars.*: Drop mouse & kbd from input-all except for non-Linux archs.
diff --git a/debian/changelog b/debian/changelog
index 7faa8b4..152dc4b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ xorg (1:7.4~6) UNRELEASED; urgency=low
* scripts/vars.sparc: Remove sunbw2 from video-all, since monochrome
support has been deleted from xserver 1.6.
+ * scripts/vars.*: Drop mouse & kbd from input-all except for non-Linux
+ archs.
-- Timo Aaltonen <tjaalton@ubuntu.com> Fri, 23 Jan 2009 14:53:45 +0200
diff --git a/debian/scripts/vars.alpha b/debian/scripts/vars.alpha
index 827b650..553b18a 100755
--- a/debian/scripts/vars.alpha
+++ b/debian/scripts/vars.alpha
@@ -33,7 +33,5 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \
# , 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"
diff --git a/debian/scripts/vars.amd64 b/debian/scripts/vars.amd64
index d545c0c..b5d11a9 100755
--- a/debian/scripts/vars.amd64
+++ b/debian/scripts/vars.amd64
@@ -33,8 +33,6 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \
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.arm b/debian/scripts/vars.arm
index 9b20629..e267434 100755
--- a/debian/scripts/vars.arm
+++ b/debian/scripts/vars.arm
@@ -32,7 +32,5 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \
# 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"
diff --git a/debian/scripts/vars.armeb b/debian/scripts/vars.armeb
index 9b20629..e267434 100644
--- a/debian/scripts/vars.armeb
+++ b/debian/scripts/vars.armeb
@@ -32,7 +32,5 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \
# 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"
diff --git a/debian/scripts/vars.armel b/debian/scripts/vars.armel
index 9b20629..e267434 100644
--- a/debian/scripts/vars.armel
+++ b/debian/scripts/vars.armel
@@ -32,7 +32,5 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \
# 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"
diff --git a/debian/scripts/vars.hppa b/debian/scripts/vars.hppa
index c5c86e2..e98103d 100755
--- a/debian/scripts/vars.hppa
+++ b/debian/scripts/vars.hppa
@@ -18,8 +18,6 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-ati, \
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"
diff --git a/debian/scripts/vars.i386 b/debian/scripts/vars.i386
index 4498933..56af7e0 100755
--- a/debian/scripts/vars.i386
+++ b/debian/scripts/vars.i386
@@ -35,8 +35,6 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \
# 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"
diff --git a/debian/scripts/vars.ia64 b/debian/scripts/vars.ia64
index 9738cba..327f885 100755
--- a/debian/scripts/vars.ia64
+++ b/debian/scripts/vars.ia64
@@ -28,8 +28,6 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \
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"
diff --git a/debian/scripts/vars.m32r b/debian/scripts/vars.m32r
index 9b20629..e267434 100755
--- a/debian/scripts/vars.m32r
+++ b/debian/scripts/vars.m32r
@@ -32,7 +32,5 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \
# 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"
diff --git a/debian/scripts/vars.m68k b/debian/scripts/vars.m68k
index 83bbb0c..72b2427 100755
--- a/debian/scripts/vars.m68k
+++ b/debian/scripts/vars.m68k
@@ -32,7 +32,5 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \
# 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
diff --git a/debian/scripts/vars.mips b/debian/scripts/vars.mips
index 8f4d8f5..8cd1d93 100755
--- a/debian/scripts/vars.mips
+++ b/debian/scripts/vars.mips
@@ -33,7 +33,5 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \
# 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"
diff --git a/debian/scripts/vars.mipsel b/debian/scripts/vars.mipsel
index 9b20629..e267434 100755
--- a/debian/scripts/vars.mipsel
+++ b/debian/scripts/vars.mipsel
@@ -32,7 +32,5 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \
# 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"
diff --git a/debian/scripts/vars.powerpc b/debian/scripts/vars.powerpc
index 2fdf370..70b88cd 100755
--- a/debian/scripts/vars.powerpc
+++ b/debian/scripts/vars.powerpc
@@ -19,7 +19,5 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-ati, \
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"
diff --git a/debian/scripts/vars.ppc64 b/debian/scripts/vars.ppc64
index 9e32a8b..f27e03c 100755
--- a/debian/scripts/vars.ppc64
+++ b/debian/scripts/vars.ppc64
@@ -21,8 +21,6 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-ati, \
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.s390 b/debian/scripts/vars.s390
index 12acec8..525866e 100755
--- a/debian/scripts/vars.s390
+++ b/debian/scripts/vars.s390
@@ -5,7 +5,4 @@
# debian/scripts (Bourne shell).
XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-dummy"
-# xserver-xorg-video-v4l, xserver-xorg-video-glide,
XSERVER_XORG_INPUT_DEPENDS="xserver-xorg-input-void"
-
-#"xserver-xorg-input-evdev, xserver-xorg-input-kbd, xserver-xorg-input-mouse, xserver-xorg-input-wacom, xserver-xorg-input-synaptics"
diff --git a/debian/scripts/vars.sh4 b/debian/scripts/vars.sh4
index 72af2d6..9c44a4a 100644
--- a/debian/scripts/vars.sh4
+++ b/debian/scripts/vars.sh4
@@ -35,7 +35,5 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \
# 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"
diff --git a/debian/scripts/vars.sparc b/debian/scripts/vars.sparc
index 4cc9627..9227c03 100755
--- a/debian/scripts/vars.sparc
+++ b/debian/scripts/vars.sparc
@@ -31,7 +31,5 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \
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"
Reply to: