r15604 - in packages/trunk/vodovod/debian: . patches
Markus Koschany
apo-guest at moszumanska.debian.org
Thu Nov 26 19:13:04 UTC 2015
Author: apo-guest
Date: 2015-11-26 19:13:04 +0000 (Thu, 26 Nov 2015)
New Revision: 15604
Modified:
packages/trunk/vodovod/debian/changelog
packages/trunk/vodovod/debian/control
packages/trunk/vodovod/debian/copyright
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/fix-format-not-a-string-literal-error.patch
packages/trunk/vodovod/debian/patches/hardening-support.patch
packages/trunk/vodovod/debian/patches/user_files.patch
packages/trunk/vodovod/debian/vodovod.6
Log:
Release 1.10-4
Modified: packages/trunk/vodovod/debian/changelog
===================================================================
--- packages/trunk/vodovod/debian/changelog 2015-11-26 16:37:27 UTC (rev 15603)
+++ packages/trunk/vodovod/debian/changelog 2015-11-26 19:13:04 UTC (rev 15604)
@@ -1,9 +1,11 @@
-vodovod (1.10-4) UNRELEASED; urgency=low
+vodovod (1.10-4) unstable; urgency=medium
* Team upload.
- * Add missing CXXFLAGS to hardening-support.patch and remove CPPFLAGS.
+ * Add missing CXXFLAGS to hardening-support.patch.
+ * Vcs-Browser: Use https.
+ * Declare compliance with Debian Policy 3.9.6.
- -- Markus Koschany <apo at gambaru.de> Sun, 24 Mar 2013 16:02:32 +0100
+ -- Markus Koschany <apo at debian.org> Thu, 26 Nov 2015 19:55:58 +0100
vodovod (1.10-3) unstable; urgency=low
Modified: packages/trunk/vodovod/debian/control
===================================================================
--- packages/trunk/vodovod/debian/control 2015-11-26 16:37:27 UTC (rev 15603)
+++ packages/trunk/vodovod/debian/control 2015-11-26 19:13:04 UTC (rev 15604)
@@ -8,10 +8,10 @@
libsdl-image1.2-dev,
libsdl-mixer1.2-dev,
libsdl1.2-dev
-Standards-Version: 3.9.4
+Standards-Version: 3.9.6
Homepage: http://home.gna.org/vodovod/
Vcs-Svn: svn://anonscm.debian.org/pkg-games/packages/trunk/vodovod/
-Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-games/packages/trunk/vodovod/
+Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-games/packages/trunk/vodovod/
Package: vodovod
Architecture: any
Modified: packages/trunk/vodovod/debian/copyright
===================================================================
--- packages/trunk/vodovod/debian/copyright 2015-11-26 16:37:27 UTC (rev 15603)
+++ packages/trunk/vodovod/debian/copyright 2015-11-26 19:13:04 UTC (rev 15604)
@@ -11,7 +11,7 @@
2008, Cyril Brulebois, Barry deFreese, Jon Dowland
Eddy Petrișor, Marco Rodrigues
2010, Paul Wise
- 2013, Markus Koschany <apo at gambaru.de>
+ 2013-2015, Markus Koschany <apo at debian.org>
License: GPL-2+
License: GPL-2+
Modified: packages/trunk/vodovod/debian/patches/datadir.patch
===================================================================
--- packages/trunk/vodovod/debian/patches/datadir.patch 2015-11-26 16:37:27 UTC (rev 15603)
+++ packages/trunk/vodovod/debian/patches/datadir.patch 2015-11-26 19:13:04 UTC (rev 15604)
@@ -3,12 +3,12 @@
Subject: datadir
---
- allmenus.cpp | 4 ++--
- game.cpp | 4 ++--
- main.cpp | 30 +++++++++++++++---------------
- map.cpp | 2 +-
- resource.h | 4 ++++
- sutils.cpp | 2 +-
+ 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
Modified: packages/trunk/vodovod/debian/patches/datadir_makefile.patch
===================================================================
--- packages/trunk/vodovod/debian/patches/datadir_makefile.patch 2015-11-26 16:37:27 UTC (rev 15603)
+++ packages/trunk/vodovod/debian/patches/datadir_makefile.patch 2015-11-26 19:13:04 UTC (rev 15604)
@@ -3,7 +3,7 @@
Subject: datadir_makefile
---
- Makefile | 4 +++-
+ Makefile | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
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 2015-11-26 16:37:27 UTC (rev 15603)
+++ packages/trunk/vodovod/debian/patches/fix-FTBFS-with-gcc-4.3.patch 2015-11-26 19:13:04 UTC (rev 15604)
@@ -3,8 +3,8 @@
Subject: fix-FTBFS-with-gcc-4.3
---
- config.cpp | 1 +
- hiscore.cpp | 2 ++
+ config.cpp | 1 +
+ hiscore.cpp | 2 ++
2 files changed, 3 insertions(+)
diff --git a/config.cpp b/config.cpp
Modified: 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 2015-11-26 16:37:27 UTC (rev 15603)
+++ packages/trunk/vodovod/debian/patches/fix-format-not-a-string-literal-error.patch 2015-11-26 19:13:04 UTC (rev 15604)
@@ -1,9 +1,9 @@
-From: Markus Koschany <apo at gambaru.de>
+From: Markus Koschany <apo at debian.org>
Date: Tue, 5 Mar 2013 01:24:33 +0100
Subject: fix format not a string literal error
---
- njamfont.cpp | 4 ++--
+ njamfont.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/njamfont.cpp b/njamfont.cpp
Modified: packages/trunk/vodovod/debian/patches/hardening-support.patch
===================================================================
--- packages/trunk/vodovod/debian/patches/hardening-support.patch 2015-11-26 16:37:27 UTC (rev 15603)
+++ packages/trunk/vodovod/debian/patches/hardening-support.patch 2015-11-26 19:13:04 UTC (rev 15604)
@@ -1,16 +1,16 @@
-From: Markus Koschany <apo at gambaru.de>
+From: Markus Koschany <apo at debian.org>
Date: Tue, 5 Mar 2013 01:21:20 +0100
Subject: hardening support
---
- Makefile | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
+ Makefile | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
-index 7ef376d..8c43e83 100644
+index 7ef376d..66383c6 100644
--- a/Makefile
+++ b/Makefile
-@@ -28,10 +28,13 @@ DATADIR?=.
+@@ -28,10 +28,14 @@ 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++
@@ -20,11 +20,12 @@
# 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`
+MY_CFLAGS += `dpkg-buildflags --get CXXFLAGS`
%.o: %.cpp
$(CC) -c $(MY_CFLAGS) $< -o $@
-@@ -39,7 +42,7 @@ MY_CFLAGS = `sdl-config --cflags` -DDATADIR=\"$(DATADIR)\"
+@@ -39,7 +43,7 @@ MY_CFLAGS = `sdl-config --cflags` -DDATADIR=\"$(DATADIR)\"
all: $(PROGRAM)
$(PROGRAM): $(OBJECTS)
Modified: packages/trunk/vodovod/debian/patches/user_files.patch
===================================================================
--- packages/trunk/vodovod/debian/patches/user_files.patch 2015-11-26 16:37:27 UTC (rev 15603)
+++ packages/trunk/vodovod/debian/patches/user_files.patch 2015-11-26 19:13:04 UTC (rev 15604)
@@ -3,8 +3,8 @@
Subject: user_files
---
- config.cpp | 27 +++++++++++++++++++++++++--
- hiscore.cpp | 29 ++++++++++++++++++++++++++---
+ config.cpp | 27 +++++++++++++++++++++++++--
+ hiscore.cpp | 29 ++++++++++++++++++++++++++---
2 files changed, 51 insertions(+), 5 deletions(-)
diff --git a/config.cpp b/config.cpp
Modified: packages/trunk/vodovod/debian/vodovod.6
===================================================================
--- packages/trunk/vodovod/debian/vodovod.6 2015-11-26 16:37:27 UTC (rev 15603)
+++ packages/trunk/vodovod/debian/vodovod.6 2015-11-26 19:13:04 UTC (rev 15604)
@@ -1,15 +1,15 @@
.\" (c) 2007 Miriam Ruiz <little_miry at yahoo.es>
-.\"
+.\"
.\" This document 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
@@ -30,9 +30,9 @@
Some of the levels have obstacles where you cannot place pipes, checkpoints through which the water must go and holes in the ground that slow the flow. Select HELP from the main menu to get more info. The game is playable with joystick/joypad: just move it and press buttons when you go to Options \-> Configure controls
.SH "USAGE"
The goal of the game is to use pipes to connect the house at the top of the screen with the tank at the bottom. You have time to construct the initial pipeline before the man enters the house.
-.PP
+.PP
For each level you get a limited number of pipes, so use them wisely. If you make a mistake, you can place another pipe over it.
-.PP
+.PP
There are certain special blocks in the map:
* Blocked Area \- You cannot place pipes on these fields.
* Checkpoint \- Your pipeline must go through this field.
More information about the Pkg-games-commits
mailing list