xorg: Changes to 'debian-unstable'
debian/changelog | 8 ++++++--
debian/scripts/vars.amd64 | 1 +
debian/scripts/vars.i386 | 1 +
debian/scripts/vars.powerpc | 1 +
debian/x11-common.init | 2 +-
5 files changed, 10 insertions(+), 3 deletions(-)
New commits:
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, \
Reply to: