xorg: Changes to 'ubuntu'

[Bryce Harrington <bryce-guest@alioth.debian.org>]

 debian/apport/source_xorg.py |    6 ++++++
 debian/changelog             |    4 +++-
 2 files changed, 9 insertions(+), 1 deletion(-)

New commits:
commit e57d6919fc60d063d4a23df2df893f75181e0454
Author: Bryce Harrington <bryce@bryceharrington.org>
Date:   Sun Mar 29 14:13:55 2009 -0700

    Changelog entry

diff --git a/debian/changelog b/debian/changelog
index fd06ae6..b4be24d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,13 @@
 xorg (1:7.4~5ubuntu17) UNRELEASED; urgency=low
 
+  * apport/source_xorg.py:
+    - Include monitors.xml in apport reports.
   * local/Failsafe/failsafeXinit:
     - Fix typo in xorg.conf filename
     - Fix mismatched quotes
     - Handle ESC key hits in zenity to not create a 0-length xorg.conf
 
- -- Bryce Harrington <bryce@ubuntu.com>  Tue, 24 Mar 2009 17:42:45 -0700
+ -- Bryce Harrington <bryce@ubuntu.com>  Sun, 29 Mar 2009 14:13:23 -0700
 
 xorg (1:7.4~5ubuntu16) jaunty; urgency=low
 

commit 903db2ca6e97e90d91143f0b55ab156cd9c455c4
Author: Bryce Harrington <bryce@bryceharrington.org>
Date:   Sun Mar 29 14:12:53 2009 -0700

    Add ~/.config/monitors.xml to apport reports

diff --git a/debian/apport/source_xorg.py b/debian/apport/source_xorg.py
index 1322564..3f0a9f8 100644
--- a/debian/apport/source_xorg.py
+++ b/debian/apport/source_xorg.py
@@ -112,6 +112,12 @@ def add_info(report):
         pass
 
     try:
+        monitors_config = os.path.join(os.environ['HOME'], '.config/monitors.xml')
+        report['monitors.xml']  = open(monitors_config).read()
+    except IOError:
+        pass
+
+    try:
         script = subprocess.Popen(['xdpyinfo'], stdout=subprocess.PIPE)
         report['xdpyinfo'] = script.communicate()[0]
     except OSError: