xserver-xorg-video-intel: Changes to 'ubuntu'
debian/apport-gpu-error-intel.py | 7 ++++++-
debian/changelog | 10 +++++++++-
2 files changed, 15 insertions(+), 2 deletions(-)
New commits:
commit eae83b13bc399e4a4efba5947025a48cd32fe5cd
Author: Bryce Harrington <bryce@canonical.com>
Date: Tue Mar 8 13:29:08 2011 -0800
apport-gpu-error-intel.py: Omit the hexdigest code from the title if we have two or more non-zero GPU error codes. A pair of error codes has proven to be an adequately good unique identifier for bugs.
diff --git a/debian/apport-gpu-error-intel.py b/debian/apport-gpu-error-intel.py
index 02ef4dd..b39a983 100644
--- a/debian/apport-gpu-error-intel.py
+++ b/debian/apport-gpu-error-intel.py
@@ -75,7 +75,12 @@ def get_dump_signature(text):
match = regex.search(text)
if match and match.group(1) != "00000000":
codes.append("%s: 0x%s" %(k, match.group(1)))
- return "%s (%s)" %( m.hexdigest()[:8], string.join(codes, " ") )
+ if len(codes) > 1:
+ return "(%s)" %( string.join(codes, " ") )
+ elif len(codes) == 1:
+ return "%s (%s)" %( m.hexdigest()[:8], string.join(codes, " ") )
+ else:
+ return "%s" %( m.hexdigest()[:8] )
def main(argv=None):
if argv is None:
diff --git a/debian/changelog b/debian/changelog
index 38cf27d..d777ef6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,14 @@
+xserver-xorg-video-intel (2:2.14.0-1ubuntu13) natty; urgency=low
+
+ * apport-gpu-error-intel.py: Omit the hexdigest code from the title if
+ we have two or more non-zero GPU error codes. A pair of error codes
+ has proven to be an adequately good unique identifier for bugs.
+
+ -- Bryce Harrington <bryce@ubuntu.com> Tue, 08 Mar 2011 13:25:45 -0800
+
xserver-xorg-video-intel (2:2.14.0-1ubuntu12) natty; urgency=low
- * Pull prerequisite commit into
+ * Pull prerequisite commit into
109_dont_reconstruct_glyph_cache_on_rotate.patch. We mostly didn't notice
because the copy-fb codepath initialises the resources itself. Fixes
Pixmap assert on Xserver startup when copy-fb fails, such as on hybrid
Reply to: