Dear maintainer,
Here is the NMU diff according to DevRef 5.11.1[1][2] for RC bug: #552885.
See the debian/patches directory for the important fixes. Feel free to
contact if you have any questions.
Thank you for maintaining the package,
Jari Aalto
[1] http://www.debian.org/doc/developers-reference/pkgs.html#nmu
[2] http://dep.debian.net/deps/dep1.html
lsdiff(1) of changes:
xbubble-0.5.11.2/debian/changelog
xbubble-0.5.11.2/debian/patches/10-game.c.patch
xbubble-0.5.11.2/debian/patches/series
xbubble-0.5.11.2/debian/source/format
diffstat for xbubble-0.5.11.2 xbubble-0.5.11.2
changelog | 14 ++++++++++
patches/10-game.c.patch | 65 ++++++++++++++++++++++++++++++++++++++++++++++++
patches/series | 1
source/format | 1
4 files changed, 81 insertions(+)
diff -Nru xbubble-0.5.11.2/debian/changelog xbubble-0.5.11.2/debian/changelog
--- xbubble-0.5.11.2/debian/changelog 2010-04-23 01:04:51.000000000 +0300
+++ xbubble-0.5.11.2/debian/changelog 2010-03-30 16:41:03.000000000 +0300
@@ -1,3 +1,17 @@
+xbubble (0.5.11.2-3.1) unstable; urgency=low
+
+ [Jari Aalto]
+ * Non-maintainer upload.
+ - Move to packaging format "3.0 (quilt)" due to patch.
+ * debian/patches
+ - (Number 10): Add patch to fix Gcc 4.4 error: declaration of 'round'
+ shadows a global declaration. Patch thanks to Ilya Barygin
+ <bary...@gmail.com>. (RC bug FTBFS serious; Closes: #552885).
+ * debian/source/format
+ - New file.
+
+ -- Jari Aalto <jari.aa...@cante.net> Tue, 30 Mar 2010 16:41:03 +0300
+
xbubble (0.5.11.2-3) unstable; urgency=low
* Check return value of more functions (Closes: #511922).
diff -Nru xbubble-0.5.11.2/debian/patches/10-game.c.patch xbubble-0.5.11.2/debian/patches/10-game.c.patch
--- xbubble-0.5.11.2/debian/patches/10-game.c.patch 1970-01-01 02:00:00.000000000 +0200
+++ xbubble-0.5.11.2/debian/patches/10-game.c.patch 2010-03-30 16:34:11.000000000 +0300
@@ -0,0 +1,65 @@
+From 33e5508f710b2d78674461fed16befde0f6f6c8f Mon Sep 17 00:00:00 2001
+From: Jari Aalto <jari.aa...@cante.net>
+Date: Tue, 30 Mar 2010 16:33:44 +0300
+Subject: [PATCH] Fix error: declaration of 'round' shadows a global declaration
+Organization: Private
+Content-Type: text/plain; charset="utf-8"
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Jari Aalto <jari.aa...@cante.net>
+---
+ src/game.c | 4 ++--
+ src/xbubble.c | 6 +++---
+ 2 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/src/game.c b/src/game.c
+index cabd993..31e1342 100644
+--- a/src/game.c
++++ b/src/game.c
+@@ -187,7 +187,7 @@ static void display_cups( Game game, int n, int on ) {
+ Game new_game( enum GameMode mode,
+ RuleSet_t *ruleset,
+ int *colors,
+- int round,
++ int round_now,
+ int *score,
+ enum Level level ) {
+
+@@ -200,7 +200,7 @@ Game new_game( enum GameMode mode,
+ game->state = PLAYING;
+ game->mode = mode;
+ game->score = score;
+- game->round = round;
++ game->round = round_now;
+ for ( i = 0; i < 2; i++ ) {
+ game->player_left[i] = 0;
+ game->player_right[i] = 0;
+diff --git a/src/xbubble.c b/src/xbubble.c
+index 8763c05..0f84d25 100644
+--- a/src/xbubble.c
++++ b/src/xbubble.c
+@@ -116,7 +116,7 @@ static void play_challenge_game( int *handicap ) {
+ }
+
+ static void play_match( enum GameMode mode, int *handicap, enum Level level ) {
+- int round;
++ int game_round;
+ int done;
+ int score[2];
+ int games[2] = { 0, 0 };
+@@ -132,10 +132,10 @@ static void play_match( enum GameMode mode, int *handicap, enum Level level ) {
+ score[0] = 0;
+ score[1] = 0;
+ done = 0;
+- for ( round = 1; !done; round++ ) {
++ for ( game_round = 1; !done; game_round++ ) {
+ /* preload bubbles */
+ create_randome_level(5);
+- game = new_game( mode, ruleset, colors, round, score, level);
++ game = new_game( mode, ruleset, colors, game_round, score, level);
+ result = play_game(game);
+ done = score[1]==2 || score[0]==2 || result == ABORTED;
+ //not_done= (!(((score[1]>=5)&&(score[1]-score[0]>1)) ||
+--
+1.7.0
+
diff -Nru xbubble-0.5.11.2/debian/patches/series xbubble-0.5.11.2/debian/patches/series
--- xbubble-0.5.11.2/debian/patches/series 1970-01-01 02:00:00.000000000 +0200
+++ xbubble-0.5.11.2/debian/patches/series 2010-03-30 16:49:53.000000000 +0300
@@ -0,0 +1 @@
+10-game.c.patch
diff -Nru xbubble-0.5.11.2/debian/source/format xbubble-0.5.11.2/debian/source/format
--- xbubble-0.5.11.2/debian/source/format 1970-01-01 02:00:00.000000000 +0200
+++ xbubble-0.5.11.2/debian/source/format 2010-03-30 16:34:07.000000000 +0300
@@ -0,0 +1 @@
+3.0 (quilt)
