xorg: Changes to 'ubuntu'
debian/changelog | 3 ++-
debian/scripts/vars.alpha | 1 -
debian/scripts/vars.arm | 1 -
debian/scripts/vars.armeb | 1 -
debian/scripts/vars.armel | 1 -
debian/scripts/vars.hppa | 1 -
debian/scripts/vars.i386 | 2 +-
debian/scripts/vars.ia64 | 1 -
debian/scripts/vars.powerpc | 1 -
debian/scripts/vars.ppc64 | 3 +--
10 files changed, 4 insertions(+), 11 deletions(-)
New commits:
commit 9a31359bd4ec61acedb056f2a79118345ec71d74
Author: Timo Aaltonen <tjaalton@cc.hut.fi>
Date: Wed Sep 16 11:18:14 2009 +0300
Drop vmmouse from other than amd64, i386, lpia.
The other architectures don't have vmware.
diff --git a/debian/changelog b/debian/changelog
index 2cfb905..fe869b6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,11 @@
xorg (1:7.4+3ubuntu6) karmic; urgency=low
+ [ Bryce Harrington ]
* vars.*: Add explicit dependency on xserver-xorg-input-vmmouse to
ensure it stays in main.
(LP: #407816)
- -- Bryce Harrington <bryce@ubuntu.com> Mon, 03 Aug 2009 07:50:23 -0700
+ -- Timo Aaltonen <tjaalton@ubuntu.com> Wed, 16 Sep 2009 11:13:53 +0300
xorg (1:7.4+3ubuntu5) karmic; urgency=low
diff --git a/debian/scripts/vars.alpha b/debian/scripts/vars.alpha
index c9c858f..7198581 100755
--- a/debian/scripts/vars.alpha
+++ b/debian/scripts/vars.alpha
@@ -33,5 +33,4 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \
XSERVER_XORG_INPUT_DEPENDS="xserver-xorg-input-evdev, \
xserver-xorg-input-synaptics, \
- xserver-xorg-input-vmmouse, \
xserver-xorg-input-wacom"
diff --git a/debian/scripts/vars.arm b/debian/scripts/vars.arm
index 94ceae5..52277a8 100755
--- a/debian/scripts/vars.arm
+++ b/debian/scripts/vars.arm
@@ -32,5 +32,4 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \
XSERVER_XORG_INPUT_DEPENDS="xserver-xorg-input-evdev, \
xserver-xorg-input-synaptics, \
- xserver-xorg-input-vmmouse, \
xserver-xorg-input-wacom"
diff --git a/debian/scripts/vars.armeb b/debian/scripts/vars.armeb
index 94ceae5..52277a8 100644
--- a/debian/scripts/vars.armeb
+++ b/debian/scripts/vars.armeb
@@ -32,5 +32,4 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \
XSERVER_XORG_INPUT_DEPENDS="xserver-xorg-input-evdev, \
xserver-xorg-input-synaptics, \
- xserver-xorg-input-vmmouse, \
xserver-xorg-input-wacom"
diff --git a/debian/scripts/vars.armel b/debian/scripts/vars.armel
index 94ceae5..52277a8 100644
--- a/debian/scripts/vars.armel
+++ b/debian/scripts/vars.armel
@@ -32,5 +32,4 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \
XSERVER_XORG_INPUT_DEPENDS="xserver-xorg-input-evdev, \
xserver-xorg-input-synaptics, \
- xserver-xorg-input-vmmouse, \
xserver-xorg-input-wacom"
diff --git a/debian/scripts/vars.hppa b/debian/scripts/vars.hppa
index e627284..ad2ae2c 100755
--- a/debian/scripts/vars.hppa
+++ b/debian/scripts/vars.hppa
@@ -18,5 +18,4 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-ati, \
XSERVER_XORG_INPUT_DEPENDS="xserver-xorg-input-evdev, \
xserver-xorg-input-synaptics, \
- xserver-xorg-input-vmmouse, \
xserver-xorg-input-wacom"
diff --git a/debian/scripts/vars.i386 b/debian/scripts/vars.i386
index 58c81b0..6355c64 100755
--- a/debian/scripts/vars.i386
+++ b/debian/scripts/vars.i386
@@ -36,5 +36,5 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \
XSERVER_XORG_INPUT_DEPENDS="xserver-xorg-input-evdev, \
xserver-xorg-input-synaptics, \
- xserver-xorg-input-vmmouse, \
+ xserver-xorg-input-vmmouse, \
xserver-xorg-input-wacom"
diff --git a/debian/scripts/vars.ia64 b/debian/scripts/vars.ia64
index 42ea5f6..462e67c 100755
--- a/debian/scripts/vars.ia64
+++ b/debian/scripts/vars.ia64
@@ -28,5 +28,4 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \
XSERVER_XORG_INPUT_DEPENDS="xserver-xorg-input-evdev, \
xserver-xorg-input-synaptics, \
- xserver-xorg-input-vmmouse, \
xserver-xorg-input-wacom"
diff --git a/debian/scripts/vars.powerpc b/debian/scripts/vars.powerpc
index a8ba7a5..a3513d7 100755
--- a/debian/scripts/vars.powerpc
+++ b/debian/scripts/vars.powerpc
@@ -19,5 +19,4 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-ati, \
XSERVER_XORG_INPUT_DEPENDS="xserver-xorg-input-evdev, \
xserver-xorg-input-synaptics, \
- xserver-xorg-input-vmmouse, \
xserver-xorg-input-wacom"
diff --git a/debian/scripts/vars.ppc64 b/debian/scripts/vars.ppc64
index b58b0ce..d331787 100755
--- a/debian/scripts/vars.ppc64
+++ b/debian/scripts/vars.ppc64
@@ -20,8 +20,7 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-ati, \
XSERVER_XORG_INPUT_DEPENDS="xserver-xorg-input-evdev, \
- xserver-xorg-input-synaptics,
- xserver-xorg-input-vmmouse"
+ xserver-xorg-input-synaptics"
# , xserver-xorg-input-wacom
Reply to: