Ubuntu
gnome-games package

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

  1. Quantal (12.10)
  2. lp-995281
  3. Merge into quantal
Proposed by Julian Taylor
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 Pending
Review via email: mp+141288@code.launchpad.net
To post a comment you must log in.
Revision history for this message
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
=== removed directory '.pc/03_add-keywords.patch'
=== removed directory '.pc/03_add-keywords.patch/gnomine'
=== removed directory '.pc/03_add-keywords.patch/gnomine/data'
=== removed file '.pc/03_add-keywords.patch/gnomine/data/gnomine.desktop.in.in'
--- .pc/03_add-keywords.patch/gnomine/data/gnomine.desktop.in.in 2012-08-08 09:42:59 +0000
+++ .pc/03_add-keywords.patch/gnomine/data/gnomine.desktop.in.in 1970-01-01 00:00:00 +0000
@@ -1,14 +0,0 @@
1[Desktop Entry]
2_Name=Mines
3_Comment=Clear hidden mines from a minefield
4Exec=/usr/games/gnomine
5Icon=gnomine
6Terminal=false
7Type=Application
8Categories=GNOME;GTK;Game;LogicGame;
9_Keywords=minesweeper;
10X-GNOME-Bugzilla-Bugzilla=GNOME
11X-GNOME-Bugzilla-Product=gnome-games
12X-GNOME-Bugzilla-Component=BugBuddyBugs
13X-GNOME-Bugzilla-Version=@VERSION@
14StartupNotify=true
150
=== removed directory '.pc/03_add-keywords.patch/gtali'
=== removed directory '.pc/03_add-keywords.patch/gtali/data'
=== removed file '.pc/03_add-keywords.patch/gtali/data/gtali.desktop.in.in'
--- .pc/03_add-keywords.patch/gtali/data/gtali.desktop.in.in 2012-08-08 09:42:59 +0000
+++ .pc/03_add-keywords.patch/gtali/data/gtali.desktop.in.in 1970-01-01 00:00:00 +0000
@@ -1,14 +0,0 @@
1[Desktop Entry]
2_Name=Tali
3_Comment=Beat the odds in a poker-style dice game
4Exec=/usr/games/gtali
5Icon=gtali
6Terminal=false
7Type=Application
8Categories=GNOME;GTK;Game;CardGame;
9_Keywords=yahtzee;
10X-GNOME-Bugzilla-Bugzilla=GNOME
11X-GNOME-Bugzilla-Product=gnome-games
12X-GNOME-Bugzilla-Component=BugBuddyBugs
13X-GNOME-Bugzilla-Version=@VERSION@
14StartupNotify=true
150
=== removed directory '.pc/03_add-keywords.patch/iagno'
=== removed directory '.pc/03_add-keywords.patch/iagno/data'
=== removed file '.pc/03_add-keywords.patch/iagno/data/iagno.desktop.in.in'
--- .pc/03_add-keywords.patch/iagno/data/iagno.desktop.in.in 2012-08-08 09:42:59 +0000
+++ .pc/03_add-keywords.patch/iagno/data/iagno.desktop.in.in 1970-01-01 00:00:00 +0000
@@ -1,14 +0,0 @@
1[Desktop Entry]
2Icon=iagno
3_Name=Iagno
4_Comment=Dominate the board in a classic version of Reversi
5Exec=/usr/games/iagno
6Terminal=false
7Type=Application
8Categories=GNOME;GTK;Game;BoardGame;
9_Keywords=othello;
10X-GNOME-Bugzilla-Bugzilla=GNOME
11X-GNOME-Bugzilla-Product=gnome-games
12X-GNOME-Bugzilla-Component=BugBuddyBugs
13X-GNOME-Bugzilla-Version=@VERSION@
14StartupNotify=true
150
=== removed directory '.pc/03_add-keywords.patch/quadrapassel'
=== removed directory '.pc/03_add-keywords.patch/quadrapassel/data'
=== removed file '.pc/03_add-keywords.patch/quadrapassel/data/quadrapassel.desktop.in.in'
--- .pc/03_add-keywords.patch/quadrapassel/data/quadrapassel.desktop.in.in 2012-08-08 09:42:59 +0000
+++ .pc/03_add-keywords.patch/quadrapassel/data/quadrapassel.desktop.in.in 1970-01-01 00:00:00 +0000
@@ -1,14 +0,0 @@
1[Desktop Entry]
2_Name=Quadrapassel
3_Comment=Fit falling blocks together
4Icon=quadrapassel
5Exec=/usr/games/quadrapassel
6Terminal=false
7Type=Application
8Categories=GNOME;GTK;Game;BlocksGame;
9_Keywords=tetris;
10X-GNOME-Bugzilla-Bugzilla=GNOME
11X-GNOME-Bugzilla-Product=gnome-games
12X-GNOME-Bugzilla-Component=BugBuddyBugs
13X-GNOME-Bugzilla-Version=@VERSION@
14StartupNotify=true
150
=== modified file '.pc/applied-patches'
--- .pc/applied-patches 2012-07-16 10:28:28 +0000
+++ .pc/applied-patches 2012-12-26 19:18:35 +0000
@@ -1,2 +1,1 @@
102_desktop-path.patch102_desktop-path.patch
203_add-keywords.patch
32
=== modified file 'debian/changelog'
--- debian/changelog 2012-09-26 17:15:26 +0000
+++ debian/changelog 2012-12-26 19:18:35 +0000
@@ -1,3 +1,22 @@
1gnome-games (1:3.6.0.2-0ubuntu1.2) quantal-proposed; urgency=low
2
3 * fix-glines-crash.patch:
4 fix glines crash on startup (LP: #995281)
5
6 -- Julian Taylor <jtaylor@ubuntu.com> Wed, 26 Dec 2012 20:15:01 +0100
7
8gnome-games (1:3.6.0.2-0ubuntu1.1) quantal-proposed; urgency=low
9
10 [ Jeremy Bicha ]
11 * debian/patches/03_add-keywords.patch:
12 - Dropped, already applied
13
14 [ Robert Ancell ]
15 * debian/scores/gnome-mahjongg.inst:
16 - Fix name of score files (LP: #1074861)
17
18 -- Robert Ancell <robert.ancell@canonical.com> Tue, 06 Nov 2012 10:56:12 +1300
19
1gnome-games (1:3.6.0.2-0ubuntu1) quantal; urgency=low20gnome-games (1:3.6.0.2-0ubuntu1) quantal; urgency=low
221
3 * New upstream release.22 * New upstream release.
423
=== removed file 'debian/patches/03_add-keywords.patch'
--- debian/patches/03_add-keywords.patch 2012-05-24 09:33:38 +0000
+++ debian/patches/03_add-keywords.patch 1970-01-01 00:00:00 +0000
@@ -1,42 +0,0 @@
1Description: Add keywords to improve searching
2Forwarded: no
3Index: gnome-games-3.1.3/gnomine/data/gnomine.desktop.in.in
4===================================================================
5--- gnome-games-3.1.3.orig/gnomine/data/gnomine.desktop.in.in 2011-07-19 11:45:19.773862648 -0400
6+++ gnome-games-3.1.3/gnomine/data/gnomine.desktop.in.in 2011-07-19 11:45:26.603986390 -0400
7@@ -10,4 +10,5 @@
8 X-GNOME-Bugzilla-Product=gnome-games
9 X-GNOME-Bugzilla-Component=BugBuddyBugs
10 X-GNOME-Bugzilla-Version=@VERSION@
11+Keywords=minesweeper
12 StartupNotify=true
13Index: gnome-games-3.1.3/gtali/data/gtali.desktop.in.in
14===================================================================
15--- gnome-games-3.1.3.orig/gtali/data/gtali.desktop.in.in 2011-07-19 11:44:47.733328906 -0400
16+++ gnome-games-3.1.3/gtali/data/gtali.desktop.in.in 2011-07-19 11:44:55.533451465 -0400
17@@ -10,4 +10,5 @@
18 X-GNOME-Bugzilla-Product=gnome-games
19 X-GNOME-Bugzilla-Component=BugBuddyBugs
20 X-GNOME-Bugzilla-Version=@VERSION@
21+Keywords=yahtzee
22 StartupNotify=true
23Index: gnome-games-3.1.3/iagno/data/iagno.desktop.in.in
24===================================================================
25--- gnome-games-3.1.3.orig/iagno/data/iagno.desktop.in.in 2011-07-19 11:44:29.633064072 -0400
26+++ gnome-games-3.1.3/iagno/data/iagno.desktop.in.in 2011-07-19 11:44:36.143156089 -0400
27@@ -10,4 +10,5 @@
28 X-GNOME-Bugzilla-Product=gnome-games
29 X-GNOME-Bugzilla-Component=BugBuddyBugs
30 X-GNOME-Bugzilla-Version=@VERSION@
31+Keywords=othello
32 StartupNotify=true
33Index: gnome-games-3.1.3/quadrapassel/data/quadrapassel.desktop.in.in
34===================================================================
35--- gnome-games-3.1.3.orig/quadrapassel/data/quadrapassel.desktop.in.in 2011-07-19 11:45:01.893554989 -0400
36+++ gnome-games-3.1.3/quadrapassel/data/quadrapassel.desktop.in.in 2011-07-19 11:45:08.923673070 -0400
37@@ -10,4 +10,5 @@
38 X-GNOME-Bugzilla-Product=gnome-games
39 X-GNOME-Bugzilla-Component=BugBuddyBugs
40 X-GNOME-Bugzilla-Version=@VERSION@
41+Keywords=tetris
42 StartupNotify=true
430
=== 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:18:35 +0000
@@ -0,0 +1,16 @@
1Description: prevent draw before preview is initinialized
2Origin: upstream bug
3Bug-Ubuntu: https://launchpad.net/bugs/995281
4Bug: https://bugzilla.gnome.org/show_bug.cgi?id=675628
5
6--- a/glines/src/glines.c
7+++ b/glines/src/glines.c
8@@ -443,7 +443,7 @@
9
10 for (i = 0; i < MAXNPIECES; i++) {
11
12- if (i < npieces)
13+ if (i < npieces && preview[i] > 0 )
14 pattern = cairo_pattern_create_for_surface (preview_surfaces[preview[i] - 1]);
15 else
16 pattern = cairo_pattern_create_for_surface (blank_preview_surface);
017
=== modified file 'debian/patches/series'
--- debian/patches/series 2012-07-16 10:28:28 +0000
+++ debian/patches/series 2012-12-26 19:18:35 +0000
@@ -1,2 +1,2 @@
102_desktop-path.patch102_desktop-path.patch
203_add-keywords.patch2fix-glines-crash.patch
33
=== modified file 'debian/scores/gnome-mahjongg.inst'
--- debian/scores/gnome-mahjongg.inst 2012-08-08 09:42:59 +0000
+++ debian/scores/gnome-mahjongg.inst 2012-12-26 19:18:35 +0000
@@ -1,9 +1,9 @@
1mahjongg.bridges.scores1gnome-mahjongg.bridges.scores
2mahjongg.cloud.scores2gnome-mahjongg.cloud.scores
3mahjongg.confounding.scores3gnome-mahjongg.confounding.scores
4mahjongg.difficult.scores4gnome-mahjongg.difficult.scores
5mahjongg.dragon.scores5gnome-mahjongg.dragon.scores
6mahjongg.easy.scores6gnome-mahjongg.easy.scores
7mahjongg.pyramid.scores7gnome-mahjongg.pyramid.scores
8mahjongg.tictactoe.scores8gnome-mahjongg.tictactoe.scores
9mahjongg.ziggurat.scores9gnome-mahjongg.ziggurat.scores
1010
=== modified file 'gnomine/data/gnomine.desktop.in.in'
--- gnomine/data/gnomine.desktop.in.in 2012-08-08 09:42:59 +0000
+++ gnomine/data/gnomine.desktop.in.in 2012-12-26 19:18:35 +0000
@@ -11,5 +11,4 @@
11X-GNOME-Bugzilla-Product=gnome-games11X-GNOME-Bugzilla-Product=gnome-games
12X-GNOME-Bugzilla-Component=BugBuddyBugs12X-GNOME-Bugzilla-Component=BugBuddyBugs
13X-GNOME-Bugzilla-Version=@VERSION@13X-GNOME-Bugzilla-Version=@VERSION@
14Keywords=minesweeper
15StartupNotify=true14StartupNotify=true
1615
=== modified file 'gtali/data/gtali.desktop.in.in'
--- gtali/data/gtali.desktop.in.in 2012-08-08 09:42:59 +0000
+++ gtali/data/gtali.desktop.in.in 2012-12-26 19:18:35 +0000
@@ -11,5 +11,4 @@
11X-GNOME-Bugzilla-Product=gnome-games11X-GNOME-Bugzilla-Product=gnome-games
12X-GNOME-Bugzilla-Component=BugBuddyBugs12X-GNOME-Bugzilla-Component=BugBuddyBugs
13X-GNOME-Bugzilla-Version=@VERSION@13X-GNOME-Bugzilla-Version=@VERSION@
14Keywords=yahtzee
15StartupNotify=true14StartupNotify=true
1615
=== modified file 'iagno/data/iagno.desktop.in.in'
--- iagno/data/iagno.desktop.in.in 2012-08-08 09:42:59 +0000
+++ iagno/data/iagno.desktop.in.in 2012-12-26 19:18:35 +0000
@@ -11,5 +11,4 @@
11X-GNOME-Bugzilla-Product=gnome-games11X-GNOME-Bugzilla-Product=gnome-games
12X-GNOME-Bugzilla-Component=BugBuddyBugs12X-GNOME-Bugzilla-Component=BugBuddyBugs
13X-GNOME-Bugzilla-Version=@VERSION@13X-GNOME-Bugzilla-Version=@VERSION@
14Keywords=othello
15StartupNotify=true14StartupNotify=true
1615
=== modified file 'quadrapassel/data/quadrapassel.desktop.in.in'
--- quadrapassel/data/quadrapassel.desktop.in.in 2012-08-08 09:42:59 +0000
+++ quadrapassel/data/quadrapassel.desktop.in.in 2012-12-26 19:18:35 +0000
@@ -11,5 +11,4 @@
11X-GNOME-Bugzilla-Product=gnome-games11X-GNOME-Bugzilla-Product=gnome-games
12X-GNOME-Bugzilla-Component=BugBuddyBugs12X-GNOME-Bugzilla-Component=BugBuddyBugs
13X-GNOME-Bugzilla-Version=@VERSION@13X-GNOME-Bugzilla-Version=@VERSION@
14Keywords=tetris
15StartupNotify=true14StartupNotify=true

Subscribers

People subscribed via source and target branches