Author: miriam Date: 2009-08-25 22:43:10 +0000 (Tue, 25 Aug 2009) New Revision: 10215
Modified: packages/branches/zaz/miriam-i18n/debian/changelog packages/branches/zaz/miriam-i18n/debian/i18n/es.po packages/branches/zaz/miriam-i18n/debian/patches/add_gettext.patch packages/branches/zaz/miriam-i18n/debian/patches/configure_miss.patch packages/branches/zaz/miriam-i18n/debian/patches/no_music.patch packages/branches/zaz/miriam-i18n/debian/rules Log: Upgraded to newer version Modified: packages/branches/zaz/miriam-i18n/debian/changelog =================================================================== --- packages/branches/zaz/miriam-i18n/debian/changelog 2009-08-25 22:24:10 UTC (rev 10214) +++ packages/branches/zaz/miriam-i18n/debian/changelog 2009-08-25 22:43:10 UTC (rev 10215) @@ -1,9 +1,15 @@ -zaz (0.2.6+dfsg1-1+i18n.1) UNRELEASED; urgency=low +zaz (0.2.8+dfsg1-1+i18n.1) UNRELEASED; urgency=low * Added support for gettext and translated it into Spanish - -- Miriam Ruiz <[email protected]> Tue, 25 Aug 2009 02:25:28 +0200 + -- Miriam Ruiz <[email protected]> Wed, 26 Aug 2009 00:35:38 +0200 +zaz (0.2.8+dfsg1-1) UNRELEASED; urgency=low + + * New Upstream Release + + -- Miriam Ruiz <[email protected]> Wed, 26 Aug 2009 00:23:22 +0200 + zaz (0.2.6+dfsg1-1) unstable; urgency=low * Initial release. Closes: #543146 Modified: packages/branches/zaz/miriam-i18n/debian/i18n/es.po =================================================================== --- packages/branches/zaz/miriam-i18n/debian/i18n/es.po 2009-08-25 22:24:10 UTC (rev 10214) +++ packages/branches/zaz/miriam-i18n/debian/i18n/es.po 2009-08-25 22:43:10 UTC (rev 10215) @@ -8,7 +8,7 @@ "Project-Id-Version: es\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2009-08-25 02:16+0200\n" -"PO-Revision-Date: 2009-08-25 01:04+0200\n" +"PO-Revision-Date: 2009-08-25 03:07+0200\n" "Last-Translator: Miriam Ruiz <[email protected]>\n" "Language-Team: español <[email protected]>\n" "MIME-Version: 1.0\n" @@ -148,7 +148,6 @@ msgstr "¡¡Enhorabuena!! ¡¡Has triunfado!!" #: src/gameloop.cpp:511 -#, fuzzy msgid "You have a new hi score" msgstr "Tienes un nuevo record" @@ -179,3 +178,4 @@ #: data/data/level6.lvl:1 msgid "SuperZaz" msgstr "Super Zaz" + Modified: packages/branches/zaz/miriam-i18n/debian/patches/add_gettext.patch =================================================================== --- packages/branches/zaz/miriam-i18n/debian/patches/add_gettext.patch 2009-08-25 22:24:10 UTC (rev 10214) +++ packages/branches/zaz/miriam-i18n/debian/patches/add_gettext.patch 2009-08-25 22:43:10 UTC (rev 10215) @@ -1,5 +1,5 @@ ---- zaz-0.2.6.orig/src/Makefile.am -+++ zaz-0.2.6/src/Makefile.am +--- zaz-0.2.8.orig/src/Makefile.am ++++ zaz-0.2.8/src/Makefile.am @@ -58,7 +58,9 @@ hiscores.h \ hiscores.cpp \ @@ -12,7 +12,7 @@ zaz_LDFLAGS = --- /dev/null -+++ zaz-0.2.6/src/i18n.cpp ++++ zaz-0.2.8/src/i18n.cpp @@ -0,0 +1,31 @@ +// (c) 2009 Miriam Ruiz <[email protected]> +// @@ -46,7 +46,7 @@ + +bool GetTextInit::IsInit = false; --- /dev/null -+++ zaz-0.2.6/src/i18n.h ++++ zaz-0.2.8/src/i18n.h @@ -0,0 +1,29 @@ +// (c) 2009 Miriam Ruiz <[email protected]> +// @@ -77,8 +77,8 @@ +static GetTextInit gettext_init; + +#endif // __I18N_H__ ---- zaz-0.2.6.orig/src/common.h -+++ zaz-0.2.6/src/common.h +--- zaz-0.2.8.orig/src/common.h ++++ zaz-0.2.8/src/common.h @@ -40,6 +40,7 @@ #include <FTGL/ftgl.h> #include <GL/gl.h> @@ -87,25 +87,24 @@ #include "error.h" #include "settings.h" #include "hiscores.h" ---- zaz-0.2.6.orig/src/mainmenu.cpp -+++ zaz-0.2.6/src/mainmenu.cpp -@@ -28,11 +28,11 @@ - renderHiscores(true), showCredits(false), oldFullscreen(settings->getb("fullscreen", false)), - oldRes(settings->get("resolution", "")), logoGpl(LoadTexture ("gpl3.png")) +--- zaz-0.2.8.orig/src/mainmenu.cpp ++++ zaz-0.2.8/src/mainmenu.cpp +@@ -28,10 +28,10 @@ + renderHiscores(true), showCredits(false), showBrowser(false), oldFullscreen(settings->getb("fullscreen", false)), + oldRes(settings->get("resolution", "")), startup(true), browserSelectedLevel(-1) { - startMenu.Add(new GenericMenuItem("Start game", startMenuStartHandler, this)); -+ startMenu.Add(new GenericMenuItem(_("Start game"), startMenuStartHandler, this)); - // startMenu.Add("Practice"); - startMenu.Add(new GenericMenuItem("Options", startMenuOptionsHandler, this)); - startMenu.Add(new GenericMenuItem("Credits", startMenuCreditsHandler, this)); - startMenu.Add(new GenericMenuItem("Exit", startMenuExitHandler, this)); ++ startMenu.Add(new GenericMenuItem(_("Start game"), startMenuStartHandler, this)); + startMenu.Add(new GenericMenuItem(_("Options"), startMenuOptionsHandler, this)); + startMenu.Add(new GenericMenuItem(_("Credits"), startMenuCreditsHandler, this)); + startMenu.Add(new GenericMenuItem(_("Exit"), startMenuExitHandler, this)); startMenu.SetDimensions(60, 40, 40); -@@ -46,17 +46,17 @@ +@@ -45,17 +45,17 @@ resolutions.push_back(sm.str()); } @@ -130,8 +129,8 @@ + creditsMenu.Add(new GenericMenuItem(_("Back"), optionsMenuBackHandler, this)); creditsMenu.SetDimensions(30, 10, 40); - // load the textures -@@ -239,7 +239,7 @@ + +@@ -392,7 +392,7 @@ glScalef(0.15f, 0.15f, 0.15f); glColor4d(1.0, 1.0, 1.0, 1.0); @@ -140,7 +139,7 @@ glPopMatrix(); float y = 35; -@@ -265,13 +265,13 @@ +@@ -418,13 +418,13 @@ if (showCredits) { glColor4f(1.0, 1.0, 1.0, 1.0); @@ -159,11 +158,11 @@ + CenterMsg(_("Nine Inch Nails"), 34.5, font, 0.1); + CenterMsg(_("[http://nin.com] Released under Creative Commons Attribution Non-Commercial Share Alike License"), 32.5, font, 0.08); - glLoadIdentity(); - glEnable(GL_TEXTURE_2D); ---- zaz-0.2.6.orig/src/gameloop.cpp -+++ zaz-0.2.6/src/gameloop.cpp -@@ -53,22 +53,22 @@ + glLoadIdentity(); + glEnable(GL_TEXTURE_2D); +--- zaz-0.2.8.orig/src/gameloop.cpp ++++ zaz-0.2.8/src/gameloop.cpp +@@ -54,22 +54,22 @@ } }; @@ -196,7 +195,20 @@ gameOverMenu.SetDimensions(30, 40, 40); -@@ -442,7 +442,7 @@ +@@ -471,10 +471,10 @@ + glColor3d(1.0, 1.0, 1.0); + + char msgscore[256]; +- sprintf(msgscore, "Lives left: %d", livesLeft); ++ sprintf(msgscore, _("Lives left: %d"), livesLeft); + CenterMsg(msgscore, 50, font); + +- sprintf(msgscore, "Current score: %05d", score); ++ sprintf(msgscore, _("Current score: %05d"), score); + + CenterMsg(msgscore, 45, font); + } +@@ -482,7 +482,7 @@ if (showPauseMenu) { pauseMenu.Render(); @@ -204,21 +216,21 @@ + string msg = _("Game paused"); glColor3d(1.0, 0.0, 0.0); - CenterMsg(msg, 45, font); -@@ -455,10 +455,10 @@ + CenterMsg(msg, 45, font); +@@ -495,10 +495,10 @@ glLoadIdentity( ); - + glColor3d(1.0, 1.0, 1.0); -- CenterMsg("Level cleared", 50, font); -+ CenterMsg(_("Level cleared"), 50, font); +- CenterMsg("Level cleared", 50, font); ++ CenterMsg(_("Level cleared"), 50, font); - char msgscore[256]; + char msgscore[256]; - sprintf(msgscore, "Current score: %05d", score); + sprintf(msgscore, _("Current score: %05d"), score); - CenterMsg(msgscore, 45, font); - } -@@ -469,13 +469,13 @@ + CenterMsg(msgscore, 45, font); + } +@@ -509,13 +509,13 @@ gameOverMenu.Render(); glLoadIdentity( ); @@ -227,50 +239,50 @@ glColor3d(1.0, 0.0, 0.0); - CenterMsg(msg, 50, font); + CenterMsg(msg, 50, font); char msgscore[256]; - sprintf(msgscore, "Score: %05d", score); + sprintf(msgscore, _("Score: %05d"), score); glColor3d(1.0, 1.0, 1.0); - CenterMsg(msgscore, 45, font); + CenterMsg(msgscore, 45, font); } -@@ -483,7 +483,7 @@ +@@ -523,7 +523,7 @@ if (pwned && !hiScore) { glColor3d(1.0, 1.0, 1.0); -- CenterMsg("Congratulations !!! You just pwned", 90, font3); -+ CenterMsg(_("Congratulations !!! You just pwned"), 90, font3); +- CenterMsg("Congratulations !!! You just pwned", 90, font3); ++ CenterMsg(_("Congratulations !!! You just pwned"), 90, font3); - // logo - glLoadIdentity(); -@@ -508,8 +508,8 @@ - if (hiScore) - { + // logo + glLoadIdentity(); +@@ -548,8 +548,8 @@ + if (hiScore) + { glColor3d(1.0, 1.0, 1.0); -- CenterMsg("You have a new hi score", 65, font); -- CenterMsg("please enter your name", 60, font); -+ CenterMsg(_("You have a new hi score"), 65, font); -+ CenterMsg(_("please enter your name"), 60, font); - editor.Render(); - } +- CenterMsg("You have a new hi score", 65, font); +- CenterMsg("please enter your name", 60, font); ++ CenterMsg(_("You have a new hi score"), 65, font); ++ CenterMsg(_("please enter your name"), 60, font); + editor.Render(); + } } ---- zaz-0.2.6.orig/src/game.cpp -+++ zaz-0.2.6/src/game.cpp -@@ -487,7 +487,7 @@ - glLoadIdentity( ); - glPushMatrix(); +--- zaz-0.2.8.orig/src/game.cpp ++++ zaz-0.2.8/src/game.cpp +@@ -571,7 +571,7 @@ + glLoadIdentity( ); + glPushMatrix(); -- FTBBox b = font3->BBox(level.name.c_str()); -+ FTBBox b = font3->BBox(gettext(level.name.c_str())); - double tw = b.Upper().X() / 5; +- FTBBox b = font3->BBox(level.name.c_str()); ++ FTBBox b = font3->BBox(gettext(level.name.c_str())); + double tw = b.Upper().X() / 5; - glTranslated((100 - tw) / 2, 50, 5); -@@ -502,7 +502,7 @@ - glColor4d(1.0, 1.0, 1.0, alpha); + glTranslated((100 - tw) / 2, 50, 50); +@@ -586,7 +586,7 @@ + glColor4d(1.0, 1.0, 1.0, alpha); - glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); -- font3->Render(level.name.c_str()); -+ font3->Render(gettext(level.name.c_str())); - glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); + glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); +- font3->Render(level.name.c_str()); ++ font3->Render(gettext(level.name.c_str())); + glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); - glPopMatrix(); + glPopMatrix(); Modified: packages/branches/zaz/miriam-i18n/debian/patches/configure_miss.patch =================================================================== --- packages/branches/zaz/miriam-i18n/debian/patches/configure_miss.patch 2009-08-25 22:24:10 UTC (rev 10214) +++ packages/branches/zaz/miriam-i18n/debian/patches/configure_miss.patch 2009-08-25 22:43:10 UTC (rev 10215) @@ -1,5 +1,5 @@ ---- zaz-0.2.6.orig/configure.ac -+++ zaz-0.2.6/configure.ac +--- zaz-0.2.8.orig/configure.ac ++++ zaz-0.2.8/configure.ac @@ -22,6 +22,14 @@ AC_CHECK_HEADER(GL/glu.h, [], AC_MSG_ERROR(no GL/glu.h found)) AC_CHECK_HEADER(SDL/SDL_image.h, [], AC_MSG_ERROR(no SDL/SDL_image.h found)) Modified: packages/branches/zaz/miriam-i18n/debian/patches/no_music.patch =================================================================== --- packages/branches/zaz/miriam-i18n/debian/patches/no_music.patch 2009-08-25 22:24:10 UTC (rev 10214) +++ packages/branches/zaz/miriam-i18n/debian/patches/no_music.patch 2009-08-25 22:43:10 UTC (rev 10215) @@ -1,5 +1,5 @@ ---- zaz-0.2.6.orig/data/Makefile.am -+++ zaz-0.2.6/data/Makefile.am +--- zaz-0.2.8.orig/data/Makefile.am ++++ zaz-0.2.8/data/Makefile.am @@ -20,10 +20,6 @@ player.png\ FreeSans.ttf\ @@ -11,9 +11,9 @@ pull.ogg\ push.ogg\ ouch.ogg\ ---- zaz-0.2.6.orig/src/mainmenu.cpp -+++ zaz-0.2.6/src/mainmenu.cpp -@@ -89,8 +89,8 @@ +--- zaz-0.2.8.orig/src/mainmenu.cpp ++++ zaz-0.2.8/src/mainmenu.cpp +@@ -212,8 +212,8 @@ void MainMenu::StartMusic() { @@ -24,7 +24,7 @@ } void MainMenu::StopMusic() -@@ -269,9 +269,9 @@ +@@ -422,9 +422,9 @@ CenterMsg(_("Remigiusz Dybka"), 43.5, font, 0.1); CenterMsg(_("[[email protected]]"), 41.5, font, 0.08); @@ -35,5 +35,5 @@ + //CenterMsg(_("Nine Inch Nails"), 34.5, font, 0.1); + //CenterMsg(_("[http://nin.com] Released under Creative Commons Attribution Non-Commercial Share Alike License"), 32.5, font, 0.08); - glLoadIdentity(); - glEnable(GL_TEXTURE_2D); + glLoadIdentity(); + glEnable(GL_TEXTURE_2D); Modified: packages/branches/zaz/miriam-i18n/debian/rules =================================================================== --- packages/branches/zaz/miriam-i18n/debian/rules 2009-08-25 22:24:10 UTC (rev 10214) +++ packages/branches/zaz/miriam-i18n/debian/rules 2009-08-25 22:43:10 UTC (rev 10215) @@ -118,15 +118,15 @@ get-orig-source: dh_testdir dh_testroot - rm -f zaz-0.2.6.tar.gz - wget http://downloads.sourceforge.net/project/zaz/zaz-0.2.6.tar.gz?use_mirror=freefr - rm -rf zaz-0.2.6 - tar xvfz zaz-0.2.6.tar.gz - rm zaz-0.2.6.tar.gz + rm -f zaz-0.2.?.tar.gz + wget http://downloads.sourceforge.net/project/zaz/zaz-0.2.8.tar.gz?use_mirror=freefr + rm -rf zaz-0.2.? + tar xvfz zaz-0.2.?.tar.gz + rm zaz-0.2.?.tar.gz # Remove CC-by-sa-nc music by Nine Inch Nails - rm -f zaz-0.2.6/data/mus?.ogg - tar cvfz ../zaz_0.2.6+dfsg1.orig.tar.gz zaz-0.2.6 - rm -r zaz-0.2.6 + rm -f zaz-0.2.?/data/mus?.ogg + tar cvfz ../zaz_0.2.8+dfsg1.orig.tar.gz zaz-0.2.? + rm -r zaz-0.2.? binary: binary-indep binary-arch .PHONY: get-orig-source config build clean binary-indep binary-arch binary install _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
