debian/changelog | 5 +++--
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 | 1 -
debian/scripts/vars.hurd-i386 | 2 --
debian/scripts/vars.i386 | 2 --
debian/scripts/vars.ia64 | 2 --
debian/scripts/vars.kfreebsd-amd64 | 1 -
debian/scripts/vars.kfreebsd-i386 | 2 --
debian/scripts/vars.lpia | 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 | 1 -
debian/scripts/vars.ppc64 | 1 -
debian/scripts/vars.sh4 | 2 --
debian/scripts/vars.sparc | 1 -
21 files changed, 3 insertions(+), 36 deletions(-)
New commits:
commit e485986b6f869a5ca03d14d3172061ee6098eac2
Author: Timo Aaltonen <[EMAIL PROTECTED]>
Date: Tue Jul 8 10:03:59 2008 +0300
vars.*: Drop cyrix, imstt from video-all. Deprecated upstream.
and release the package.
diff --git a/debian/changelog b/debian/changelog
index b867797..6ef909d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xorg (1:7.4~0ubuntu1) UNRELEASED; urgency=low
+xorg (1:7.4~0ubuntu1) intrepid; urgency=low
[ Bryce Harrington ]
* Merge from debian unstable, remaining changes:
@@ -63,8 +63,9 @@ xorg (1:7.4~0ubuntu1) UNRELEASED; urgency=low
* control:
- Drop x11-common Replaces on xrgb, since rgb.txt is obsolete with the
new xserver and thus not shipped anymore.
+ * vars.*: Drop cyrix, imstt from video-all. Deprecated upstream.
- -- Timo Aaltonen <[EMAIL PROTECTED]> Tue, 01 Jul 2008 22:12:29 +0300
+ -- Timo Aaltonen <[EMAIL PROTECTED]> Tue, 08 Jul 2008 10:03:15 +0300
xorg (1:7.4~1) UNRELEASED; urgency=low
diff --git a/debian/scripts/vars.alpha b/debian/scripts/vars.alpha
index 53a3938..4b0d6d6 100755
--- a/debian/scripts/vars.alpha
+++ b/debian/scripts/vars.alpha
@@ -8,11 +8,9 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \
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, \
diff --git a/debian/scripts/vars.amd64 b/debian/scripts/vars.amd64
index 84ba600..e65d1a3 100755
--- a/debian/scripts/vars.amd64
+++ b/debian/scripts/vars.amd64
@@ -8,7 +8,6 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \
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, \
diff --git a/debian/scripts/vars.arm b/debian/scripts/vars.arm
index 783440f..83b3aa5 100755
--- a/debian/scripts/vars.arm
+++ b/debian/scripts/vars.arm
@@ -8,11 +8,9 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \
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, \
diff --git a/debian/scripts/vars.armeb b/debian/scripts/vars.armeb
index 783440f..83b3aa5 100644
--- a/debian/scripts/vars.armeb
+++ b/debian/scripts/vars.armeb
@@ -8,11 +8,9 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \
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, \
diff --git a/debian/scripts/vars.armel b/debian/scripts/vars.armel
index 783440f..83b3aa5 100644
--- a/debian/scripts/vars.armel
+++ b/debian/scripts/vars.armel
@@ -8,11 +8,9 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \
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, \
diff --git a/debian/scripts/vars.hppa b/debian/scripts/vars.hppa
index a1b1e1b..c5c86e2 100755
--- a/debian/scripts/vars.hppa
+++ b/debian/scripts/vars.hppa
@@ -6,7 +6,6 @@
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, \
diff --git a/debian/scripts/vars.hurd-i386 b/debian/scripts/vars.hurd-i386
index 0881ec2..e5ef31e 100644
--- a/debian/scripts/vars.hurd-i386
+++ b/debian/scripts/vars.hurd-i386
@@ -8,11 +8,9 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \
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, \
diff --git a/debian/scripts/vars.i386 b/debian/scripts/vars.i386
index 006e5a9..610868f 100755
--- a/debian/scripts/vars.i386
+++ b/debian/scripts/vars.i386
@@ -8,13 +8,11 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \
xserver-xorg-video-ati, \
xserver-xorg-video-chips, \
xserver-xorg-video-cirrus, \
- xserver-xorg-video-cyrix, \
xserver-xorg-video-fbdev, \
xserver-xorg-video-geode, \
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, \
diff --git a/debian/scripts/vars.ia64 b/debian/scripts/vars.ia64
index 07e34b2..1d873df 100755
--- a/debian/scripts/vars.ia64
+++ b/debian/scripts/vars.ia64
@@ -8,11 +8,9 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \
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, \
diff --git a/debian/scripts/vars.kfreebsd-amd64
b/debian/scripts/vars.kfreebsd-amd64
index b261cda..bf5ebc1 100755
--- a/debian/scripts/vars.kfreebsd-amd64
+++ b/debian/scripts/vars.kfreebsd-amd64
@@ -8,7 +8,6 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \
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, \
diff --git a/debian/scripts/vars.kfreebsd-i386
b/debian/scripts/vars.kfreebsd-i386
index 6de956a..bb4d2bb 100755
--- a/debian/scripts/vars.kfreebsd-i386
+++ b/debian/scripts/vars.kfreebsd-i386
@@ -8,11 +8,9 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \
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, \
diff --git a/debian/scripts/vars.lpia b/debian/scripts/vars.lpia
index 006e5a9..610868f 100755
--- a/debian/scripts/vars.lpia
+++ b/debian/scripts/vars.lpia
@@ -8,13 +8,11 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \
xserver-xorg-video-ati, \
xserver-xorg-video-chips, \
xserver-xorg-video-cirrus, \
- xserver-xorg-video-cyrix, \
xserver-xorg-video-fbdev, \
xserver-xorg-video-geode, \
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, \
diff --git a/debian/scripts/vars.m32r b/debian/scripts/vars.m32r
index 783440f..83b3aa5 100755
--- a/debian/scripts/vars.m32r
+++ b/debian/scripts/vars.m32r
@@ -8,11 +8,9 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \
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, \
diff --git a/debian/scripts/vars.m68k b/debian/scripts/vars.m68k
index c1d2533..52b70ad 100755
--- a/debian/scripts/vars.m68k
+++ b/debian/scripts/vars.m68k
@@ -8,11 +8,9 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \
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, \
diff --git a/debian/scripts/vars.mips b/debian/scripts/vars.mips
index 5279dee..bdfea95 100755
--- a/debian/scripts/vars.mips
+++ b/debian/scripts/vars.mips
@@ -8,11 +8,9 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \
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, \
diff --git a/debian/scripts/vars.mipsel b/debian/scripts/vars.mipsel
index 783440f..83b3aa5 100755
--- a/debian/scripts/vars.mipsel
+++ b/debian/scripts/vars.mipsel
@@ -8,11 +8,9 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \
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, \
diff --git a/debian/scripts/vars.powerpc b/debian/scripts/vars.powerpc
index b4f481a..2fdf370 100755
--- a/debian/scripts/vars.powerpc
+++ b/debian/scripts/vars.powerpc
@@ -6,7 +6,6 @@
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, \
diff --git a/debian/scripts/vars.ppc64 b/debian/scripts/vars.ppc64
index c6907ce..9e32a8b 100755
--- a/debian/scripts/vars.ppc64
+++ b/debian/scripts/vars.ppc64
@@ -6,7 +6,6 @@
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, \
diff --git a/debian/scripts/vars.sh4 b/debian/scripts/vars.sh4
index 82d6a7d..9b9a88c 100644
--- a/debian/scripts/vars.sh4
+++ b/debian/scripts/vars.sh4
@@ -8,13 +8,11 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \
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, \
diff --git a/debian/scripts/vars.sparc b/debian/scripts/vars.sparc
index 8090a49..ee362f2 100755
--- a/debian/scripts/vars.sparc
+++ b/debian/scripts/vars.sparc
@@ -11,7 +11,6 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \
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, \
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
