Merge the apport-action-states branch

3 files changed, 29 insertions, 0 deletions

diff --git a/debian/indicator-sound-crashdb.conf b/debian/indicator-sound-crashdb.conf
new file mode 100644
index 0000000..42e04f7
--- /dev/null
+++ b/debian/indicator-sound-crashdb.conf
@@ -0,0 +1,6 @@
+
+indicator_sound = {
+	'impl': 'launchpad',
+	'project': 'indicator-sound',
+	'bug_pattern_base': None,
+}
diff --git a/debian/rules b/debian/rules
index 3f1dfeb..8fb0f91 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,3 +10,10 @@ override_dh_auto_configure:
 	# So until Debian bug 719148 is fixed, do it ourselves.
 	dh_auto_configure -- -DCMAKE_INSTALL_LOCALSTATEDIR="/var"
 
+override_dh_install:
+	mkdir -p debian/indicator-sound/usr/share/apport/package-hooks/
+	install -m 644 debian/source_indicator-sound.py debian/indicator-sound/usr/share/apport/package-hooks/
+	mkdir -p debian/indicator-sound/etc/apport/crashdb.conf.d/
+	install -m 644 debian/indicator-sound-crashdb.conf debian/indicator-sound/etc/apport/crashdb.conf.d/
+	dh_install --fail-missing
+
diff --git a/debian/source_indicator-sound.py b/debian/source_indicator-sound.py
new file mode 100644
index 0000000..90e8f4f
--- /dev/null
+++ b/debian/source_indicator-sound.py
@@ -0,0 +1,16 @@
+import os.path
+from apport.hookutils import *
+
+def attach_command_output(report, command_list, key):
+	log = command_output(command_list)
+	if not log or log[:5] == "Error":
+		return
+	report[key] = log 
+
+def add_info(report):
+	if not apport.packaging.is_distro_package(report['Package'].split()[0]):
+		report['ThirdParty'] = 'True'
+		report['CrashDB'] = 'indicator_sound'
+
+	if not 'StackTrace' in report:
+		attach_command_output(report, ['gdbus', 'call', '--session', '--dest', 'com.canonical.indicator.sound', '--object-path', '/com/canonical/indicator/sound', '--method', 'org.gtk.Actions.DescribeAll'], 'ActionStates')