Merge lp:~jtaylor/ubuntu/raring/gnome-games/lp-995281 into lp:ubuntu/raring/gnome-games

Proposed by Julian Taylor on 2012-12-26
Status: Merged
Merge reported by: Iain Lane
Merged at revision: not available
Proposed branch: lp:~jtaylor/ubuntu/raring/gnome-games/lp-995281
Merge into: lp:ubuntu/raring/gnome-games
Diff against target: 42 lines (+24/-0)
3 files modified
debian/changelog (+7/-0)
debian/patches/fix-glines-crash.patch (+16/-0)
debian/patches/series (+1/-0)
To merge this branch: bzr merge lp:~jtaylor/ubuntu/raring/gnome-games/lp-995281
Reviewer Review Type Date Requested Status
Iain Lane Disapprove on 2013-01-11
Ubuntu branches 2012-12-26 Pending
Review via email: mp+141286@code.launchpad.net
To post a comment you must log in.
Iain Lane (laney) wrote :

Thanks. The change looks fine but we use an ubuntu-desktop branch for this package - lp:~ubuntu-dekstop/gnome-games/ubuntu. I'll merge it there for you.

review: Disapprove

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-11-14 15:23:28 +0000
3+++ debian/changelog 2012-12-26 19:19:29 +0000
4@@ -1,3 +1,10 @@
5+gnome-games (1:3.6.1-0ubuntu3) raring; urgency=low
6+
7+ * fix-glines-crash.patch:
8+ fix glines crash on startup (LP: #995281)
9+
10+ -- Julian Taylor <jtaylor@ubuntu.com> Wed, 26 Dec 2012 19:42:38 +0100
11+
12 gnome-games (1:3.6.1-0ubuntu2) raring; urgency=low
13
14 * Remove obsolete libgstreamer0.10-dev BD.
15
16=== added file 'debian/patches/fix-glines-crash.patch'
17--- debian/patches/fix-glines-crash.patch 1970-01-01 00:00:00 +0000
18+++ debian/patches/fix-glines-crash.patch 2012-12-26 19:19:29 +0000
19@@ -0,0 +1,16 @@
20+Description: prevent draw before preview is initinialized
21+Origin: upstream bug
22+Bug-Ubuntu: https://launchpad.net/bugs/995281
23+Bug: https://bugzilla.gnome.org/show_bug.cgi?id=675628
24+
25+--- a/glines/src/glines.c
26++++ b/glines/src/glines.c
27+@@ -443,7 +443,7 @@
28+
29+ for (i = 0; i < MAXNPIECES; i++) {
30+
31+- if (i < npieces)
32++ if (i < npieces && preview[i] > 0 )
33+ pattern = cairo_pattern_create_for_surface (preview_surfaces[preview[i] - 1]);
34+ else
35+ pattern = cairo_pattern_create_for_surface (blank_preview_surface);
36
37=== modified file 'debian/patches/series'
38--- debian/patches/series 2012-11-06 10:56:12 +0000
39+++ debian/patches/series 2012-12-26 19:19:29 +0000
40@@ -1,1 +1,2 @@
41 02_desktop-path.patch
42+fix-glines-crash.patch

Subscribers

People subscribed via source and target branches

to all changes: