xorg-server: Changes to 'debian-squeeze'
debian/changelog | 8 ++++++++
debian/xserver-xorg-core.bug.script | 19 +++++++++++++++++--
2 files changed, 25 insertions(+), 2 deletions(-)
New commits:
commit fa9757e236b5f3645c934c9cb4e4418e3bf0f1aa
Author: Cyril Brulebois <kibi@debian.org>
Date: Wed Feb 9 10:21:34 2011 +0100
bug script: Keep only one lspci call (with proper filtering), which makes PCI IDs come back.
diff --git a/debian/changelog b/debian/changelog
index f496c8e..5815ac3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
xorg-server (2:1.7.7-13) UNRELEASED; urgency=low
* bug script: Report KMS configuration files and their contents.
+ * bug script: Keep only one lspci call (with proper filtering), which
+ makes PCI IDs come back.
-- Cyril Brulebois <kibi@debian.org> Wed, 09 Feb 2011 10:24:10 +0100
diff --git a/debian/xserver-xorg-core.bug.script b/debian/xserver-xorg-core.bug.script
index 2890ce6..32b5e6b 100644
--- a/debian/xserver-xorg-core.bug.script
+++ b/debian/xserver-xorg-core.bug.script
@@ -50,8 +50,7 @@ fi
if which lspci > /dev/null 2>&1; then
pecho "VGA-compatible devices on PCI bus:"
- LC_ALL=C lspci | grep 'VGA compatible controller:'
- LC_ALL=C lspci -n | grep 'Class 0300:'
+ LC_ALL=C lspci -nn | grep 'VGA compatible controller'
else
echo "The lspci command was not found; not including PCI data."
fi
commit f464a93ef85ddf3d3b84a5c6826b39b97537fadd
Author: Cyril Brulebois <kibi@debian.org>
Date: Wed Feb 9 10:24:50 2011 +0100
bug script: Report KMS configuration files and their contents.
diff --git a/debian/changelog b/debian/changelog
index 11f216c..f496c8e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xorg-server (2:1.7.7-13) UNRELEASED; urgency=low
+
+ * bug script: Report KMS configuration files and their contents.
+
+ -- Cyril Brulebois <kibi@debian.org> Wed, 09 Feb 2011 10:24:10 +0100
+
xorg-server (2:1.7.7-12) unstable; urgency=low
* Cherry-pick this to fix crashes with MCE remotes (Closes: #609750):
diff --git a/debian/xserver-xorg-core.bug.script b/debian/xserver-xorg-core.bug.script
index 9d0f54c..2890ce6 100644
--- a/debian/xserver-xorg-core.bug.script
+++ b/debian/xserver-xorg-core.bug.script
@@ -79,6 +79,22 @@ fi
echo
+KMS_CONFS_DIR=/etc/modprobe.d
+KMS_CONFS=$(ls $KMS_CONFS_DIR/*-kms.conf 2>/dev/null)
+
+if [ -n "$KMS_CONFS" ]; then
+ pecho "KMS configuration files:"
+ for CONF in $KMS_CONFS; do
+ echo "$CONF:"
+ # Indent, and get rid of empty lines:
+ sed 's/^/ /' < "$CONF"|egrep -v '^\s*$'
+ done
+else
+ echo "$KMS_CONFS_DIR contains no KMS configuration files."
+fi
+
+echo
+
KERNEL_VERSION=/proc/version
if [ -e "$KERNEL_VERSION" ]; then
Reply to: