xorg: Changes to 'ubuntu'
debian/changelog | 19 +++++++++++++++++++
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 | 6 +++---
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 | 3 ++-
debian/scripts/vars.ppc64 | 1 -
debian/scripts/vars.sh4 | 2 +-
debian/scripts/vars.sparc | 2 +-
debian/x11-common.init | 2 +-
18 files changed, 37 insertions(+), 19 deletions(-)
New commits:
commit 68339674792d4da1141b5551a57332cff4ce3f52
Author: Robert Hooker <sarvatt@ubuntu.com>
Date: Wed Jun 2 16:23:08 2010 -0400
Add changelog entry.
diff --git a/debian/changelog b/debian/changelog
index e7c3e37..14b45c6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xorg (1:7.5+6ubuntu1) UNRELEASED; urgency=low
+
+ * Merge from Debian unstable.
+
+ -- Robert Hooker <sarvatt@ubuntu.com> Wed, 02 Jun 2010 16:09:13 -0400
+
xorg (1:7.5+6) unstable; urgency=medium
* Drop radeonhd from xserver-xorg-video-all. We switched to kernel
commit 3ca3b8ef615191426cddd5fbbcf113d64996cf36
Author: Julien Cristau <jcristau@debian.org>
Date: Fri May 7 13:34:45 2010 +0200
Prepare changelog for upload
diff --git a/debian/changelog b/debian/changelog
index 0ce85c9..c9f1086 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xorg (1:7.5+6) UNRELEASED; urgency=low
+xorg (1:7.5+6) unstable; urgency=medium
* Drop radeonhd from xserver-xorg-video-all. We switched to kernel
modesetting for radeon, and that clashes with this driver.
@@ -9,7 +9,7 @@ xorg (1:7.5+6) UNRELEASED; urgency=low
* x11-common.init: don't include /usr/{s,}bin in PATH, since we only depend
on $local_fs [lintian].
- -- Julien Cristau <jcristau@debian.org> Sat, 17 Apr 2010 17:27:16 +0200
+ -- Julien Cristau <jcristau@debian.org> Fri, 07 May 2010 13:34:32 +0200
xorg (1:7.5+5) unstable; urgency=low
commit 813b1b03ce163596e5a612bc973a493a77bd28fb
Author: Julien Cristau <jcristau@debian.org>
Date: Fri May 7 13:34:10 2010 +0200
x11-common.init: don't include /usr/{s,}bin in PATH
We only depend on $local_fs. Silences lintian error.
diff --git a/debian/changelog b/debian/changelog
index 3933586..0ce85c9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ xorg (1:7.5+6) UNRELEASED; urgency=low
API, see #569103.
* Add nouveau to xserver-xorg-video-all on linux x86 and powerpc. Other
arches can be added later if needed.
+ * x11-common.init: don't include /usr/{s,}bin in PATH, since we only depend
+ on $local_fs [lintian].
-- Julien Cristau <jcristau@debian.org> Sat, 17 Apr 2010 17:27:16 +0200
diff --git a/debian/x11-common.init b/debian/x11-common.init
index b475699..34835ac 100644
--- a/debian/x11-common.init
+++ b/debian/x11-common.init
@@ -10,7 +10,7 @@
set -e
-PATH=/bin:/usr/bin:/sbin:/usr/sbin
+PATH=/bin:/sbin
SOCKET_DIR=/tmp/.X11-unix
ICE_DIR=/tmp/.ICE-unix
commit 162b805f6eafc30f1ccfa0ab809c53f03cc13608
Author: Julien Cristau <jcristau@debian.org>
Date: Fri May 7 13:20:56 2010 +0200
Add nouveau to xserver-xorg-video-all on linux x86 and powerpc.
Other arches can be added later if needed.
diff --git a/debian/changelog b/debian/changelog
index 037b7c0..3933586 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ xorg (1:7.5+6) UNRELEASED; urgency=low
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.
+ * Add nouveau to xserver-xorg-video-all on linux x86 and powerpc. Other
+ arches can be added later if needed.
-- Julien Cristau <jcristau@debian.org> Sat, 17 Apr 2010 17:27:16 +0200
diff --git a/debian/scripts/vars.amd64 b/debian/scripts/vars.amd64
index 2a5afad..1c59d2d 100755
--- a/debian/scripts/vars.amd64
+++ b/debian/scripts/vars.amd64
@@ -13,6 +13,7 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \
xserver-xorg-video-intel, \
xserver-xorg-video-mga, \
xserver-xorg-video-neomagic, \
+ xserver-xorg-video-nouveau, \
xserver-xorg-video-nv, \
xserver-xorg-video-rendition, \
xserver-xorg-video-s3, \
diff --git a/debian/scripts/vars.i386 b/debian/scripts/vars.i386
index eee1fae..6258683 100755
--- a/debian/scripts/vars.i386
+++ b/debian/scripts/vars.i386
@@ -14,6 +14,7 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \
xserver-xorg-video-intel, \
xserver-xorg-video-mga, \
xserver-xorg-video-neomagic, \
+ xserver-xorg-video-nouveau, \
xserver-xorg-video-nv, \
xserver-xorg-video-rendition, \
xserver-xorg-video-s3, \
diff --git a/debian/scripts/vars.powerpc b/debian/scripts/vars.powerpc
index 0de66db..054a26a 100755
--- a/debian/scripts/vars.powerpc
+++ b/debian/scripts/vars.powerpc
@@ -7,6 +7,7 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-ati, \
xserver-xorg-video-chips, \
xserver-xorg-video-fbdev, \
xserver-xorg-video-mga, \
+ xserver-xorg-video-nouveau, \
xserver-xorg-video-nv, \
xserver-xorg-video-s3, \
xserver-xorg-video-s3virge, \
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, \
commit 3457d61c33c2883c6d18fdf0efac0cf6d251e038
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Apr 17 17:28:00 2010 +0200
Drop radeonhd from xserver-xorg-video-all.
We switched to kernel modesetting for radeon, and that clashes with this
driver.
diff --git a/debian/changelog b/debian/changelog
index 54fab9e..9d7aa9e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+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.
+
+ -- Julien Cristau <jcristau@debian.org> Sat, 17 Apr 2010 17:27:16 +0200
+
xorg (1:7.5+5) unstable; urgency=low
* Fix typo in Xsession.d/50x11-common_determine-startup, closes: #573899.
diff --git a/debian/scripts/vars.alpha b/debian/scripts/vars.alpha
index 553b18a..7198581 100755
--- a/debian/scripts/vars.alpha
+++ b/debian/scripts/vars.alpha
@@ -14,7 +14,6 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \
xserver-xorg-video-mga, \
xserver-xorg-video-neomagic, \
xserver-xorg-video-nv, \
- xserver-xorg-video-radeonhd, \
xserver-xorg-video-rendition, \
xserver-xorg-video-s3, \
xserver-xorg-video-s3virge, \
diff --git a/debian/scripts/vars.amd64 b/debian/scripts/vars.amd64
index e14e7f1..d1db431 100755
--- a/debian/scripts/vars.amd64
+++ b/debian/scripts/vars.amd64
@@ -14,7 +14,6 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \
xserver-xorg-video-mga, \
xserver-xorg-video-neomagic, \
xserver-xorg-video-nv, \
- xserver-xorg-video-radeonhd, \
xserver-xorg-video-rendition, \
xserver-xorg-video-s3, \
xserver-xorg-video-s3virge, \
diff --git a/debian/scripts/vars.arm b/debian/scripts/vars.arm
index e267434..52277a8 100755
--- a/debian/scripts/vars.arm
+++ b/debian/scripts/vars.arm
@@ -14,7 +14,6 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \
xserver-xorg-video-mga, \
xserver-xorg-video-neomagic, \
xserver-xorg-video-nv, \
- xserver-xorg-video-radeonhd, \
xserver-xorg-video-rendition, \
xserver-xorg-video-s3, \
xserver-xorg-video-s3virge, \
diff --git a/debian/scripts/vars.armeb b/debian/scripts/vars.armeb
index e267434..52277a8 100644
--- a/debian/scripts/vars.armeb
+++ b/debian/scripts/vars.armeb
@@ -14,7 +14,6 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \
xserver-xorg-video-mga, \
xserver-xorg-video-neomagic, \
xserver-xorg-video-nv, \
- xserver-xorg-video-radeonhd, \
xserver-xorg-video-rendition, \
xserver-xorg-video-s3, \
xserver-xorg-video-s3virge, \
diff --git a/debian/scripts/vars.armel b/debian/scripts/vars.armel
index e267434..52277a8 100644
--- a/debian/scripts/vars.armel
+++ b/debian/scripts/vars.armel
@@ -14,7 +14,6 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \
xserver-xorg-video-mga, \
xserver-xorg-video-neomagic, \
xserver-xorg-video-nv, \
- xserver-xorg-video-radeonhd, \
xserver-xorg-video-rendition, \
xserver-xorg-video-s3, \
xserver-xorg-video-s3virge, \
diff --git a/debian/scripts/vars.hppa b/debian/scripts/vars.hppa
index 10a92a5..ad2ae2c 100755
--- a/debian/scripts/vars.hppa
+++ b/debian/scripts/vars.hppa
@@ -8,7 +8,6 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-ati, \
xserver-xorg-video-fbdev, \
xserver-xorg-video-mga, \
xserver-xorg-video-nv, \
- xserver-xorg-video-radeonhd, \
xserver-xorg-video-s3, \
xserver-xorg-video-s3virge, \
xserver-xorg-video-savage, \
diff --git a/debian/scripts/vars.hurd-i386 b/debian/scripts/vars.hurd-i386
index bc6b2da..9b95ab5 100644
--- a/debian/scripts/vars.hurd-i386
+++ b/debian/scripts/vars.hurd-i386
@@ -14,7 +14,6 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \
xserver-xorg-video-mga, \
xserver-xorg-video-neomagic, \
xserver-xorg-video-nv, \
- xserver-xorg-video-radeonhd, \
xserver-xorg-video-rendition, \
xserver-xorg-video-s3, \
xserver-xorg-video-s3virge, \
diff --git a/debian/scripts/vars.i386 b/debian/scripts/vars.i386
index 791c6c6..2e52268 100755
--- a/debian/scripts/vars.i386
+++ b/debian/scripts/vars.i386
@@ -15,7 +15,6 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \
xserver-xorg-video-mga, \
xserver-xorg-video-neomagic, \
xserver-xorg-video-nv, \
- xserver-xorg-video-radeonhd, \
xserver-xorg-video-rendition, \
xserver-xorg-video-s3, \
xserver-xorg-video-s3virge, \
diff --git a/debian/scripts/vars.ia64 b/debian/scripts/vars.ia64
index 8afff0b..462e67c 100755
--- a/debian/scripts/vars.ia64
+++ b/debian/scripts/vars.ia64
@@ -14,7 +14,6 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \
xserver-xorg-video-mga, \
xserver-xorg-video-neomagic, \
xserver-xorg-video-nv, \
- xserver-xorg-video-radeonhd, \
xserver-xorg-video-rendition, \
xserver-xorg-video-s3, \
xserver-xorg-video-s3virge, \
diff --git a/debian/scripts/vars.kfreebsd-amd64 b/debian/scripts/vars.kfreebsd-amd64
index 4f5dcc5..179064b 100755
--- a/debian/scripts/vars.kfreebsd-amd64
+++ b/debian/scripts/vars.kfreebsd-amd64
@@ -12,7 +12,6 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \
xserver-xorg-video-mga, \
xserver-xorg-video-neomagic, \
xserver-xorg-video-nv, \
- xserver-xorg-video-radeonhd, \
xserver-xorg-video-rendition, \
xserver-xorg-video-s3, \
xserver-xorg-video-s3virge, \
diff --git a/debian/scripts/vars.kfreebsd-i386 b/debian/scripts/vars.kfreebsd-i386
index bfbb066..ae7b901 100755
--- a/debian/scripts/vars.kfreebsd-i386
+++ b/debian/scripts/vars.kfreebsd-i386
@@ -13,7 +13,6 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \
xserver-xorg-video-mga, \
xserver-xorg-video-neomagic, \
xserver-xorg-video-nv, \
- xserver-xorg-video-radeonhd, \
xserver-xorg-video-rendition, \
xserver-xorg-video-s3, \
xserver-xorg-video-s3virge, \
diff --git a/debian/scripts/vars.m32r b/debian/scripts/vars.m32r
index e267434..52277a8 100755
--- a/debian/scripts/vars.m32r
+++ b/debian/scripts/vars.m32r
@@ -14,7 +14,6 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \
xserver-xorg-video-mga, \
xserver-xorg-video-neomagic, \
xserver-xorg-video-nv, \
- xserver-xorg-video-radeonhd, \
xserver-xorg-video-rendition, \
xserver-xorg-video-s3, \
xserver-xorg-video-s3virge, \
diff --git a/debian/scripts/vars.m68k b/debian/scripts/vars.m68k
index 72b2427..9b4df42 100755
--- a/debian/scripts/vars.m68k
+++ b/debian/scripts/vars.m68k
@@ -14,7 +14,6 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \
xserver-xorg-video-mga, \
xserver-xorg-video-neomagic, \
xserver-xorg-video-nv, \
- xserver-xorg-video-radeonhd, \
xserver-xorg-video-rendition, \
xserver-xorg-video-s3, \
xserver-xorg-video-s3virge, \
diff --git a/debian/scripts/vars.mips b/debian/scripts/vars.mips
index 8cd1d93..38bdced 100755
--- a/debian/scripts/vars.mips
+++ b/debian/scripts/vars.mips
@@ -15,7 +15,6 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \
xserver-xorg-video-neomagic, \
xserver-xorg-video-newport, \
xserver-xorg-video-nv, \
- xserver-xorg-video-radeonhd, \
xserver-xorg-video-rendition, \
xserver-xorg-video-s3, \
xserver-xorg-video-s3virge, \
diff --git a/debian/scripts/vars.mipsel b/debian/scripts/vars.mipsel
index e267434..52277a8 100755
--- a/debian/scripts/vars.mipsel
+++ b/debian/scripts/vars.mipsel
@@ -14,7 +14,6 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \
xserver-xorg-video-mga, \
xserver-xorg-video-neomagic, \
xserver-xorg-video-nv, \
- xserver-xorg-video-radeonhd, \
xserver-xorg-video-rendition, \
xserver-xorg-video-s3, \
xserver-xorg-video-s3virge, \
diff --git a/debian/scripts/vars.powerpc b/debian/scripts/vars.powerpc
index 70b88cd..a3513d7 100755
--- a/debian/scripts/vars.powerpc
+++ b/debian/scripts/vars.powerpc
@@ -8,7 +8,6 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-ati, \
xserver-xorg-video-fbdev, \
xserver-xorg-video-mga, \
xserver-xorg-video-nv, \
- xserver-xorg-video-radeonhd, \
xserver-xorg-video-s3, \
xserver-xorg-video-s3virge, \
xserver-xorg-video-savage, \
diff --git a/debian/scripts/vars.ppc64 b/debian/scripts/vars.ppc64
index f27e03c..d331787 100755
--- a/debian/scripts/vars.ppc64
+++ b/debian/scripts/vars.ppc64
@@ -8,7 +8,6 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-ati, \
xserver-xorg-video-fbdev, \
xserver-xorg-video-mga, \
xserver-xorg-video-nv, \
- xserver-xorg-video-radeonhd, \
xserver-xorg-video-s3, \
xserver-xorg-video-s3virge, \
xserver-xorg-video-savage, \
diff --git a/debian/scripts/vars.sh4 b/debian/scripts/vars.sh4
index 9c44a4a..dca8071 100644
--- a/debian/scripts/vars.sh4
+++ b/debian/scripts/vars.sh4
@@ -16,7 +16,6 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \
xserver-xorg-video-mga, \
xserver-xorg-video-neomagic, \
xserver-xorg-video-nv, \
- xserver-xorg-video-radeonhd, \
xserver-xorg-video-rendition, \
xserver-xorg-video-s3, \
xserver-xorg-video-s3virge, \
diff --git a/debian/scripts/vars.sparc b/debian/scripts/vars.sparc
index 9227c03..1e3f99a 100755
--- a/debian/scripts/vars.sparc
+++ b/debian/scripts/vars.sparc
@@ -14,7 +14,6 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \
xserver-xorg-video-mga, \
xserver-xorg-video-neomagic, \
xserver-xorg-video-nv, \
- xserver-xorg-video-radeonhd, \
xserver-xorg-video-rendition, \
xserver-xorg-video-s3virge, \
xserver-xorg-video-savage, \
commit 30a7db1bf67a4a5b6e4d146768b9f6deb80579fa
Author: Timo Aaltonen <tjaalton@cc.hut.fi>
Date: Tue Mar 30 21:00:45 2010 +0300
Don't install /etc/X11/xorg.conf.d, since it would override /usr/lib/X11/xorg.conf.d
diff --git a/debian/changelog b/debian/changelog
index 8d9c4fa..54fab9e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,3 @@
-xorg (1:7.5+6) UNRELEASED; urgency=low
-
- * x11-common: Add /etc/X11/xorg.conf.d.
-
- -- Timo Aaltonen <tjaalton@ubuntu.com> Tue, 30 Mar 2010 19:18:27 +0300
-
xorg (1:7.5+5) unstable; urgency=low
* Fix typo in Xsession.d/50x11-common_determine-startup, closes: #573899.
diff --git a/debian/x11-common.dirs b/debian/x11-common.dirs
index e757fdf..59b24d0 100644
--- a/debian/x11-common.dirs
+++ b/debian/x11-common.dirs
@@ -1,7 +1,6 @@
etc/X11/Xresources
etc/X11/Xreset.d
etc/X11/Xsession.d
-etc/X11/xorg.conf.d
usr/include/X11
usr/lib/X11
usr/share/X11
commit 9817b4651426ef89214529a9c9a9e4ecc31346e8
Author: Timo Aaltonen <tjaalton@cc.hut.fi>
Date: Tue Mar 30 19:19:27 2010 +0300
x11-common: Add /etc/X11/xorg.conf.d.
diff --git a/debian/changelog b/debian/changelog
index 54fab9e..8d9c4fa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xorg (1:7.5+6) UNRELEASED; urgency=low
+
+ * x11-common: Add /etc/X11/xorg.conf.d.
+
+ -- Timo Aaltonen <tjaalton@ubuntu.com> Tue, 30 Mar 2010 19:18:27 +0300
+
xorg (1:7.5+5) unstable; urgency=low
* Fix typo in Xsession.d/50x11-common_determine-startup, closes: #573899.
diff --git a/debian/x11-common.dirs b/debian/x11-common.dirs
index 59b24d0..e757fdf 100644
--- a/debian/x11-common.dirs
+++ b/debian/x11-common.dirs
@@ -1,6 +1,7 @@
etc/X11/Xresources
etc/X11/Xreset.d
etc/X11/Xsession.d
+etc/X11/xorg.conf.d
usr/include/X11
usr/lib/X11
usr/share/X11
Reply to: