Merge lp:~jbicha/gnome-games/3.1.91 into lp:~ubuntu-desktop/gnome-games/ubuntu

Proposed by Jeremy Bicha
Status: Merged
Merged at revision: 107
Proposed branch: lp:~jbicha/gnome-games/3.1.91
Merge into: lp:~ubuntu-desktop/gnome-games/ubuntu
Diff against target: 259 lines (+59/-49)
3 files modified
debian/changelog (+10/-0)
debian/glines.install (+1/-1)
debian/patches/01_lpi.patch (+48/-48)
To merge this branch: bzr merge lp:~jbicha/gnome-games/3.1.91
Reviewer Review Type Date Requested Status
Martin Pitt (community) Approve
Review via email: mp+74148@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Martin Pitt (pitti) wrote :

Thanks!

review: Approve

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 2011-09-02 06:12:56 +0000
3+++ debian/changelog 2011-09-06 00:03:28 +0000
4@@ -1,3 +1,13 @@
5+gnome-games (1:3.1.91-0ubuntu1) UNRELEASED; urgency=low
6+
7+ * New upstream release.
8+ - Glines ported to GSettings
9+ - Use correct player names in Four-in-a-Row Preferences (LP: #807574)
10+ * debian/glines.install: Install gsettings schema instead of gconf
11+ * debian/patches/01_lpi.patch: Refreshed
12+
13+ -- Jeremy Bicha <jbicha@ubuntu.com> Mon, 05 Sep 2011 19:21:15 -0400
14+
15 gnome-games (1:3.1.90-0ubuntu1) oneiric; urgency=low
16
17 * New upstream release.
18
19=== modified file 'debian/glines.install'
20--- debian/glines.install 2009-09-22 01:08:51 +0000
21+++ debian/glines.install 2011-09-06 00:03:28 +0000
22@@ -6,4 +6,4 @@
23 debian/tmp/usr/share/gnome-games/glines
24 debian/tmp/usr/share/gnome/help/glines
25 debian/tmp/usr/share/omf/glines
26-debian/tmp/etc/gconf/schemas/glines.schemas
27+debian/tmp/usr/share/glib-2.0/schemas/org.gnome.glines.gschema.xml
28
29=== modified file 'debian/patches/01_lpi.patch'
30--- debian/patches/01_lpi.patch 2011-08-16 01:09:45 +0000
31+++ debian/patches/01_lpi.patch 2011-09-06 00:03:28 +0000
32@@ -1,9 +1,9 @@
33 Description: Add Launchpad integration
34 Forwarded: Not needed
35-Index: gnome-games-3.1.5/glines/glines.c
36+Index: gnome-games-3.1.91/glines/glines.c
37 ===================================================================
38---- gnome-games-3.1.5.orig/glines/glines.c 2011-07-25 16:27:20.000000000 -0400
39-+++ gnome-games-3.1.5/glines/glines.c 2011-08-15 16:07:59.707502149 -0400
40+--- gnome-games-3.1.91.orig/glines/glines.c 2011-09-05 16:30:15.000000000 -0400
41++++ gnome-games-3.1.91/glines/glines.c 2011-09-05 19:30:17.219157046 -0400
42 @@ -33,6 +33,7 @@
43 #include <glib/gi18n.h>
44 #include <gtk/gtk.h>
45@@ -11,8 +11,8 @@
46 +#include <launchpad-integration.h>
47 #include <gdk/gdkkeysyms.h>
48
49- #include <libgames-support/games-conf.h>
50-@@ -1675,6 +1676,7 @@
51+ #include <libgames-support/games-files.h>
52+@@ -1668,6 +1669,7 @@
53 " </menu>"
54 " <menu action='HelpMenu'>"
55 " <menuitem action='Contents'/>"
56@@ -20,7 +20,7 @@
57 " <menuitem action='About'/>" " </menu>" " </menubar>" "</ui>";
58
59 static void
60-@@ -1696,6 +1698,9 @@
61+@@ -1689,6 +1691,9 @@
62 accel_group = gtk_ui_manager_get_accel_group (ui_manager);
63 gtk_window_add_accel_group (GTK_WINDOW (app), accel_group);
64
65@@ -30,10 +30,10 @@
66 scoreitem = gtk_ui_manager_get_widget (ui_manager,
67 "/MainMenu/GameMenu/Scores");
68 menubar = gtk_ui_manager_get_widget (ui_manager, "/MainMenu");
69-Index: gnome-games-3.1.5/gnect/src/main.c
70+Index: gnome-games-3.1.91/gnect/src/main.c
71 ===================================================================
72---- gnome-games-3.1.5.orig/gnect/src/main.c 2011-07-25 16:27:20.000000000 -0400
73-+++ gnome-games-3.1.5/gnect/src/main.c 2011-08-15 16:07:59.707502149 -0400
74+--- gnome-games-3.1.91.orig/gnect/src/main.c 2011-09-05 05:57:35.000000000 -0400
75++++ gnome-games-3.1.91/gnect/src/main.c 2011-09-05 19:30:17.219157046 -0400
76 @@ -27,6 +27,7 @@
77
78 #include <glib/gi18n.h>
79@@ -60,10 +60,10 @@
80 gtk_window_add_accel_group (GTK_WINDOW (app),
81 gtk_ui_manager_get_accel_group (ui_manager));
82
83-Index: gnome-games-3.1.5/gnibbles/main.c
84+Index: gnome-games-3.1.91/gnibbles/main.c
85 ===================================================================
86---- gnome-games-3.1.5.orig/gnibbles/main.c 2011-07-25 16:27:20.000000000 -0400
87-+++ gnome-games-3.1.5/gnibbles/main.c 2011-08-15 16:07:59.707502149 -0400
88+--- gnome-games-3.1.91.orig/gnibbles/main.c 2011-09-05 05:57:35.000000000 -0400
89++++ gnome-games-3.1.91/gnibbles/main.c 2011-09-05 19:30:17.229157060 -0400
90 @@ -29,6 +29,7 @@
91 #include <glib/gi18n.h>
92 #include <gtk/gtk.h>
93@@ -90,10 +90,10 @@
94 new_game_action = gtk_action_group_get_action (action_group, "NewGame");
95 scores_action = gtk_action_group_get_action (action_group, "Scores");
96 end_game_action = gtk_action_group_get_action (action_group, "EndGame");
97-Index: gnome-games-3.1.5/gnobots2/menu.c
98+Index: gnome-games-3.1.91/gnobots2/menu.c
99 ===================================================================
100---- gnome-games-3.1.5.orig/gnobots2/menu.c 2011-07-25 16:27:20.000000000 -0400
101-+++ gnome-games-3.1.5/gnobots2/menu.c 2011-08-15 16:07:59.717502695 -0400
102+--- gnome-games-3.1.91.orig/gnobots2/menu.c 2011-09-05 05:57:35.000000000 -0400
103++++ gnome-games-3.1.91/gnobots2/menu.c 2011-09-05 19:30:17.229157060 -0400
104 @@ -25,6 +25,7 @@
105
106 #include <glib/gi18n.h>
107@@ -120,10 +120,10 @@
108 scores_action = gtk_action_group_get_action (action_group, "Scores");
109 teleport_action = gtk_action_group_get_action (action_group, "Teleport");
110 random_action = gtk_action_group_get_action (action_group, "Random");
111-Index: gnome-games-3.1.5/quadrapassel/tetris.cpp
112+Index: gnome-games-3.1.91/quadrapassel/tetris.cpp
113 ===================================================================
114---- gnome-games-3.1.5.orig/quadrapassel/tetris.cpp 2011-07-25 16:27:20.000000000 -0400
115-+++ gnome-games-3.1.5/quadrapassel/tetris.cpp 2011-08-15 16:07:59.717502695 -0400
116+--- gnome-games-3.1.91.orig/quadrapassel/tetris.cpp 2011-09-05 05:57:37.000000000 -0400
117++++ gnome-games-3.1.91/quadrapassel/tetris.cpp 2011-09-05 19:30:17.229157060 -0400
118 @@ -28,6 +28,7 @@
119
120 #include <gdk/gdkkeysyms.h>
121@@ -151,10 +151,10 @@
122 accel_group = gtk_ui_manager_get_accel_group (ui_manager);
123 gtk_window_add_accel_group (GTK_WINDOW (w), accel_group);
124
125-Index: gnome-games-3.1.5/gnomine/gnomine.c
126+Index: gnome-games-3.1.91/gnomine/gnomine.c
127 ===================================================================
128---- gnome-games-3.1.5.orig/gnomine/gnomine.c 2011-08-01 14:49:35.000000000 -0400
129-+++ gnome-games-3.1.5/gnomine/gnomine.c 2011-08-15 16:07:59.717502695 -0400
130+--- gnome-games-3.1.91.orig/gnomine/gnomine.c 2011-09-05 05:57:36.000000000 -0400
131++++ gnome-games-3.1.91/gnomine/gnomine.c 2011-09-05 19:30:17.229157060 -0400
132 @@ -31,6 +31,7 @@
133 #include <glib/gi18n.h>
134 #include <gtk/gtk.h>
135@@ -182,10 +182,10 @@
136 hint_action = gtk_action_group_get_action (action_group, "Hint");
137
138 fullscreen_action = GTK_ACTION (games_fullscreen_action_new ("Fullscreen", GTK_WINDOW (window)));
139-Index: gnome-games-3.1.5/gnotski/gnotski.c
140+Index: gnome-games-3.1.91/gnotski/gnotski.c
141 ===================================================================
142---- gnome-games-3.1.5.orig/gnotski/gnotski.c 2011-07-25 16:27:20.000000000 -0400
143-+++ gnome-games-3.1.5/gnotski/gnotski.c 2011-08-15 16:07:59.717502695 -0400
144+--- gnome-games-3.1.91.orig/gnotski/gnotski.c 2011-09-05 05:57:36.000000000 -0400
145++++ gnome-games-3.1.91/gnotski/gnotski.c 2011-09-05 19:30:17.229157060 -0400
146 @@ -24,6 +24,7 @@
147 #include <string.h>
148 #include <stdlib.h>
149@@ -213,10 +213,10 @@
150 add_puzzle_menu (ui_manager);
151
152 accel_group = gtk_ui_manager_get_accel_group (ui_manager);
153-Index: gnome-games-3.1.5/gtali/gyahtzee.c
154+Index: gnome-games-3.1.91/gtali/gyahtzee.c
155 ===================================================================
156---- gnome-games-3.1.5.orig/gtali/gyahtzee.c 2011-07-25 16:27:20.000000000 -0400
157-+++ gnome-games-3.1.5/gtali/gyahtzee.c 2011-08-15 16:07:59.717502695 -0400
158+--- gnome-games-3.1.91.orig/gtali/gyahtzee.c 2011-09-05 05:57:36.000000000 -0400
159++++ gnome-games-3.1.91/gtali/gyahtzee.c 2011-09-05 19:30:17.229157060 -0400
160 @@ -43,6 +43,7 @@
161 #include <glib/gi18n.h>
162 #include <gtk/gtk.h>
163@@ -244,10 +244,10 @@
164 scores_action = gtk_action_group_get_action (action_group, "Scores");
165 undo_action = gtk_action_group_get_action (action_group, "Undo");
166 update_undo_sensitivity();
167-Index: gnome-games-3.1.5/iagno/gnothello.c
168+Index: gnome-games-3.1.91/iagno/gnothello.c
169 ===================================================================
170---- gnome-games-3.1.5.orig/iagno/gnothello.c 2011-08-13 18:22:46.000000000 -0400
171-+++ gnome-games-3.1.5/iagno/gnothello.c 2011-08-15 16:07:59.717502695 -0400
172+--- gnome-games-3.1.91.orig/iagno/gnothello.c 2011-09-05 05:57:36.000000000 -0400
173++++ gnome-games-3.1.91/iagno/gnothello.c 2011-09-05 19:30:17.229157060 -0400
174 @@ -40,6 +40,8 @@
175 #include <libgames-support/eggsmclient.h>
176 #endif /* WITH_SMCLIENT */
177@@ -275,10 +275,10 @@
178 table = gtk_table_new (1, 8, FALSE);
179
180 black_score = gtk_label_new (_("Dark:"));
181-Index: gnome-games-3.1.5/mahjongg/mahjongg.c
182+Index: gnome-games-3.1.91/mahjongg/mahjongg.c
183 ===================================================================
184---- gnome-games-3.1.5.orig/mahjongg/mahjongg.c 2011-08-06 13:38:12.000000000 -0400
185-+++ gnome-games-3.1.5/mahjongg/mahjongg.c 2011-08-15 16:07:59.717502695 -0400
186+--- gnome-games-3.1.91.orig/mahjongg/mahjongg.c 2011-09-05 05:57:36.000000000 -0400
187++++ gnome-games-3.1.91/mahjongg/mahjongg.c 2011-09-05 19:30:17.229157060 -0400
188 @@ -24,6 +24,7 @@
189 #include <glib/gi18n.h>
190 #include <gtk/gtk.h>
191@@ -306,10 +306,10 @@
192 restart_action = gtk_action_group_get_action (action_group, "RestartGame");
193 pause_action = GTK_ACTION (games_pause_action_new ("PauseGame"));
194 gtk_action_set_is_important (pause_action, TRUE);
195-Index: gnome-games-3.1.5/gnotravex/gnotravex.c
196+Index: gnome-games-3.1.91/gnotravex/gnotravex.c
197 ===================================================================
198---- gnome-games-3.1.5.orig/gnotravex/gnotravex.c 2011-07-25 16:27:20.000000000 -0400
199-+++ gnome-games-3.1.5/gnotravex/gnotravex.c 2011-08-15 16:07:59.717502695 -0400
200+--- gnome-games-3.1.91.orig/gnotravex/gnotravex.c 2011-09-05 05:57:36.000000000 -0400
201++++ gnome-games-3.1.91/gnotravex/gnotravex.c 2011-09-05 19:30:17.229157060 -0400
202 @@ -27,6 +27,7 @@
203 #include <glib/gi18n.h>
204 #include <gtk/gtk.h>
205@@ -336,10 +336,10 @@
206 new_game_action = gtk_action_group_get_action (action_group, "NewGame");
207 hint_action = gtk_action_group_get_action (action_group, "Hint");
208 solve_action = gtk_action_group_get_action (action_group, "Solve");
209-Index: gnome-games-3.1.5/configure.in
210+Index: gnome-games-3.1.91/configure.in
211 ===================================================================
212---- gnome-games-3.1.5.orig/configure.in 2011-08-01 14:49:35.000000000 -0400
213-+++ gnome-games-3.1.5/configure.in 2011-08-15 16:07:59.717502695 -0400
214+--- gnome-games-3.1.91.orig/configure.in 2011-09-05 05:57:35.000000000 -0400
215++++ gnome-games-3.1.91/configure.in 2011-09-05 19:30:17.229157060 -0400
216 @@ -355,7 +355,7 @@
217 AC_SUBST([GOBJECT_CFLAGS])
218 AC_SUBST([GOBJECT_LIBS])
219@@ -349,10 +349,10 @@
220 AC_SUBST([GTK_CFLAGS])
221 AC_SUBST([GTK_LIBS])
222
223-Index: gnome-games-3.1.5/glchess/src/Makefile.am
224+Index: gnome-games-3.1.91/glchess/src/Makefile.am
225 ===================================================================
226---- gnome-games-3.1.5.orig/glchess/src/Makefile.am 2011-07-25 16:27:20.000000000 -0400
227-+++ gnome-games-3.1.5/glchess/src/Makefile.am 2011-08-15 16:07:59.717502695 -0400
228+--- gnome-games-3.1.91.orig/glchess/src/Makefile.am 2011-09-05 05:57:35.000000000 -0400
229++++ gnome-games-3.1.91/glchess/src/Makefile.am 2011-09-05 19:30:17.229157060 -0400
230 @@ -74,6 +74,7 @@
231 --pkg gtk+-3.0 \
232 --pkg gdk-x11-3.0 \
233@@ -361,10 +361,10 @@
234 --pkg librsvg-2.0 \
235 --pkg posix \
236 --pkg sqlite3
237-Index: gnome-games-3.1.5/glchess/src/glchess.vala
238+Index: gnome-games-3.1.91/glchess/src/glchess.vala
239 ===================================================================
240---- gnome-games-3.1.5.orig/glchess/src/glchess.vala 2011-07-25 16:27:20.000000000 -0400
241-+++ gnome-games-3.1.5/glchess/src/glchess.vala 2011-08-15 16:07:59.717502695 -0400
242+--- gnome-games-3.1.91.orig/glchess/src/glchess.vala 2011-09-05 05:57:35.000000000 -0400
243++++ gnome-games-3.1.91/glchess/src/glchess.vala 2011-09-05 19:30:17.229157060 -0400
244 @@ -92,6 +92,9 @@
245 view_container = (Gtk.Container) builder.get_object ("view_container");
246 builder.connect_signals (this);
247@@ -375,10 +375,10 @@
248 info_bar = new Gtk.InfoBar ();
249 var content_area = (Gtk.Container) info_bar.get_content_area ();
250 view_box.pack_start (info_bar, false, true, 0);
251-Index: gnome-games-3.1.5/gnome-sudoku/src/lib/main.py
252+Index: gnome-games-3.1.91/gnome-sudoku/src/lib/main.py
253 ===================================================================
254---- gnome-games-3.1.5.orig/gnome-sudoku/src/lib/main.py 2011-07-25 16:27:20.000000000 -0400
255-+++ gnome-games-3.1.5/gnome-sudoku/src/lib/main.py 2011-08-15 16:07:59.717502695 -0400
256+--- gnome-games-3.1.91.orig/gnome-sudoku/src/lib/main.py 2011-09-05 05:57:36.000000000 -0400
257++++ gnome-games-3.1.91/gnome-sudoku/src/lib/main.py 2011-09-05 19:30:17.229157060 -0400
258 @@ -6,6 +6,7 @@
259 gi.require_version("Gtk", "3.0")
260

Subscribers

People subscribed via source and target branches

to all changes: