Merge lp:~ara/gesturetest/apport_hook_lp_622817 into lp:~oif-team/gesturetest/packaging

[Ara Pulido]

This branch contains the apport hook for utouch packages. (LP: 622817)

Basically, the hook is the same for all the utouch packages, but it requires installation in those that do not depend in any others.

* mtdev (it includes symlinks to utouch and utouch-grail)
* utouch-gesturetest
* utouch-geis

These changes do not require a feature freeze exception (I already discussed it with pitti)

[Chase Douglas (chasedouglas)]

As stated in the mtdev review, the release name should be UNRELEASED instead of maverick right now. That's the only issue I see.

review: Needs Fixing

[lp:~ara/gesturetest/apport_hook_lp_622817]

24. By Ara Pulido on 2010-08-25

Changed release name to UNRELEASED per utouch team policy

[Ara Pulido (ara)]

Modified accordingly. Thanks for the review!

[Chase Douglas (chasedouglas)]

Looks good.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2010-08-12 16:35:36 +0000
+++ debian/changelog	2010-08-25 15:37:47 +0000
@@ -1,3 +1,9 @@
+utouch-gesturetest (1.0.4-0ubuntu2) UNRELEASED; urgency=low
+
+   * Added apport hook for utouch-gesturetest (LP: #622817) 
+
+ -- Ara Pulido <[e-mail]>  Wed, 25 Aug 2010 16:28:06 +0200
+
 utouch-gesturetest (1.0.4-0ubuntu1) maverick; urgency=low
 
   * New upstream release.
 
=== added file 'debian/source_utouch-gesturetest.py'
--- debian/source_utouch-gesturetest.py	1970-01-01 00:00:00 +0000
+++ debian/source_utouch-gesturetest.py	2010-08-25 15:37:47 +0000
@@ -0,0 +1,137 @@
+# Multitouch device related problems
+# Author: Ara Pulido <[e-mail]>
+# (C) 2010 Canonical Ltd.
+# License: GPL v2 or later.
+
+from glob import glob
+from subprocess import Popen, PIPE
+import sys
+import apport.hookutils
+import time
+import os
+
+# See linux/input.h
+ABS_MT_POSITION_X = 0x35
+
+# scan-for-mt-devices written by Marc Tardif, 
+# based on a script by Henrik Rydberg
+class Input(object):
+
+    def __init__(self, path):
+        self.path = path
+
+    @property
+    def device(self):
+        base = os.path.basename(self.path)
+        return os.path.join("/dev", "input", base)
+
+    @property
+    def name(self):
+        path = os.path.join(self.path, "device", "name")
+        return read_line(path)
+
+    def get_capabilities(self):
+        path = os.path.join(self.path, "device", "capabilities", "abs")
+        line = read_line(path)
+        capabilities = []
+        long_bit = getconf("LONG_BIT")
+        for i, word in enumerate(line.split(" ")):
+            word = int(word, 16)
+            subcapabilities = [bool(word & 1<<i) for i in range(long_bit)]
+            capabilities[:0] = subcapabilities
+
+        return capabilities
+
+    def has_capability(self, capability):
+        capabilities = self.get_capabilities()
+        return len(capabilities) > capability and capabilities[capability]
+
+
+def getconf(var):
+    output = Popen(["getconf", var], stdout=PIPE).communicate()[0]
+    return int(output)
+
+def get_inputs(path):
+    event_glob = os.path.join(path, "event*")
+    for event_path in glob(event_glob):
+        yield Input(event_path)
+
+def read_line(path):
+    f = open(path)
+    try:
+        return f.readline().strip()
+    finally:
+        f.close()
+
+def scan_for_mt_devices(report):
+
+    capability = ABS_MT_POSITION_X
+    input = "/sys/class/input"
+
+    inputs = get_inputs(input)
+    inputs = [i for i in inputs if i.has_capability(capability)]
+
+    report['MtDevices'] = ''
+
+    if inputs:
+        for input in inputs:
+            report['MtDevices'] += "%s: %s\n" % (input.name, input.device)
+
+        return 0
+    else:
+        report['MtDevices'] += "No capable devices found..."
+        return 1
+
+##################################
+
+description = 'Multitouch device problem'
+RELATED_PACKAGES = ['xserver-xorg', 'xserver-xorg-video-intel', 'xserver-xorg-video-ati', 'libmtdev1', 'libutouch-grail1', 'libutouch-geis1']
+
+
+def add_info(report, ui):
+
+    report.setdefault('Tags', '')
+    report['Tags'] += ' hci touch'
+
+    # Capture hardware
+    apport.hookutils.attach_hardware(report)
+    report['PciDisplay'] = apport.hookutils.pci_devices(apport.hookutils.PCI_DISPLAY)
+    
+    # Attach the results of scan mt devices
+    scan_for_mt_devices(report)
+
+    # Only collect the following data if X11 is available
+    if os.environ.get('DISPLAY'):
+        # For resolution/multi-head bugs
+        report['Xrandr'] = apport.hookutils.command_output(['xrandr', '--verbose'])
+        apport.hookutils.attach_file_if_exists(report,
+                              os.path.expanduser('~/.config/monitors.xml'),
+                              'monitors.xml')
+
+    # Attach the Xorg logs and config    
+    apport.hookutils.attach_file_if_exists(report, '/etc/X11/xorg.conf', 'XorgConf')
+    apport.hookutils.attach_file(report, '/var/log/Xorg.0.log', 'XorgLog')
+    apport.hookutils.attach_file_if_exists(report, '/var/log/Xorg.0.log.old', 'XorgLogOld')
+    apport.hookutils.attach_file_if_exists(report, '/var/log/gdm/:0.log', 'GdmLog')
+    apport.hookutils.attach_file_if_exists(report, '/var/log/gdm/:0.log.1', 'GdmLogOld')
+
+
+    # Attach the output of xinput
+    report['XInput'] = apport.hookutils.command_output(['xinput', 'input'])
+
+    # Attach the output of lsinput
+    report['LsInput'] = apport.hookutils.root_command_output(["lsinput"])
+
+    # Attach descriptors
+    attach_descriptors(report)
+
+    apport.hookutils.attach_related_packages(report, RELATED_PACKAGES)
+
+def attach_descriptors(report):
+    path = '/sys/kernel/debug/hid/*/rdesc'
+    for desc in glob(path):
+        name = desc.split('/')[5]
+        name = name.replace(":", "").replace(".", "")
+        report[name] = apport.hookutils.root_command_output(["cat", desc])
+
+
 
=== added file 'debian/utouch-gesturetest.install'
--- debian/utouch-gesturetest.install	1970-01-01 00:00:00 +0000
+++ debian/utouch-gesturetest.install	2010-08-25 15:37:47 +0000
@@ -0,0 +1,2 @@
+debian/source_utouch-gesturetest.py usr/share/apport/package-hooks
+