xorg: Changes to 'debian-unstable'
debian/changelog | 2 ++
debian/scripts/vars.alpha | 2 +-
debian/scripts/vars.amd64 | 1 -
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 | 1 -
debian/scripts/vars.sh4 | 2 +-
debian/scripts/vars.sparc | 2 +-
17 files changed, 16 insertions(+), 16 deletions(-)
New commits:
commit ae44bbe841bcfd7166dbd4f8b8bd7b94a920c73f
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Apr 18 16:48:47 2010 +0200
Drop v4l from xserver-xorg-video-all.
It depends on the obsolete V4L1 API, see #569103.
diff --git a/debian/changelog b/debian/changelog
index 9d7aa9e..037b7c0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ xorg (1:7.5+6) UNRELEASED; urgency=low
* Drop radeonhd from xserver-xorg-video-all. We switched to kernel
modesetting for radeon, and that clashes with this driver.
+ * Drop v4l from xserver-xorg-video-all. It depends on the obsolete V4L1
+ API, see #569103.
-- Julien Cristau <jcristau@debian.org> Sat, 17 Apr 2010 17:27:16 +0200
diff --git a/debian/scripts/vars.alpha b/debian/scripts/vars.alpha
index 7198581..98949a3 100755
--- a/debian/scripts/vars.alpha
+++ b/debian/scripts/vars.alpha
@@ -27,7 +27,7 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \
xserver-xorg-video-tseng, \
xserver-xorg-video-vesa, \
xserver-xorg-video-voodoo, \
- xserver-xorg-video-v4l"
+"
# , xserver-xorg-video-glide,
diff --git a/debian/scripts/vars.amd64 b/debian/scripts/vars.amd64
index d1db431..2a5afad 100755
--- a/debian/scripts/vars.amd64
+++ b/debian/scripts/vars.amd64
@@ -27,7 +27,6 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \
xserver-xorg-video-vesa, \
xserver-xorg-video-openchrome, \
xserver-xorg-video-voodoo, \
- xserver-xorg-video-v4l, \
xserver-xorg-video-vmware"
diff --git a/debian/scripts/vars.arm b/debian/scripts/vars.arm
index 52277a8..c496170 100755
--- a/debian/scripts/vars.arm
+++ b/debian/scripts/vars.arm
@@ -26,7 +26,7 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \
xserver-xorg-video-tseng, \
xserver-xorg-video-vesa, \
xserver-xorg-video-voodoo, \
- xserver-xorg-video-v4l"
+"
# xserver-xorg-video-glide,
diff --git a/debian/scripts/vars.armeb b/debian/scripts/vars.armeb
index 52277a8..c496170 100644
--- a/debian/scripts/vars.armeb
+++ b/debian/scripts/vars.armeb
@@ -26,7 +26,7 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \
xserver-xorg-video-tseng, \
xserver-xorg-video-vesa, \
xserver-xorg-video-voodoo, \
- xserver-xorg-video-v4l"
+"
# xserver-xorg-video-glide,
diff --git a/debian/scripts/vars.armel b/debian/scripts/vars.armel
index 52277a8..c496170 100644
--- a/debian/scripts/vars.armel
+++ b/debian/scripts/vars.armel
@@ -26,7 +26,7 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \
xserver-xorg-video-tseng, \
xserver-xorg-video-vesa, \
xserver-xorg-video-voodoo, \
- xserver-xorg-video-v4l"
+"
# xserver-xorg-video-glide,
diff --git a/debian/scripts/vars.hppa b/debian/scripts/vars.hppa
index ad2ae2c..2b23472 100755
--- a/debian/scripts/vars.hppa
+++ b/debian/scripts/vars.hppa
@@ -14,7 +14,7 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-ati, \
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-synaptics, \
diff --git a/debian/scripts/vars.i386 b/debian/scripts/vars.i386
index 2e52268..eee1fae 100755
--- a/debian/scripts/vars.i386
+++ b/debian/scripts/vars.i386
@@ -29,7 +29,7 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \
xserver-xorg-video-openchrome, \
xserver-xorg-video-voodoo, \
xserver-xorg-video-vmware, \
- xserver-xorg-video-v4l"
+"
# xserver-xorg-video-glide,
diff --git a/debian/scripts/vars.ia64 b/debian/scripts/vars.ia64
index 462e67c..f9c0afd 100755
--- a/debian/scripts/vars.ia64
+++ b/debian/scripts/vars.ia64
@@ -24,7 +24,7 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \
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-synaptics, \
diff --git a/debian/scripts/vars.m32r b/debian/scripts/vars.m32r
index 52277a8..c496170 100755
--- a/debian/scripts/vars.m32r
+++ b/debian/scripts/vars.m32r
@@ -26,7 +26,7 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \
xserver-xorg-video-tseng, \
xserver-xorg-video-vesa, \
xserver-xorg-video-voodoo, \
- xserver-xorg-video-v4l"
+"
# xserver-xorg-video-glide,
diff --git a/debian/scripts/vars.m68k b/debian/scripts/vars.m68k
index 9b4df42..79a666c 100755
--- a/debian/scripts/vars.m68k
+++ b/debian/scripts/vars.m68k
@@ -26,7 +26,7 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \
xserver-xorg-video-tseng, \
xserver-xorg-video-vesa, \
xserver-xorg-video-voodoo, \
- xserver-xorg-video-v4l"
+"
# xserver-xorg-video-glide,
diff --git a/debian/scripts/vars.mips b/debian/scripts/vars.mips
index 38bdced..e24f058 100755
--- a/debian/scripts/vars.mips
+++ b/debian/scripts/vars.mips
@@ -27,7 +27,7 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \
xserver-xorg-video-tseng, \
xserver-xorg-video-vesa, \
xserver-xorg-video-voodoo, \
- xserver-xorg-video-v4l"
+"
# xserver-xorg-video-glide
diff --git a/debian/scripts/vars.mipsel b/debian/scripts/vars.mipsel
index 52277a8..c496170 100755
--- a/debian/scripts/vars.mipsel
+++ b/debian/scripts/vars.mipsel
@@ -26,7 +26,7 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \
xserver-xorg-video-tseng, \
xserver-xorg-video-vesa, \
xserver-xorg-video-voodoo, \
- xserver-xorg-video-v4l"
+"
# xserver-xorg-video-glide,
diff --git a/debian/scripts/vars.powerpc b/debian/scripts/vars.powerpc
index a3513d7..0de66db 100755
--- a/debian/scripts/vars.powerpc
+++ b/debian/scripts/vars.powerpc
@@ -15,7 +15,7 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-ati, \
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-synaptics, \
diff --git a/debian/scripts/vars.ppc64 b/debian/scripts/vars.ppc64
index d331787..20ac61d 100755
--- a/debian/scripts/vars.ppc64
+++ b/debian/scripts/vars.ppc64
@@ -16,7 +16,6 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-ati, \
xserver-xorg-video-tdfx, \
xserver-xorg-video-trident"
-# xserver-xorg-video-v4l, \
XSERVER_XORG_INPUT_DEPENDS="xserver-xorg-input-evdev, \
diff --git a/debian/scripts/vars.sh4 b/debian/scripts/vars.sh4
index dca8071..6ff75c2 100644
--- a/debian/scripts/vars.sh4
+++ b/debian/scripts/vars.sh4
@@ -29,7 +29,7 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \
xserver-xorg-video-vesa, \
xserver-xorg-video-vga, \
xserver-xorg-video-voodoo, \
- xserver-xorg-video-v4l"
+"
# xserver-xorg-video-glide,
diff --git a/debian/scripts/vars.sparc b/debian/scripts/vars.sparc
index 1e3f99a..5cb831a 100755
--- a/debian/scripts/vars.sparc
+++ b/debian/scripts/vars.sparc
@@ -27,7 +27,7 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \
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-synaptics, \
Reply to: