Author: fabian-guest Date: 2011-10-31 12:25:02 +0000 (Mon, 31 Oct 2011) New Revision: 12740
Added: packages/trunk/invaders/debian/patches/01-misspelling-loose.patch packages/trunk/invaders/debian/patches/01-uint8-char.patch Removed: packages/trunk/invaders/debian/patches/01-pointer-targets-differ-in-signedness.patch Modified: packages/trunk/invaders/debian/changelog packages/trunk/invaders/debian/patches/series Log: Split 01-pointer-targets-differ-in-signedness.patch into two separate patches: 01-misspelling-loose.patch and 01-uint8-char.patch. Modified: packages/trunk/invaders/debian/changelog =================================================================== --- packages/trunk/invaders/debian/changelog 2011-10-31 12:07:48 UTC (rev 12739) +++ packages/trunk/invaders/debian/changelog 2011-10-31 12:25:02 UTC (rev 12740) @@ -1,6 +1,7 @@ invaders (1.0.0-12) UNRELEASED; urgency=low - * + * Split 01-pointer-targets-differ-in-signedness.patch into two separate + patches: 01-misspelling-loose.patch and 01-uint8-char.patch. -- Fabian Greffrath <[email protected]> Mon, 31 Oct 2011 13:10:20 +0100 Added: packages/trunk/invaders/debian/patches/01-misspelling-loose.patch =================================================================== --- packages/trunk/invaders/debian/patches/01-misspelling-loose.patch (rev 0) +++ packages/trunk/invaders/debian/patches/01-misspelling-loose.patch 2011-10-31 12:25:02 UTC (rev 12740) @@ -0,0 +1,15 @@ +Author: Daniel Kahn Gillmor <[email protected]> +Description: Fix misspelling: "YOU LOOSE" should be "YOU LOSE". +Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=478928 + +--- invaders-1.0.0.orig/game.c ++++ invaders-1.0.0/game.c +@@ -198,7 +198,7 @@ void displaygameover() + + video_usecolor(6,1); + video_putstring(30,10," GAME OVER "); +- video_putstring(30,11,winner ? " YOU WIN " : " YOU LOOSE "); ++ video_putstring(30,11,winner ? " YOU WIN " : " YOU LOSE "); + video_putstring(30,12," PRESS ESC "); + video_update(); + do{ Deleted: packages/trunk/invaders/debian/patches/01-pointer-targets-differ-in-signedness.patch =================================================================== --- packages/trunk/invaders/debian/patches/01-pointer-targets-differ-in-signedness.patch 2011-10-31 12:07:48 UTC (rev 12739) +++ packages/trunk/invaders/debian/patches/01-pointer-targets-differ-in-signedness.patch 2011-10-31 12:25:02 UTC (rev 12740) @@ -1,35 +0,0 @@ -Use (char *) instead of (uint8 *) and fix a spelling error. - ---- invaders-1.0.0.orig/video.c -+++ invaders-1.0.0/video.c -@@ -36,7 +36,7 @@ - video_putchar(x+1,y,hextab[hex&15]); - }; - --void video_putstring(int32 x, int32 y, uint8 *str) -+void video_putstring(int32 x, int32 y, char *str) - { - while (*str) video_putchar(x++,y,*(str++)); - }; ---- invaders-1.0.0.orig/video.h -+++ invaders-1.0.0/video.h -@@ -8,7 +8,7 @@ - void video_putchar(int32 x, int32 y, uint8 code); - void video_fill(int32 x, int32 y, int32 width, int32 height, uint8 code); - void video_puthex8(int32 x, int32 y, uint8 hex); --void video_putstring(int32 x, int32 y, uint8 *str); -+void video_putstring(int32 x, int32 y, char *str); - - // immediate effect - void video_update(); ---- invaders-1.0.0.orig/game.c -+++ invaders-1.0.0/game.c -@@ -198,7 +198,7 @@ - - video_usecolor(6,1); - video_putstring(30,10," GAME OVER "); -- video_putstring(30,11,winner ? " YOU WIN " : " YOU LOOSE "); -+ video_putstring(30,11,winner ? " YOU WIN " : " YOU LOSE "); - video_putstring(30,12," PRESS ESC "); - video_update(); - do{ Added: packages/trunk/invaders/debian/patches/01-uint8-char.patch =================================================================== --- packages/trunk/invaders/debian/patches/01-uint8-char.patch (rev 0) +++ packages/trunk/invaders/debian/patches/01-uint8-char.patch 2011-10-31 12:25:02 UTC (rev 12740) @@ -0,0 +1,27 @@ +Author: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006 at gmx.net> +Origin: http://www.coreboot.org/pipermail/coreboot/2009-April/046558.html +Description: Use (char *) instead of (uint8 *) to avoid + "pointer targets [...] differ in signedness" warnings when passing a string. + +--- invaders-1.0.0.orig/video.c ++++ invaders-1.0.0/video.c +@@ -36,7 +36,7 @@ void video_puthex8(int32 x, int32 y, uin + video_putchar(x+1,y,hextab[hex&15]); + }; + +-void video_putstring(int32 x, int32 y, uint8 *str) ++void video_putstring(int32 x, int32 y, char *str) + { + while (*str) video_putchar(x++,y,*(str++)); + }; +--- invaders-1.0.0.orig/video.h ++++ invaders-1.0.0/video.h +@@ -8,7 +8,7 @@ void video_usecolor(uint8 fg, uint8 bg); + void video_putchar(int32 x, int32 y, uint8 code); + void video_fill(int32 x, int32 y, int32 width, int32 height, uint8 code); + void video_puthex8(int32 x, int32 y, uint8 hex); +-void video_putstring(int32 x, int32 y, uint8 *str); ++void video_putstring(int32 x, int32 y, char *str); + + // immediate effect + void video_update(); Modified: packages/trunk/invaders/debian/patches/series =================================================================== --- packages/trunk/invaders/debian/patches/series 2011-10-31 12:07:48 UTC (rev 12739) +++ packages/trunk/invaders/debian/patches/series 2011-10-31 12:25:02 UTC (rev 12740) @@ -1,3 +1,4 @@ -01-pointer-targets-differ-in-signedness.patch +01-misspelling-loose.patch +01-uint8-char.patch 02-gcc-ldflags.patch 03-reboot-on-esc.patch _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
