[pkg-ggz-maintainers] Bug#643385: ggz-gtk-games: diff for NMU version 0.0.14.1-1.1
Ansgar Burchardt
ansgar at debian.org
Tue Dec 27 16:49:17 UTC 2011
tags 643385 + patch
tags 643385 + pending
thanks
Dear maintainer,
I've prepared an NMU for ggz-gtk-games (versioned as 0.0.14.1-1.1) and
uploaded it to DELAYED/2. Please feel free to tell me if I
should delay it longer.
Regards.
diff -u ggz-gtk-games-0.0.14.1/debian/control ggz-gtk-games-0.0.14.1/debian/control
--- ggz-gtk-games-0.0.14.1/debian/control
+++ ggz-gtk-games-0.0.14.1/debian/control
@@ -11,7 +11,7 @@
Package: ggz-gtk-games
Architecture: any
-Depends: ${shlibs:Depends}, ggz-gtk-games-data (>= ${source:Upstream-Version}), ggzcore-bin (>= ${source:Upstream-Version})
+Depends: ${misc:Depends}, ${shlibs:Depends}, ggz-gtk-games-data (>= ${source:Upstream-Version}), ggzcore-bin (>= ${source:Upstream-Version})
Recommends: ggz-gtk-client | ggz-core-client
Description: GGZ Gaming Zone: game clients collection for GTK+
GGZ games are games that can be played online against other people while
@@ -37,7 +37,7 @@
Package: ggz-gtk-games-data
Architecture: all
-Depends: ggz-gtk-games (>= ${source:Upstream-Version})
+Depends: ${misc:Depends}, ggz-gtk-games (>= ${source:Upstream-Version})
Description: GGZ Gaming Zone: multimedia data for game clients for GTK+
GGZ games are games that can be played online against other people while
all having some features in common, like table chat, seats configuration,
diff -u ggz-gtk-games-0.0.14.1/debian/changelog ggz-gtk-games-0.0.14.1/debian/changelog
--- ggz-gtk-games-0.0.14.1/debian/changelog
+++ ggz-gtk-games-0.0.14.1/debian/changelog
@@ -1,3 +1,11 @@
+ggz-gtk-games (0.0.14.1-1.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Fix build error with -Werror=format-security. (Closes: #643385)
+ * debian/control: Add ${misc:Depends}.
+
+ -- Ansgar Burchardt <ansgar at debian.org> Tue, 27 Dec 2011 17:33:06 +0100
+
ggz-gtk-games (0.0.14.1-1) unstable; urgency=low
[ Peter Eisentraut]
only in patch2:
unchanged:
--- ggz-gtk-games-0.0.14.1.orig/common/ggz_gtk.c
+++ ggz-gtk-games-0.0.14.1/common/ggz_gtk.c
@@ -73,8 +73,7 @@
GGZMod *mod;
if (!ggzmod_is_ggz_mode()) {
- printf(_("This program should only be run from within GGZ."));
- printf("\n");
+ printf("%s\n", _("This program should only be run from within GGZ."));
exit(1);
}
only in patch2:
unchanged:
--- ggz-gtk-games-0.0.14.1.orig/dots/game.c
+++ ggz-gtk-games-0.0.14.1/dots/game.c
@@ -219,7 +219,7 @@
if (ggz_write_int(game.fd, DOTS_SND_MOVE_V) < 0
|| ggz_write_char(game.fd, line_x) < 0
|| ggz_write_char(game.fd, top) < 0) {
- ggz_error_msg(_("Lost server connection"));
+ ggz_error_msg("%s", _("Lost server connection"));
exit(1);
}
} else {
@@ -244,7 +244,7 @@
if (ggz_write_int(game.fd, DOTS_SND_MOVE_H) < 0
|| ggz_write_char(game.fd, left) < 0
|| ggz_write_char(game.fd, line_y) < 0) {
- ggz_error_msg(_("Lost server connection"));
+ ggz_error_msg("%s", _("Lost server connection"));
exit(1);
}
}
only in patch2:
unchanged:
--- ggz-gtk-games-0.0.14.1.orig/dots/main.c
+++ ggz-gtk-games-0.0.14.1/dots/main.c
@@ -360,7 +360,7 @@
}
if (status < 0)
- ggz_error_msg(_("Client cheater!"));
+ ggz_error_msg("%s", _("Client cheater!"));
return (int)status;
}
only in patch2:
unchanged:
--- ggz-gtk-games-0.0.14.1.orig/ggzcards/game.c
+++ ggz-gtk-games-0.0.14.1/ggzcards/game.c
@@ -289,7 +289,7 @@
/* handle different cases */
if (num_winners == 0)
- snprintf(msg, sizeof(msg), _("There was no winner."));
+ snprintf(msg, sizeof(msg), "%s", _("There was no winner."));
else {
int i;
for (i = 0; i < num_winners; i++) {
@@ -307,7 +307,7 @@
ggzcards.players[winners[i]].name);
}
snprintf(msg + strlen(msg), sizeof(msg) - strlen(msg),
- _("won the game."));
+ "%s", _("won the game."));
}
table_show_player_list();
only in patch2:
unchanged:
--- ggz-gtk-games-0.0.14.1.orig/spades/gtk_io.c
+++ ggz-gtk-games-0.0.14.1/spades/gtk_io.c
@@ -430,7 +430,7 @@
gameState.bids[i + 2]);
}
} else {
- buf = g_strdup_printf(_(" Bid: "));
+ buf = g_strdup_printf("%s", _(" Bid: "));
}
gtk_label_set_text(GTK_LABEL(playArea->bids[i]), buf);
More information about the pkg-ggz-maintainers
mailing list