xorg-server: Changes to 'debian-squeeze'

[Cyril Brulebois <kibi@alioth.debian.org>]

 debian/changelog                    |    1 +
 debian/xserver-xorg-core.bug.script |    6 ++++++
 2 files changed, 7 insertions(+)

New commits:
commit a35844088e82ebe8dd3f7c7e4be1b5164f6e1f78
Author: Cyril Brulebois <kibi@debian.org>
Date:   Wed Feb 16 23:28:13 2011 +0100

    bug script: Report libGL-related diversions.

diff --git a/debian/changelog b/debian/changelog
index cc53af8..3b70492 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ xorg-server (2:1.7.7-13) UNRELEASED; urgency=low
   * Merge from server-1.7-branch, fixing broken rotation with nvidia
     driver (Closes: #611619):
     - Revert "randr: check for virtual size limits before set crtc"
+  * bug script: Report libGL-related diversions.
 
  -- 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 32b5e6b..c78ce6e 100644
--- a/debian/xserver-xorg-core.bug.script
+++ b/debian/xserver-xorg-core.bug.script
@@ -48,6 +48,12 @@ if ldd "$SERVER_BINARY" | grep -qs "$X11R6_LIBS"; then
    echo
 fi
 
+if dpkg-divert --list | grep -qs -i libgl; then
+    pecho "Diversions concerning libGL are in place"
+    dpkg-divert --list | grep -i libgl
+    echo
+fi
+
 if which lspci > /dev/null 2>&1; then
     pecho "VGA-compatible devices on PCI bus:"
     LC_ALL=C lspci -nn | grep 'VGA compatible controller'