r2935 - in packages/trunk/vodovod/debian: . patches

[Miriam Ruiz]

Author: baby-guest
Date: 2007-06-13 10:36:25 +0000 (Wed, 13 Jun 2007)
New Revision: 2935

Modified:
   packages/trunk/vodovod/debian/changelog
   packages/trunk/vodovod/debian/patches/datadir.patch
Log:
New upstream version: 1.10



Modified: packages/trunk/vodovod/debian/changelog
===================================================================
--- packages/trunk/vodovod/debian/changelog	2007-06-13 10:13:08 UTC (rev 2934)
+++ packages/trunk/vodovod/debian/changelog	2007-06-13 10:36:25 UTC (rev 2935)
@@ -1,3 +1,9 @@
+vodovod (1.10-1) unstable; urgency=low
+
+  * New Upstream Release.
+
+ -- Miriam Ruiz <little_miry at yahoo.es>  Wed, 13 Jun 2007 08:41:03 +0000
+
 vodovod (1.05-1) unstable; urgency=low
 
   * Initial release (Closes: #427976)

Modified: packages/trunk/vodovod/debian/patches/datadir.patch
===================================================================
--- packages/trunk/vodovod/debian/patches/datadir.patch	2007-06-13 10:13:08 UTC (rev 2934)
+++ packages/trunk/vodovod/debian/patches/datadir.patch	2007-06-13 10:36:25 UTC (rev 2935)
@@ -1,5 +1,5 @@
---- vodovod-1.05.orig/game.cpp
-+++ vodovod-1.05/game.cpp
+--- vodovod-1.10.orig/game.cpp
++++ vodovod-1.10/game.cpp
 @@ -29,7 +29,7 @@
  extern ResourceManager *Data;
  //-----------------------------------------------------------------------------
@@ -9,7 +9,7 @@
  {
      difficultyM = difficulty;
      SetupGame();
-@@ -148,7 +148,7 @@
+@@ -176,7 +176,7 @@
          mapM.RenderNextShape(*(queueM.begin()));
  
      SDL_Rect r;
@@ -18,8 +18,19 @@
      NjamSetRect(r, 363, 533);
      SDL_BlitSurface(next, 0, Screen, &r);
  
---- vodovod-1.05.orig/resource.h
-+++ vodovod-1.05/resource.h
+--- vodovod-1.10.orig/sutils.cpp
++++ vodovod-1.10/sutils.cpp
+@@ -374,7 +374,7 @@
+         throw Exiter(SDL_GetError());
+     printf("Ok.\n");
+ 
+-    SDL_Surface *icon = Data->getGfx("icon", "data/abicon.bmp");
++    SDL_Surface *icon = Data->getGfx("icon", DATADIR "/abicon.bmp");
+     if (!icon)
+         throw Exiter(SDL_GetError());
+     SDL_WM_SetIcon(icon, NULL);
+--- vodovod-1.10.orig/resource.h
++++ vodovod-1.10/resource.h
 @@ -20,6 +20,10 @@
  #ifndef MB_RESOURCE_H
  #define MB_RESOURCE_H
@@ -31,9 +42,9 @@
  #include <string>
  #include <map>
  #include "SDL.h"
---- vodovod-1.05.orig/allmenus.cpp
-+++ vodovod-1.05/allmenus.cpp
-@@ -33,7 +33,7 @@
+--- vodovod-1.10.orig/allmenus.cpp
++++ vodovod-1.10/allmenus.cpp
+@@ -36,7 +36,7 @@
  //-----------------------------------------------------------------------------
  MainMenu::MainMenu(NjamFont *font_ptr, int x, int y):
      Menu(font_ptr, x, y),
@@ -51,9 +62,9 @@
      int row = 10;
      const int col = 16;
      font.WriteTextColRow(Screen, col, row++, "GOAL OF THE GAME IS TO USE PIPES TO CONNECT THE HOUSE AT THE TOP");
---- vodovod-1.05.orig/map.cpp
-+++ vodovod-1.05/map.cpp
-@@ -401,7 +401,7 @@
+--- vodovod-1.10.orig/map.cpp
++++ vodovod-1.10/map.cpp
+@@ -433,7 +433,7 @@
  {
      SDL_Rect r;
      RenderBackground(xStartM*60 - 27);  // 633 = 11
@@ -62,28 +73,17 @@
      NjamSetRect(r, 12, 529);
      SDL_BlitSurface(tank, 0, Screen, &r);
  
---- vodovod-1.05.orig/main.cpp
-+++ vodovod-1.05/main.cpp
-@@ -54,7 +54,7 @@
-         throw Exiter(SDL_GetError());
-     printf("Ok.\n");
- 
--    SDL_Surface *icon = Data->getGfx("icon", "data/abicon.bmp");
-+    SDL_Surface *icon = Data->getGfx("icon", DATADIR "/abicon.bmp");
-     if (!icon)
-         throw Exiter(SDL_GetError());
-     SDL_WM_SetIcon(icon, NULL);
-@@ -117,24 +117,24 @@
-         config().getValue("fullscreen", Fullscreen);
+--- vodovod-1.10.orig/main.cpp
++++ vodovod-1.10/main.cpp
+@@ -101,38 +101,38 @@
          InitVideo(Fullscreen);
+         audio = InitAudio();
  
 -        SDL_Surface *vodovod = Data->getGfx("vodovod", "data/vodovod.png");
--        Data->getGfx("background", "data/main.png");
 -        Data->getGfx("dirt", "data/slate.png");
 -        Data->getGfx("queue", "data/queue.png");
 -        Data->getGfx("blocks", "data/block.png");
 +        SDL_Surface *vodovod = Data->getGfx("vodovod", DATADIR "/vodovod.png");
-+        Data->getGfx("background", DATADIR "/main.png");
 +        Data->getGfx("dirt", DATADIR "/slate.png");
 +        Data->getGfx("queue", DATADIR "/queue.png");
 +        Data->getGfx("blocks", DATADIR "/block.png");
@@ -106,7 +106,29 @@
          Uint32 back = SDL_MapRGB(human->format, 223, 232, 255);
          SDL_SetColorKey(human, SDL_SRCCOLORKEY, back);
  
-@@ -146,7 +146,7 @@
+         // preload music
+ 		if (audio)
+ 		{
+-			Data->getMusic("walk", "data/walk.xm");
+-			Data->getMusic("flow", "data/flow.xm");
+-			Data->getMusic("tune", "data/vodovod.xm");
++			Data->getMusic("walk", DATADIR "/walk.xm");
++			Data->getMusic("flow", DATADIR "/flow.xm");
++			Data->getMusic("tune", DATADIR "/vodovod.xm");
+ 
+ 			// preload sounds
+-			Data->getSfx("drop", "data/drop.wav");
+-			Data->getSfx("levelend", "data/mapend.wav");
+-			Data->getSfx("bubbles", "data/bubbles.wav");
+-			Data->getSfx("metal", "data/metal.wav");
++			Data->getSfx("drop", DATADIR "/drop.wav");
++			Data->getSfx("levelend", DATADIR "/mapend.wav");
++			Data->getSfx("bubbles", DATADIR "/bubbles.wav");
++			Data->getSfx("metal", DATADIR "/metal.wav");
+ 		}
+ 
+         // render some background picture for menu
+@@ -143,7 +143,7 @@
          SDL_BlitSurface(vodovod, 0, Screen, &r);
          SDL_Flip(Screen);