debian/apport/source_xorg.py | 2 ++
debian/changelog | 5 +++--
debian/scripts/vars.armel | 22 +---------------------
3 files changed, 6 insertions(+), 23 deletions(-)
New commits:
commit 46b0859f52306530a8ac6d39bedbb32027ad0316
Author: Bryce Harrington <br...@canonical.com>
Date: Fri Mar 25 12:22:39 2011 -0700
* apport/source_xorg.py:
- Include 'xinput list' output for input device issues.
- For amd64 arch's, include version of ia32-libs package.
diff --git a/debian/apport/source_xorg.py b/debian/apport/source_xorg.py
index 1d5b636..d703a31 100644
--- a/debian/apport/source_xorg.py
+++ b/debian/apport/source_xorg.py
@@ -291,6 +291,8 @@ def attach_xorg_package_versions(report, ui=None):
"xserver-xorg-video-ati",
"xserver-xorg-video-nouveau"]:
report['version.%s' %(package)] = package_versions(package)
+ if report['Architecture'] == 'amd64':
+ report['version.ia32-libs'] = package_versions('ia32-libs')
def attach_2d_info(report, ui=None):
attach_file_if_exists(report, '/var/log/plymouth-debug.log',
'PlymouthDebug')
diff --git a/debian/changelog b/debian/changelog
index f7e84fc..a071dcb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -27,8 +27,9 @@ xorg (1:7.6+4ubuntu1) UNRELEASED; urgency=low
universe.
[Bryce Harrington]
- * apport/source_xorg.py: Include 'xinput list' output for input device
- issues.
+ * apport/source_xorg.py:
+ - Include 'xinput list' output for input device issues.
+ - For amd64 arch's, include version of ia32-libs package.
* scripts/amd64, scripts/i386: Include the -qxl video driver in
video-all for amd64 and i386, to provide remote graphical
desktop functionality for KVM.
diff --git a/debian/scripts/vars.armel b/debian/scripts/vars.armel
index 87c6ba7..1f30685 100644
--- a/debian/scripts/vars.armel
+++ b/debian/scripts/vars.armel
@@ -3,34 +3,14 @@
#
# This file gets included by both debian/rules (make) AND the scripts in
# debian/scripts (Bourne shell).
-XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \
- xserver-xorg-video-ark, \
- xserver-xorg-video-ati, \
- xserver-xorg-video-chips, \
+XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-ati, \
xserver-xorg-video-cirrus, \
xserver-xorg-video-fbdev, \
- xserver-xorg-video-i128, \
- xserver-xorg-video-i740, \
- xserver-xorg-video-mga, \
- xserver-xorg-video-neomagic, \
- xserver-xorg-video-rendition, \
- xserver-xorg-video-s3, \
- xserver-xorg-video-s3virge, \
- xserver-xorg-video-savage, \
- xserver-xorg-video-siliconmotion, \
- xserver-xorg-video-sis, \
xserver-xorg-video-sisusb, \
- xserver-xorg-video-tdfx, \
- xserver-xorg-video-trident, \
- xserver-xorg-video-tseng, \
xserver-xorg-video-vesa, \
- xserver-xorg-video-voodoo, \
"
-# xserver-xorg-video-glide,
-
XSERVER_XORG_INPUT_DEPENDS="xserver-xorg-input-evdev, \
xserver-xorg-input-synaptics"
-
XSERVER_XORG_INPUT_RECOMMENDS="xserver-xorg-input-wacom"
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1q3cb3-0006eo...@alioth.debian.org
