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

[Julian Taylor]

[Iain Lane (laney)]

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

=== modified file 'debian/changelog'
--- debian/changelog	2012-11-14 15:23:28 +0000
+++ debian/changelog	2012-12-26 19:19:29 +0000
@@ -1,3 +1,10 @@
+gnome-games (1:3.6.1-0ubuntu3) raring; urgency=low
+
+  * fix-glines-crash.patch:
+    fix glines crash on startup (LP: #995281)
+
+ -- Julian Taylor <[e-mail]>  Wed, 26 Dec 2012 19:42:38 +0100
+
 gnome-games (1:3.6.1-0ubuntu2) raring; urgency=low
 
   * Remove obsolete libgstreamer0.10-dev BD. 
 
=== added file 'debian/patches/fix-glines-crash.patch'
--- debian/patches/fix-glines-crash.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/fix-glines-crash.patch	2012-12-26 19:19:29 +0000
@@ -0,0 +1,16 @@
+Description: prevent draw before preview is initinialized
+Origin: upstream bug
+Bug-Ubuntu: https://launchpad.net/bugs/995281
+Bug: https://bugzilla.gnome.org/show_bug.cgi?id=675628
+
+--- a/glines/src/glines.c
++++ b/glines/src/glines.c
+@@ -443,7 +443,7 @@
+ 
+   for (i = 0; i < MAXNPIECES; i++) {
+ 
+-    if (i < npieces)
++    if (i < npieces && preview[i] > 0 )
+       pattern = cairo_pattern_create_for_surface (preview_surfaces[preview[i] - 1]);
+     else
+       pattern = cairo_pattern_create_for_surface (blank_preview_surface);
 
=== modified file 'debian/patches/series'
--- debian/patches/series	2012-11-06 10:56:12 +0000
+++ debian/patches/series	2012-12-26 19:19:29 +0000
@@ -1,1 +1,2 @@
 02_desktop-path.patch
+fix-glines-crash.patch