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

Proposed by Julian Taylor on 2012-12-26
Status: Merged
Merge reported by: Julian Taylor
Merged at revision: not available
Proposed branch: lp:~jtaylor/ubuntu/quantal/gnome-games/lp-995281
Merge into: lp:ubuntu/quantal/gnome-games
Diff against target: 257 lines (+45/-113)
14 files modified
.pc/03_add-keywords.patch/gnomine/data/gnomine.desktop.in.in (+0/-14)
.pc/03_add-keywords.patch/gtali/data/gtali.desktop.in.in (+0/-14)
.pc/03_add-keywords.patch/iagno/data/iagno.desktop.in.in (+0/-14)
.pc/03_add-keywords.patch/quadrapassel/data/quadrapassel.desktop.in.in (+0/-14)
.pc/applied-patches (+0/-1)
debian/changelog (+19/-0)
debian/patches/03_add-keywords.patch (+0/-42)
debian/patches/fix-glines-crash.patch (+16/-0)
debian/patches/series (+1/-1)
debian/scores/gnome-mahjongg.inst (+9/-9)
gnomine/data/gnomine.desktop.in.in (+0/-1)
gtali/data/gtali.desktop.in.in (+0/-1)
iagno/data/iagno.desktop.in.in (+0/-1)
quadrapassel/data/quadrapassel.desktop.in.in (+0/-1)
To merge this branch: bzr merge lp:~jtaylor/ubuntu/quantal/gnome-games/lp-995281
Reviewer Review Type Date Requested Status
Ubuntu branches 2012-12-26 Pending
Review via email: mp+141288@code.launchpad.net
To post a comment you must log in.
Michael Terry (mterry) wrote :

This already got merged. But I can't change the status to get it off the sponsor queue.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== removed directory '.pc/03_add-keywords.patch'
2=== removed directory '.pc/03_add-keywords.patch/gnomine'
3=== removed directory '.pc/03_add-keywords.patch/gnomine/data'
4=== removed file '.pc/03_add-keywords.patch/gnomine/data/gnomine.desktop.in.in'
5--- .pc/03_add-keywords.patch/gnomine/data/gnomine.desktop.in.in 2012-08-08 09:42:59 +0000
6+++ .pc/03_add-keywords.patch/gnomine/data/gnomine.desktop.in.in 1970-01-01 00:00:00 +0000
7@@ -1,14 +0,0 @@
8-[Desktop Entry]
9-_Name=Mines
10-_Comment=Clear hidden mines from a minefield
11-Exec=/usr/games/gnomine
12-Icon=gnomine
13-Terminal=false
14-Type=Application
15-Categories=GNOME;GTK;Game;LogicGame;
16-_Keywords=minesweeper;
17-X-GNOME-Bugzilla-Bugzilla=GNOME
18-X-GNOME-Bugzilla-Product=gnome-games
19-X-GNOME-Bugzilla-Component=BugBuddyBugs
20-X-GNOME-Bugzilla-Version=@VERSION@
21-StartupNotify=true
22
23=== removed directory '.pc/03_add-keywords.patch/gtali'
24=== removed directory '.pc/03_add-keywords.patch/gtali/data'
25=== removed file '.pc/03_add-keywords.patch/gtali/data/gtali.desktop.in.in'
26--- .pc/03_add-keywords.patch/gtali/data/gtali.desktop.in.in 2012-08-08 09:42:59 +0000
27+++ .pc/03_add-keywords.patch/gtali/data/gtali.desktop.in.in 1970-01-01 00:00:00 +0000
28@@ -1,14 +0,0 @@
29-[Desktop Entry]
30-_Name=Tali
31-_Comment=Beat the odds in a poker-style dice game
32-Exec=/usr/games/gtali
33-Icon=gtali
34-Terminal=false
35-Type=Application
36-Categories=GNOME;GTK;Game;CardGame;
37-_Keywords=yahtzee;
38-X-GNOME-Bugzilla-Bugzilla=GNOME
39-X-GNOME-Bugzilla-Product=gnome-games
40-X-GNOME-Bugzilla-Component=BugBuddyBugs
41-X-GNOME-Bugzilla-Version=@VERSION@
42-StartupNotify=true
43
44=== removed directory '.pc/03_add-keywords.patch/iagno'
45=== removed directory '.pc/03_add-keywords.patch/iagno/data'
46=== removed file '.pc/03_add-keywords.patch/iagno/data/iagno.desktop.in.in'
47--- .pc/03_add-keywords.patch/iagno/data/iagno.desktop.in.in 2012-08-08 09:42:59 +0000
48+++ .pc/03_add-keywords.patch/iagno/data/iagno.desktop.in.in 1970-01-01 00:00:00 +0000
49@@ -1,14 +0,0 @@
50-[Desktop Entry]
51-Icon=iagno
52-_Name=Iagno
53-_Comment=Dominate the board in a classic version of Reversi
54-Exec=/usr/games/iagno
55-Terminal=false
56-Type=Application
57-Categories=GNOME;GTK;Game;BoardGame;
58-_Keywords=othello;
59-X-GNOME-Bugzilla-Bugzilla=GNOME
60-X-GNOME-Bugzilla-Product=gnome-games
61-X-GNOME-Bugzilla-Component=BugBuddyBugs
62-X-GNOME-Bugzilla-Version=@VERSION@
63-StartupNotify=true
64
65=== removed directory '.pc/03_add-keywords.patch/quadrapassel'
66=== removed directory '.pc/03_add-keywords.patch/quadrapassel/data'
67=== removed file '.pc/03_add-keywords.patch/quadrapassel/data/quadrapassel.desktop.in.in'
68--- .pc/03_add-keywords.patch/quadrapassel/data/quadrapassel.desktop.in.in 2012-08-08 09:42:59 +0000
69+++ .pc/03_add-keywords.patch/quadrapassel/data/quadrapassel.desktop.in.in 1970-01-01 00:00:00 +0000
70@@ -1,14 +0,0 @@
71-[Desktop Entry]
72-_Name=Quadrapassel
73-_Comment=Fit falling blocks together
74-Icon=quadrapassel
75-Exec=/usr/games/quadrapassel
76-Terminal=false
77-Type=Application
78-Categories=GNOME;GTK;Game;BlocksGame;
79-_Keywords=tetris;
80-X-GNOME-Bugzilla-Bugzilla=GNOME
81-X-GNOME-Bugzilla-Product=gnome-games
82-X-GNOME-Bugzilla-Component=BugBuddyBugs
83-X-GNOME-Bugzilla-Version=@VERSION@
84-StartupNotify=true
85
86=== modified file '.pc/applied-patches'
87--- .pc/applied-patches 2012-07-16 10:28:28 +0000
88+++ .pc/applied-patches 2012-12-26 19:18:35 +0000
89@@ -1,2 +1,1 @@
90 02_desktop-path.patch
91-03_add-keywords.patch
92
93=== modified file 'debian/changelog'
94--- debian/changelog 2012-09-26 17:15:26 +0000
95+++ debian/changelog 2012-12-26 19:18:35 +0000
96@@ -1,3 +1,22 @@
97+gnome-games (1:3.6.0.2-0ubuntu1.2) quantal-proposed; urgency=low
98+
99+ * fix-glines-crash.patch:
100+ fix glines crash on startup (LP: #995281)
101+
102+ -- Julian Taylor <jtaylor@ubuntu.com> Wed, 26 Dec 2012 20:15:01 +0100
103+
104+gnome-games (1:3.6.0.2-0ubuntu1.1) quantal-proposed; urgency=low
105+
106+ [ Jeremy Bicha ]
107+ * debian/patches/03_add-keywords.patch:
108+ - Dropped, already applied
109+
110+ [ Robert Ancell ]
111+ * debian/scores/gnome-mahjongg.inst:
112+ - Fix name of score files (LP: #1074861)
113+
114+ -- Robert Ancell <robert.ancell@canonical.com> Tue, 06 Nov 2012 10:56:12 +1300
115+
116 gnome-games (1:3.6.0.2-0ubuntu1) quantal; urgency=low
117
118 * New upstream release.
119
120=== removed file 'debian/patches/03_add-keywords.patch'
121--- debian/patches/03_add-keywords.patch 2012-05-24 09:33:38 +0000
122+++ debian/patches/03_add-keywords.patch 1970-01-01 00:00:00 +0000
123@@ -1,42 +0,0 @@
124-Description: Add keywords to improve searching
125-Forwarded: no
126-Index: gnome-games-3.1.3/gnomine/data/gnomine.desktop.in.in
127-===================================================================
128---- gnome-games-3.1.3.orig/gnomine/data/gnomine.desktop.in.in 2011-07-19 11:45:19.773862648 -0400
129-+++ gnome-games-3.1.3/gnomine/data/gnomine.desktop.in.in 2011-07-19 11:45:26.603986390 -0400
130-@@ -10,4 +10,5 @@
131- X-GNOME-Bugzilla-Product=gnome-games
132- X-GNOME-Bugzilla-Component=BugBuddyBugs
133- X-GNOME-Bugzilla-Version=@VERSION@
134-+Keywords=minesweeper
135- StartupNotify=true
136-Index: gnome-games-3.1.3/gtali/data/gtali.desktop.in.in
137-===================================================================
138---- gnome-games-3.1.3.orig/gtali/data/gtali.desktop.in.in 2011-07-19 11:44:47.733328906 -0400
139-+++ gnome-games-3.1.3/gtali/data/gtali.desktop.in.in 2011-07-19 11:44:55.533451465 -0400
140-@@ -10,4 +10,5 @@
141- X-GNOME-Bugzilla-Product=gnome-games
142- X-GNOME-Bugzilla-Component=BugBuddyBugs
143- X-GNOME-Bugzilla-Version=@VERSION@
144-+Keywords=yahtzee
145- StartupNotify=true
146-Index: gnome-games-3.1.3/iagno/data/iagno.desktop.in.in
147-===================================================================
148---- gnome-games-3.1.3.orig/iagno/data/iagno.desktop.in.in 2011-07-19 11:44:29.633064072 -0400
149-+++ gnome-games-3.1.3/iagno/data/iagno.desktop.in.in 2011-07-19 11:44:36.143156089 -0400
150-@@ -10,4 +10,5 @@
151- X-GNOME-Bugzilla-Product=gnome-games
152- X-GNOME-Bugzilla-Component=BugBuddyBugs
153- X-GNOME-Bugzilla-Version=@VERSION@
154-+Keywords=othello
155- StartupNotify=true
156-Index: gnome-games-3.1.3/quadrapassel/data/quadrapassel.desktop.in.in
157-===================================================================
158---- gnome-games-3.1.3.orig/quadrapassel/data/quadrapassel.desktop.in.in 2011-07-19 11:45:01.893554989 -0400
159-+++ gnome-games-3.1.3/quadrapassel/data/quadrapassel.desktop.in.in 2011-07-19 11:45:08.923673070 -0400
160-@@ -10,4 +10,5 @@
161- X-GNOME-Bugzilla-Product=gnome-games
162- X-GNOME-Bugzilla-Component=BugBuddyBugs
163- X-GNOME-Bugzilla-Version=@VERSION@
164-+Keywords=tetris
165- StartupNotify=true
166
167=== added file 'debian/patches/fix-glines-crash.patch'
168--- debian/patches/fix-glines-crash.patch 1970-01-01 00:00:00 +0000
169+++ debian/patches/fix-glines-crash.patch 2012-12-26 19:18:35 +0000
170@@ -0,0 +1,16 @@
171+Description: prevent draw before preview is initinialized
172+Origin: upstream bug
173+Bug-Ubuntu: https://launchpad.net/bugs/995281
174+Bug: https://bugzilla.gnome.org/show_bug.cgi?id=675628
175+
176+--- a/glines/src/glines.c
177++++ b/glines/src/glines.c
178+@@ -443,7 +443,7 @@
179+
180+ for (i = 0; i < MAXNPIECES; i++) {
181+
182+- if (i < npieces)
183++ if (i < npieces && preview[i] > 0 )
184+ pattern = cairo_pattern_create_for_surface (preview_surfaces[preview[i] - 1]);
185+ else
186+ pattern = cairo_pattern_create_for_surface (blank_preview_surface);
187
188=== modified file 'debian/patches/series'
189--- debian/patches/series 2012-07-16 10:28:28 +0000
190+++ debian/patches/series 2012-12-26 19:18:35 +0000
191@@ -1,2 +1,2 @@
192 02_desktop-path.patch
193-03_add-keywords.patch
194+fix-glines-crash.patch
195
196=== modified file 'debian/scores/gnome-mahjongg.inst'
197--- debian/scores/gnome-mahjongg.inst 2012-08-08 09:42:59 +0000
198+++ debian/scores/gnome-mahjongg.inst 2012-12-26 19:18:35 +0000
199@@ -1,9 +1,9 @@
200-mahjongg.bridges.scores
201-mahjongg.cloud.scores
202-mahjongg.confounding.scores
203-mahjongg.difficult.scores
204-mahjongg.dragon.scores
205-mahjongg.easy.scores
206-mahjongg.pyramid.scores
207-mahjongg.tictactoe.scores
208-mahjongg.ziggurat.scores
209+gnome-mahjongg.bridges.scores
210+gnome-mahjongg.cloud.scores
211+gnome-mahjongg.confounding.scores
212+gnome-mahjongg.difficult.scores
213+gnome-mahjongg.dragon.scores
214+gnome-mahjongg.easy.scores
215+gnome-mahjongg.pyramid.scores
216+gnome-mahjongg.tictactoe.scores
217+gnome-mahjongg.ziggurat.scores
218
219=== modified file 'gnomine/data/gnomine.desktop.in.in'
220--- gnomine/data/gnomine.desktop.in.in 2012-08-08 09:42:59 +0000
221+++ gnomine/data/gnomine.desktop.in.in 2012-12-26 19:18:35 +0000
222@@ -11,5 +11,4 @@
223 X-GNOME-Bugzilla-Product=gnome-games
224 X-GNOME-Bugzilla-Component=BugBuddyBugs
225 X-GNOME-Bugzilla-Version=@VERSION@
226-Keywords=minesweeper
227 StartupNotify=true
228
229=== modified file 'gtali/data/gtali.desktop.in.in'
230--- gtali/data/gtali.desktop.in.in 2012-08-08 09:42:59 +0000
231+++ gtali/data/gtali.desktop.in.in 2012-12-26 19:18:35 +0000
232@@ -11,5 +11,4 @@
233 X-GNOME-Bugzilla-Product=gnome-games
234 X-GNOME-Bugzilla-Component=BugBuddyBugs
235 X-GNOME-Bugzilla-Version=@VERSION@
236-Keywords=yahtzee
237 StartupNotify=true
238
239=== modified file 'iagno/data/iagno.desktop.in.in'
240--- iagno/data/iagno.desktop.in.in 2012-08-08 09:42:59 +0000
241+++ iagno/data/iagno.desktop.in.in 2012-12-26 19:18:35 +0000
242@@ -11,5 +11,4 @@
243 X-GNOME-Bugzilla-Product=gnome-games
244 X-GNOME-Bugzilla-Component=BugBuddyBugs
245 X-GNOME-Bugzilla-Version=@VERSION@
246-Keywords=othello
247 StartupNotify=true
248
249=== modified file 'quadrapassel/data/quadrapassel.desktop.in.in'
250--- quadrapassel/data/quadrapassel.desktop.in.in 2012-08-08 09:42:59 +0000
251+++ quadrapassel/data/quadrapassel.desktop.in.in 2012-12-26 19:18:35 +0000
252@@ -11,5 +11,4 @@
253 X-GNOME-Bugzilla-Product=gnome-games
254 X-GNOME-Bugzilla-Component=BugBuddyBugs
255 X-GNOME-Bugzilla-Version=@VERSION@
256-Keywords=tetris
257 StartupNotify=true

Subscribers

People subscribed via source and target branches