summaryrefslogtreecommitdiff
diff options
-rw-r--r--debian/changelog8
-rw-r--r--debian/source_unity.py13
-rw-r--r--debian/unity-common.install1
-rw-r--r--debian/unity-crashdb.conf5
4 files changed, 26 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 786f463d3..1246851fb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+unity (5.2.0-0ubuntu5) UNRELEASED; urgency=low
+
+ * debian/unity-crashdb.conf, debian/source_unity.py,
+ debian/unity-common.install:
+ - enabling installing + tag from a ppa
+
+ -- Didier Roche <didrocks@ubuntu.com> Tue, 14 Feb 2012 13:13:56 +0100
+
unity (5.2.0-0ubuntu4) precise; urgency=low
* debian/control:
diff --git a/debian/source_unity.py b/debian/source_unity.py
index e0a99c25c..4104361e8 100644
--- a/debian/source_unity.py
+++ b/debian/source_unity.py
@@ -1,6 +1,17 @@
import apport.packaging
def add_info(report, ui):
+
+ # for install from the ppa
+ if not apport.packaging.is_distro_package(report['Package'].split()[0]):
+ report['CrashDB'] = 'unity'
+ try:
+ version = packaging.get_version('unity')
+ except ValueError:
+ version = 'N/A'
+ if version is None:
+ version = 'N/A'
+ report['Tags'] += " rc-%s" % version
# the crash is not in the unity code so reassign
if report.has_key("Stacktrace") and "/usr/lib/indicators" in report["Stacktrace"]:
@@ -12,7 +23,7 @@ def add_info(report, ui):
# only reports all compiz infos if a graphical bug
compiz_bug = False
if ui and report['SourcePackage'] == "unity":
- if ui.yesno("Thanks for reporting this bug on unity. Is the issue you are reporting graphical (will report more information about your graphic configuration)?"):
+ if ui.yesno("Thanks for reporting this bug on unity. Is the issue you are reporting purely graphical (will report more information about your graphic configuration and will report the bug against compiz)?"):
compiz_bug = True
if compiz_bug:
report.add_hooks_info(ui, srcpackage='compiz')
diff --git a/debian/unity-common.install b/debian/unity-common.install
index d05681b7b..27eee716d 100644
--- a/debian/unity-common.install
+++ b/debian/unity-common.install
@@ -3,5 +3,6 @@ usr/share/ccsm
usr/share/glib-2.0
usr/share/gconf
usr/share/unity
+debian/unity-crashdb.conf etc/apport/crashdb.conf.d/
debian/source_unity.py usr/share/apport/package-hooks
debian/profile_upgrade/* etc/compizconfig/upgrades/
diff --git a/debian/unity-crashdb.conf b/debian/unity-crashdb.conf
new file mode 100644
index 000000000..316fe3fad
--- /dev/null
+++ b/debian/unity-crashdb.conf
@@ -0,0 +1,5 @@
+unity = {
+ 'impl' : 'launchpad',
+ 'project' : 'unity',
+ 'bug_pattern_base' : None,
+ }