r13972 - in packages/trunk/vodovod/debian: . patches source
Markus Koschany
apo-guest at alioth.debian.org
Thu Mar 7 21:45:38 UTC 2013
Author: apo-guest
Date: 2013-03-07 21:45:38 +0000 (Thu, 07 Mar 2013)
New Revision: 13972
Added:
packages/trunk/vodovod/debian/manpages
packages/trunk/vodovod/debian/patches/fix-format-not-a-string-literal-error.patch
packages/trunk/vodovod/debian/patches/hardening-support.patch
packages/trunk/vodovod/debian/source/
packages/trunk/vodovod/debian/source/format
Modified:
packages/trunk/vodovod/debian/changelog
packages/trunk/vodovod/debian/compat
packages/trunk/vodovod/debian/control
packages/trunk/vodovod/debian/copyright
packages/trunk/vodovod/debian/install
packages/trunk/vodovod/debian/menu
packages/trunk/vodovod/debian/patches/datadir.patch
packages/trunk/vodovod/debian/patches/datadir_makefile.patch
packages/trunk/vodovod/debian/patches/fix-FTBFS-with-gcc-4.3.patch
packages/trunk/vodovod/debian/patches/series
packages/trunk/vodovod/debian/patches/user_files.patch
packages/trunk/vodovod/debian/rules
packages/trunk/vodovod/debian/vodovod.desktop
packages/trunk/vodovod/debian/watch
Log:
Debian release 1.10-3
- Switch to package format 3.0 (quilt)
- compat 9, debhelper >=9
- copyright format 1.0
- Do not overwrite hiscore.dat with default values
- Hardening support
- Lintian clean
- See also changelog
Modified: packages/trunk/vodovod/debian/changelog
===================================================================
--- packages/trunk/vodovod/debian/changelog 2013-03-06 10:38:52 UTC (rev 13971)
+++ packages/trunk/vodovod/debian/changelog 2013-03-07 21:45:38 UTC (rev 13972)
@@ -1,8 +1,35 @@
-vodovod (1.10-3) UNRELEASED; urgency=low
+vodovod (1.10-3) unstable; urgency=low
+ * Team upload.
+
+ [ Markus Koschany ]
+ * Switch to package format 3.0 (quilt).
+ * Bump compat level to 9 and require debhelper >= 9.
+ * Update debian/copyright to copyright format 1.0.
+ * Add longtitle to Debian menu. Change section to Games/Puzzles.
+ * Simplify debian/rules by using dh sequencer.
+ * Build with --parallel.
+ * Enable all hardening build flags.
+ * debian/control:
+ - Update Standards-Version to 3.9.4, no changes needed.
+ - Remove quilt build dependency, format 3.0 uses quilt by default.
+ - Use canonical Vcs-fields.
+ * vodovod.desktop: Add keywords and comments in English and German. Change
+ Categories key to Game;LogicGame.
+ * debian/patches:
+ - Add dep3 headers to all patches.
+ - Add fix-format-not-a-string-literal-error.patch which prevents a FTBFS.
+ - Add hardening-support.patch which enables Debian's hardening features via
+ dpkg-buildflags.
+ - Improve user_files.patch. Remove all PATH_MAX declarations. Instead use a
+ fixed buffer of 1024 bytes which allows the game to build on GNU/Hurd.
+ Do not overwrite hiscore.dat with default values at every startup thus
+ users can permanently save their achievements. (LP: #381908)
+
+ [ Paul Wise ]
* Fix minor typo in description (Closes: #587498)
- -- Paul Wise <pabs at debian.org> Sun, 04 Jul 2010 11:17:54 +0800
+ -- Markus Koschany <apo at gambaru.de> Wed, 06 Mar 2013 19:22:05 +0100
vodovod (1.10-2) unstable; urgency=low
Modified: packages/trunk/vodovod/debian/compat
===================================================================
--- packages/trunk/vodovod/debian/compat 2013-03-06 10:38:52 UTC (rev 13971)
+++ packages/trunk/vodovod/debian/compat 2013-03-07 21:45:38 UTC (rev 13972)
@@ -1 +1 @@
-5
+9
Modified: packages/trunk/vodovod/debian/control
===================================================================
--- packages/trunk/vodovod/debian/control 2013-03-06 10:38:52 UTC (rev 13971)
+++ packages/trunk/vodovod/debian/control 2013-03-07 21:45:38 UTC (rev 13972)
@@ -3,15 +3,19 @@
Priority: optional
Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
Uploaders: Miriam Ruiz <little_miry at yahoo.es>
-Build-Depends: debhelper (>= 5), quilt, libsdl1.2-dev, libsdl-image1.2-dev, libsdl-mixer1.2-dev
-Standards-Version: 3.7.3
+Build-Depends:
+ debhelper (>= 9),
+ libsdl-image1.2-dev,
+ libsdl-mixer1.2-dev,
+ libsdl1.2-dev
+Standards-Version: 3.9.4
Homepage: http://home.gna.org/vodovod/
-Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/vodovod/
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/vodovod/?op=log
+Vcs-Svn: svn://anonscm.debian.org/pkg-games/packages/trunk/vodovod/
+Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-games/packages/trunk/vodovod/
Package: vodovod
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
Description: puzzle game, you must lead the water to the storage tank
Vodovod is a game similar to Pipe Mania and Pipe Dream, in which you have to
lead the water from the house to the storage tank. You get a limited number
Modified: packages/trunk/vodovod/debian/copyright
===================================================================
--- packages/trunk/vodovod/debian/copyright 2013-03-06 10:38:52 UTC (rev 13971)
+++ packages/trunk/vodovod/debian/copyright 2013-03-07 21:45:38 UTC (rev 13972)
@@ -1,32 +1,35 @@
-This package was debianized by Miriam Ruiz <little_miry at yahoo.es> on
-Thu, 07 Jun 2007 13:35:46 +0000.
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: Vodovod
+Source: http://home.gna.org/vodovod
-It was downloaded from http://home.gna.org/vodovod/
+Files: *
+Copyright: 2007, Milan Babuškov <mbabuskov at yahoo.com>
+License: GPL-2+
-Upstream Author:
- Graphics and programming are done by Milan Babuškov <mbabuskov at yahoo.com>
+Files: debian/*
+Copyright: 2007-2008, Miriam Ruiz <little_miry at yahoo.es>
+ 2008, Cyril Brulebois, Barry deFreese, Jon Dowland
+ Eddy Petrișor, Marco Rodrigues
+ 2010, Paul Wise
+ 2013, Markus Koschany <apo at gambaru.de>
+License: GPL-2+
-Copyright:
- Copyright © Milan Babuškov 2007
+License: GPL-2+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ Boston, MA 02110-1301, USA.
+ .
+ On Debian systems, the complete text of the GNU General Public
+ License, version 2, can be found in /usr/share/common-licenses/GPL-2.
-License:
-
- This package is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This package is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this package; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-On Debian systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL'.
-
-The Debian packaging is (C) 2007, Miriam Ruiz <little_miry at yahoo.es> and
-is licensed under the GPL, see above.
Modified: packages/trunk/vodovod/debian/install
===================================================================
--- packages/trunk/vodovod/debian/install 2013-03-06 10:38:52 UTC (rev 13971)
+++ packages/trunk/vodovod/debian/install 2013-03-07 21:45:38 UTC (rev 13972)
@@ -1,4 +1,4 @@
-vodovod usr/games
data/* usr/share/games/vodovod
+debian/*.desktop usr/share/applications/
debian/*.xpm usr/share/pixmaps/
-debian/*.desktop usr/share/applications/
\ No newline at end of file
+vodovod usr/games
Added: packages/trunk/vodovod/debian/manpages
===================================================================
--- packages/trunk/vodovod/debian/manpages (rev 0)
+++ packages/trunk/vodovod/debian/manpages 2013-03-07 21:45:38 UTC (rev 13972)
@@ -0,0 +1 @@
+debian/vodovod.6
Modified: packages/trunk/vodovod/debian/menu
===================================================================
--- packages/trunk/vodovod/debian/menu 2013-03-06 10:38:52 UTC (rev 13971)
+++ packages/trunk/vodovod/debian/menu 2013-03-07 21:45:38 UTC (rev 13972)
@@ -1,3 +1,6 @@
-?package(vodovod):needs="X11" section="Games/Action"\
- title="vodovod" command="/usr/games/vodovod" \
+?package(vodovod):needs="X11" \
+ section="Games/Puzzles" \
+ title="Vodovod" \
+ longtitle="Vodovod - lead the water to the storage tank" \
+ command="/usr/games/vodovod" \
icon="/usr/share/pixmaps/vodovod.xpm"
Modified: packages/trunk/vodovod/debian/patches/datadir.patch
===================================================================
--- packages/trunk/vodovod/debian/patches/datadir.patch 2013-03-06 10:38:52 UTC (rev 13971)
+++ packages/trunk/vodovod/debian/patches/datadir.patch 2013-03-07 21:45:38 UTC (rev 13972)
@@ -1,51 +1,22 @@
---- vodovod-1.10.orig/game.cpp
-+++ vodovod-1.10/game.cpp
-@@ -29,7 +29,7 @@
- extern ResourceManager *Data;
+From: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
+Date: Tue, 5 Mar 2013 00:30:39 +0100
+Subject: datadir
+
+---
+ allmenus.cpp | 4 ++--
+ game.cpp | 4 ++--
+ main.cpp | 30 +++++++++++++++---------------
+ map.cpp | 2 +-
+ resource.h | 4 ++++
+ sutils.cpp | 2 +-
+ 6 files changed, 25 insertions(+), 21 deletions(-)
+
+diff --git a/allmenus.cpp b/allmenus.cpp
+index d83c437..12ba19e 100644
+--- a/allmenus.cpp
++++ b/allmenus.cpp
+@@ -36,7 +36,7 @@ extern ResourceManager *Data;
//-----------------------------------------------------------------------------
- Game::Game(int difficulty):
-- fontM("data/font-white.bmp", 8, 14), mapM(13, 7, 10, 110)
-+ fontM(DATADIR "/font-white.bmp", 8, 14), mapM(13, 7, 10, 110)
- {
- difficultyM = difficulty;
- SetupGame();
-@@ -176,7 +176,7 @@
- mapM.RenderNextShape(*(queueM.begin()));
-
- SDL_Rect r;
-- SDL_Surface *next = Data->getGfx("next", "data/next.png");
-+ SDL_Surface *next = Data->getGfx("next", DATADIR "/next.png");
- NjamSetRect(r, 363, 533);
- SDL_BlitSurface(next, 0, Screen, &r);
-
---- 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
-
-+#ifndef DATADIR
-+#define DATADIR "."
-+#endif
-+
- #include <string>
- #include <map>
- #include "SDL.h"
---- 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),
- whiteFontM("data/font-white.bmp", 8, 14)
@@ -53,7 +24,7 @@
{
options.push_back("START NEW GAME");
options.push_back("OPTIONS");
-@@ -68,7 +68,7 @@
+@@ -68,7 +68,7 @@ void DrawHelp()
{
RenderBackground(300);
@@ -62,20 +33,33 @@
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.10.orig/map.cpp
-+++ vodovod-1.10/map.cpp
-@@ -433,7 +433,7 @@
+diff --git a/game.cpp b/game.cpp
+index 49c6037..2fa0160 100644
+--- a/game.cpp
++++ b/game.cpp
+@@ -29,7 +29,7 @@ extern SDL_Surface *Screen; // global objects
+ extern ResourceManager *Data;
+ //-----------------------------------------------------------------------------
+ Game::Game(int difficulty):
+- fontM("data/font-white.bmp", 8, 14), mapM(13, 7, 10, 110)
++ fontM(DATADIR "/font-white.bmp", 8, 14), mapM(13, 7, 10, 110)
{
+ difficultyM = difficulty;
+ SetupGame();
+@@ -176,7 +176,7 @@ void Game::RenderScene(bool flip)
+ mapM.RenderNextShape(*(queueM.begin()));
+
SDL_Rect r;
- RenderBackground(xStartM*60 - 27); // 633 = 11
-- SDL_Surface *tank = Data->getGfx("tank", "data/tank.png");
-+ SDL_Surface *tank = Data->getGfx("tank", DATADIR "/tank.png");
- NjamSetRect(r, 12, 529);
- SDL_BlitSurface(tank, 0, Screen, &r);
+- SDL_Surface *next = Data->getGfx("next", "data/next.png");
++ SDL_Surface *next = Data->getGfx("next", DATADIR "/next.png");
+ NjamSetRect(r, 363, 533);
+ SDL_BlitSurface(next, 0, Screen, &r);
---- vodovod-1.10.orig/main.cpp
-+++ vodovod-1.10/main.cpp
-@@ -101,38 +101,38 @@
+diff --git a/main.cpp b/main.cpp
+index 42b45b7..46a9766 100644
+--- a/main.cpp
++++ b/main.cpp
+@@ -101,38 +101,38 @@ int main(int /* argc */, char ** /* argv */)
InitVideo(Fullscreen);
audio = InitAudio();
@@ -128,7 +112,7 @@
}
// render some background picture for menu
-@@ -143,7 +143,7 @@
+@@ -143,7 +143,7 @@ int main(int /* argc */, char ** /* argv */)
SDL_BlitSurface(vodovod, 0, Screen, &r);
SDL_Flip(Screen);
@@ -137,3 +121,44 @@
MainMenu m(&font, 95, 280);
m.start();
}
+diff --git a/map.cpp b/map.cpp
+index 2ae37e3..bc47900 100644
+--- a/map.cpp
++++ b/map.cpp
+@@ -433,7 +433,7 @@ void Map::Render()
+ {
+ SDL_Rect r;
+ RenderBackground(xStartM*60 - 27); // 633 = 11
+- SDL_Surface *tank = Data->getGfx("tank", "data/tank.png");
++ SDL_Surface *tank = Data->getGfx("tank", DATADIR "/tank.png");
+ NjamSetRect(r, 12, 529);
+ SDL_BlitSurface(tank, 0, Screen, &r);
+
+diff --git a/resource.h b/resource.h
+index 1903a60..306a616 100644
+--- a/resource.h
++++ b/resource.h
+@@ -20,6 +20,10 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ #ifndef MB_RESOURCE_H
+ #define MB_RESOURCE_H
+
++#ifndef DATADIR
++#define DATADIR "."
++#endif
++
+ #include <string>
+ #include <map>
+ #include "SDL.h"
+diff --git a/sutils.cpp b/sutils.cpp
+index d8e53ad..73d3130 100644
+--- a/sutils.cpp
++++ b/sutils.cpp
+@@ -374,7 +374,7 @@ void InitVideo(bool fullscreen)
+ 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);
Modified: packages/trunk/vodovod/debian/patches/datadir_makefile.patch
===================================================================
--- packages/trunk/vodovod/debian/patches/datadir_makefile.patch 2013-03-06 10:38:52 UTC (rev 13971)
+++ packages/trunk/vodovod/debian/patches/datadir_makefile.patch 2013-03-07 21:45:38 UTC (rev 13972)
@@ -1,6 +1,16 @@
---- vodovod-1.05.orig/Makefile
-+++ vodovod-1.05/Makefile
-@@ -23,13 +23,15 @@
+From: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
+Date: Tue, 5 Mar 2013 00:30:39 +0100
+Subject: datadir_makefile
+
+---
+ Makefile | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index daf8cdc..7ef376d 100644
+--- a/Makefile
++++ b/Makefile
+@@ -23,13 +23,15 @@ ifndef PREFIX
PREFIX=/usr
endif
Modified: packages/trunk/vodovod/debian/patches/fix-FTBFS-with-gcc-4.3.patch
===================================================================
--- packages/trunk/vodovod/debian/patches/fix-FTBFS-with-gcc-4.3.patch 2013-03-06 10:38:52 UTC (rev 13971)
+++ packages/trunk/vodovod/debian/patches/fix-FTBFS-with-gcc-4.3.patch 2013-03-07 21:45:38 UTC (rev 13972)
@@ -1,6 +1,29 @@
+From: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
+Date: Tue, 5 Mar 2013 00:30:39 +0100
+Subject: fix-FTBFS-with-gcc-4.3
+
+---
+ config.cpp | 1 +
+ hiscore.cpp | 2 ++
+ 2 files changed, 3 insertions(+)
+
+diff --git a/config.cpp b/config.cpp
+index 3b156ee..d04a604 100644
+--- a/config.cpp
++++ b/config.cpp
+@@ -25,6 +25,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ #include <stdio.h>
+ #include <sys/stat.h>
+ #include "config.h"
++#include <climits>
+ //------------------------------------------------------------------------------
+ using namespace std;
+ //-----------------------------------------------------------------------------
+diff --git a/hiscore.cpp b/hiscore.cpp
+index 904f304..7e00999 100644
--- a/hiscore.cpp
+++ b/hiscore.cpp
-@@ -21,6 +21,8 @@
+@@ -21,6 +21,8 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#include <stdlib.h>
#include <sys/stat.h>
#include "hiscore.h"
@@ -9,13 +32,3 @@
//-----------------------------------------------------------------------------
HiScores &hiScores()
{
---- a/config.cpp
-+++ b/config.cpp
-@@ -25,6 +25,7 @@
- #include <stdio.h>
- #include <sys/stat.h>
- #include "config.h"
-+#include <climits>
- //------------------------------------------------------------------------------
- using namespace std;
- //-----------------------------------------------------------------------------
Added: packages/trunk/vodovod/debian/patches/fix-format-not-a-string-literal-error.patch
===================================================================
--- packages/trunk/vodovod/debian/patches/fix-format-not-a-string-literal-error.patch (rev 0)
+++ packages/trunk/vodovod/debian/patches/fix-format-not-a-string-literal-error.patch 2013-03-07 21:45:38 UTC (rev 13972)
@@ -0,0 +1,30 @@
+From: Markus Koschany <apo at gambaru.de>
+Date: Tue, 5 Mar 2013 01:24:33 +0100
+Subject: fix format not a string literal error
+
+---
+ njamfont.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/njamfont.cpp b/njamfont.cpp
+index 0948a1a..d72d828 100644
+--- a/njamfont.cpp
++++ b/njamfont.cpp
+@@ -37,7 +37,7 @@ NjamFont::NjamFont(const char *Filename, int CharWidth, int CharHeight)
+ if (!temp)
+ {
+ printf("FAILED.\n");
+- printf((const char *)SDL_GetError());
++ printf((const char *)SDL_GetError(),"%s");
+ return;
+ }
+ printf("OK.\n");
+@@ -133,7 +133,7 @@ bool NjamFont::WriteTextXY(SDL_Surface *Destination, int x, int y, const char *T
+ if (0 != SDL_BlitSurface(m_Surface, &src, Destination, &dest))
+ {
+ printf("Failed to blit font character image.\n");
+- printf((const char *)SDL_GetError());
++ printf((const char *)SDL_GetError(),"%s");
+ return false;
+ }
+ break;
Added: packages/trunk/vodovod/debian/patches/hardening-support.patch
===================================================================
--- packages/trunk/vodovod/debian/patches/hardening-support.patch (rev 0)
+++ packages/trunk/vodovod/debian/patches/hardening-support.patch 2013-03-07 21:45:38 UTC (rev 13972)
@@ -0,0 +1,35 @@
+From: Markus Koschany <apo at gambaru.de>
+Date: Tue, 5 Mar 2013 01:21:20 +0100
+Subject: hardening support
+
+---
+ Makefile | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index 7ef376d..8c43e83 100644
+--- a/Makefile
++++ b/Makefile
+@@ -28,10 +28,13 @@ DATADIR?=.
+ PROGRAM = vodovod
+ OBJECTS = game.o map.o resource.o main.o allmenus.o njamfont.o sutils.o menu.o hiscore.o effects.o config.o keys.o
+ CC = g++
++LDFLAGS=`dpkg-buildflags --get LDFLAGS`
+
+ # If you hate warnings under Cygwin use these flags instead
+ # MY_CFLAGS = -I/usr/local/include/SDL -Dmain=SDL_main -DWIN32 -Uunix -mno-cygwin
+ MY_CFLAGS = `sdl-config --cflags` -DDATADIR=\"$(DATADIR)\"
++MY_CFLAGS += `dpkg-buildflags --get CFLAGS`
++MY_CFLAGS += `dpkg-buildflags --get CPPFLAGS`
+
+ %.o: %.cpp
+ $(CC) -c $(MY_CFLAGS) $< -o $@
+@@ -39,7 +42,7 @@ MY_CFLAGS = `sdl-config --cflags` -DDATADIR=\"$(DATADIR)\"
+ all: $(PROGRAM)
+
+ $(PROGRAM): $(OBJECTS)
+- $(CC) `sdl-config --libs` -o$(PROGRAM) $(OBJECTS) -lSDL -lSDL_image -lSDL_mixer
++ $(CC) $(LDFLAGS) `sdl-config --libs` -o$(PROGRAM) $(OBJECTS) -lSDL -lSDL_image -lSDL_mixer
+
+ clean:
+ $(RM) *.o
Modified: packages/trunk/vodovod/debian/patches/series
===================================================================
--- packages/trunk/vodovod/debian/patches/series 2013-03-06 10:38:52 UTC (rev 13971)
+++ packages/trunk/vodovod/debian/patches/series 2013-03-07 21:45:38 UTC (rev 13972)
@@ -2,3 +2,5 @@
user_files.patch
datadir_makefile.patch
fix-FTBFS-with-gcc-4.3.patch
+hardening-support.patch
+fix-format-not-a-string-literal-error.patch
Modified: packages/trunk/vodovod/debian/patches/user_files.patch
===================================================================
--- packages/trunk/vodovod/debian/patches/user_files.patch 2013-03-06 10:38:52 UTC (rev 13971)
+++ packages/trunk/vodovod/debian/patches/user_files.patch 2013-03-07 21:45:38 UTC (rev 13972)
@@ -1,6 +1,17 @@
---- vodovod-1.05.orig/config.cpp
-+++ vodovod-1.05/config.cpp
-@@ -21,6 +21,9 @@
+From: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
+Date: Tue, 5 Mar 2013 00:30:39 +0100
+Subject: user_files
+
+---
+ config.cpp | 27 +++++++++++++++++++++++++--
+ hiscore.cpp | 29 ++++++++++++++++++++++++++---
+ 2 files changed, 51 insertions(+), 5 deletions(-)
+
+diff --git a/config.cpp b/config.cpp
+index 89a748f..3b156ee 100644
+--- a/config.cpp
++++ b/config.cpp
+@@ -21,6 +21,9 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#include <string>
#include <fstream>
#include <sstream>
@@ -10,19 +21,19 @@
#include "config.h"
//------------------------------------------------------------------------------
using namespace std;
-@@ -155,7 +158,19 @@
+@@ -155,7 +158,19 @@ Config::~Config()
//-----------------------------------------------------------------------------
bool Config::save()
{
- std::ofstream file("vodovod.conf");
-+ char vodovod_conf[PATH_MAX] = "vodovod.conf";
++ char vodovod_conf[1024];
+
+#ifndef _WIN32
+ char *home = getenv("HOME");
+ if (home != NULL)
+ {
+ snprintf(vodovod_conf, sizeof(vodovod_conf), "%s/.vodovod", home);
-+ mkdir(vodovod_conf, S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH);
++ mkdir(vodovod_conf, 0755);
+ }
+ strncat(vodovod_conf, "/vodovod.conf", sizeof(vodovod_conf));
+#endif
@@ -31,12 +42,12 @@
if (!file)
return false;
-@@ -171,7 +186,15 @@
+@@ -171,7 +186,15 @@ bool Config::save()
// this gets called from main() so we're sure config.ini is in the right place
bool Config::load()
{
- std::ifstream file("vodovod.conf");
-+ char vodovod_conf[PATH_MAX] = "vodovod.conf";
++ char vodovod_conf[1024];
+
+#ifndef _WIN32
+ char *home = getenv("HOME");
@@ -48,9 +59,11 @@
if (!file)
return false;
---- vodovod-1.05.orig/hiscore.cpp
-+++ vodovod-1.05/hiscore.cpp
-@@ -17,7 +17,9 @@
+diff --git a/hiscore.cpp b/hiscore.cpp
+index a4ac6ec..904f304 100644
+--- a/hiscore.cpp
++++ b/hiscore.cpp
+@@ -17,7 +17,9 @@ You should have received a copy of the GNU General Public License
along with Vodovod in file COPYING; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-----------------------------------------------------------------------------*/
@@ -61,18 +74,37 @@
#include "hiscore.h"
//-----------------------------------------------------------------------------
HiScores &hiScores()
-@@ -102,9 +104,21 @@
+@@ -46,8 +48,17 @@ bool HiScores::canEnter(int score)
//-----------------------------------------------------------------------------
+ HiScores::HiScores()
+ {
++ char hiscore_dat[1024];
++
++#ifndef _WIN32
++ char *home = getenv("HOME");
++ if (home != NULL)
++ {
++ snprintf(hiscore_dat, sizeof(hiscore_dat), "%s/.vodovod/hiscore.dat", home);
++ }
++#endif
+ // on Linux use /usr/share/abandoned/hiscore.dat ?
+- FILE *fp = fopen("hiscore.dat", "r");
++ FILE *fp = fopen(hiscore_dat, "r");
+ if (!fp)
+ {
+ std::string defaultNames[] = { // create default hiscore
+@@ -102,9 +113,21 @@ HiScores::HiScores()
+ //-----------------------------------------------------------------------------
HiScores::~HiScores()
{
-+ char hiscore_dat[PATH_MAX] = "hiscore.dat";
++ char hiscore_dat[1024];
+
+#ifndef _WIN32
+ char *home = getenv("HOME");
+ if (home != NULL)
+ {
+ snprintf(hiscore_dat, sizeof(hiscore_dat), "%s/.vodovod", home);
-+ mkdir(hiscore_dat, S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH);
++ mkdir(hiscore_dat, 0755);
+ }
+ strncat(hiscore_dat, "/hiscore.dat", sizeof(hiscore_dat));
+#endif
Modified: packages/trunk/vodovod/debian/rules
===================================================================
--- packages/trunk/vodovod/debian/rules 2013-03-06 10:38:52 UTC (rev 13971)
+++ packages/trunk/vodovod/debian/rules 2013-03-07 21:45:38 UTC (rev 13972)
@@ -1,66 +1,12 @@
#!/usr/bin/make -f
-
-# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
-CFLAGS = -Wall -g
+%:
+ dh $@ --parallel
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -O0
-else
- CFLAGS += -O2
-endif
-
-configure: configure-stamp
-configure-stamp:
- dh_testdir
- $(MAKE) -f /usr/share/quilt/quilt.make patch
- touch $@
-
-build: build-stamp
-build-stamp: configure-stamp
- dh_testdir
+override_dh_auto_build:
$(MAKE) DATADIR=/usr/share/games/vodovod
- #docbook-to-man debian/vodovod.sgml > vodovod.1
- touch $@
-clean:
- dh_testdir
- dh_testroot
- rm -f build-stamp configure-stamp
- [ ! -f Makefile ] || $(MAKE) clean
- rm -f hiscore.dat vodovod.conf
- $(MAKE) -f /usr/share/quilt/quilt.make unpatch
- dh_clean
-
-install: build
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
-
-# Build architecture-independent files here.
-binary-indep: build install
-
-# Build architecture-dependent files here.
-binary-arch: build install
- dh_testdir
- dh_testroot
+override_dh_installchangelogs:
dh_installchangelogs CHANGES
- dh_installdocs
- dh_installexamples
- dh_install
- dh_installmenu
- dh_installman debian/vodovod.6
- dh_link
- dh_strip
- dh_compress
- dh_fixperms
- dh_installdeb
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
Added: packages/trunk/vodovod/debian/source/format
===================================================================
--- packages/trunk/vodovod/debian/source/format (rev 0)
+++ packages/trunk/vodovod/debian/source/format 2013-03-07 21:45:38 UTC (rev 13972)
@@ -0,0 +1 @@
+3.0 (quilt)
Modified: packages/trunk/vodovod/debian/vodovod.desktop
===================================================================
--- packages/trunk/vodovod/debian/vodovod.desktop 2013-03-06 10:38:52 UTC (rev 13971)
+++ packages/trunk/vodovod/debian/vodovod.desktop 2013-03-07 21:45:38 UTC (rev 13972)
@@ -1,7 +1,14 @@
[Desktop Entry]
Type=Application
-Name=vodovod
-Icon=vodovod
+Version=1.0
+Name=Vodovod
+GenericName=Puzzle Game
+GenericName[de]=Puzzlespiel
+Comment=Vodovod is a puzzle game in which you must lead the water to the storage tank.
+Comment[de]=Vodovod ist ein Puzzlespiel, in welchem Sie das Wasser zum Auffangbehälter leiten müssen.
+Icon=vodovod.xpm
Exec=vodovod
Terminal=false
-Categories=Game;ArcadeGame;
+StartupNotify=false
+Categories=Game;LogicGame;
+Keywords=game;pipes;puzzle;water;logic;
Modified: packages/trunk/vodovod/debian/watch
===================================================================
--- packages/trunk/vodovod/debian/watch 2013-03-06 10:38:52 UTC (rev 13971)
+++ packages/trunk/vodovod/debian/watch 2013-03-07 21:45:38 UTC (rev 13972)
@@ -4,4 +4,4 @@
# Compulsory line, this is a version 3 file
version=3
-http://download.gna.org/vodovod/vodovod-(.*)-src\.tar\.gz
+http://download.gna.org/vodovod/vodovod-(.*)-src\.(?:tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))
More information about the Pkg-games-commits
mailing list