Merge lp:~matttbe/ubuntu/quantal/gnome-settings-daemon/lp1013171 into lp:ubuntu/quantal/gnome-settings-daemon

Proposed by Matthieu Baerts
Status: Merged
Merge reported by: Sebastien Bacher
Merged at revision: not available
Proposed branch: lp:~matttbe/ubuntu/quantal/gnome-settings-daemon/lp1013171
Merge into: lp:ubuntu/quantal/gnome-settings-daemon
Diff against target: 27 lines (+8/-1)
2 files modified
debian/changelog (+7/-0)
debian/source_gnome-settings-daemon.py (+1/-1)
To merge this branch: bzr merge lp:~matttbe/ubuntu/quantal/gnome-settings-daemon/lp1013171
Reviewer Review Type Date Requested Status
Ubuntu Sponsors Pending
Review via email: mp+113091@code.launchpad.net

Description of the change

Hello,

This is just a patch to update apport hook for python3.

Regards,

Matt

To post a comment you must log in.
Revision history for this message
Sebastien Bacher (seb128) wrote :
Revision history for this message
Matthieu Baerts (matttbe) wrote :

Sorry, I didn't know that there was a packaging vcs.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2012-06-18 10:27:29 +0000
3+++ debian/changelog 2012-07-02 18:47:23 +0000
4@@ -1,3 +1,10 @@
5+gnome-settings-daemon (3.4.2-0ubuntu6) UNRELEASED; urgency=low
6+
7+ * debian/source_gnome-settings-daemon.py:
8+ - Update apport hook for python3 (LP: #1013171)
9+
10+ -- Matthieu Baerts (matttbe) <matttbe@gmail.com> Mon, 02 Jul 2012 20:42:57 +0200
11+
12 gnome-settings-daemon (3.4.2-0ubuntu5) quantal; urgency=low
13
14 * debian/patches/10_smaller_syndaemon_timeout.patch: Update to increase
15
16=== modified file 'debian/source_gnome-settings-daemon.py'
17--- debian/source_gnome-settings-daemon.py 2012-02-24 12:39:29 +0000
18+++ debian/source_gnome-settings-daemon.py 2012-07-02 18:47:23 +0000
19@@ -3,7 +3,7 @@
20
21 def add_info(report):
22 # the issue is not in the gnome-settings-daemon code so reassign
23- if report.has_key("Stacktrace") and "/usr/lib/gnome-settings-daemon-3.0" in report["Stacktrace"]:
24+ if "Stacktrace" in report and "/usr/lib/gnome-settings-daemon-3.0" in report["Stacktrace"]:
25 for words in report["Stacktrace"].split():
26 if words.startswith("/usr/lib/gnome-settings-daemon-3.0"):
27 if apport.packaging.get_file_package(words) != 'gnome-settings-daemon':

Subscribers

People subscribed via source and target branches