Author: apo-guest
Date: 2013-08-11 10:20:50 +0000 (Sun, 11 Aug 2013)
New Revision: 14470
Added:
packages/trunk/enemylines7/debian/patches/10-turn-off-useless-warnings.patch
packages/trunk/enemylines7/debian/patches/fix-gcc-4.3.patch
packages/trunk/enemylines7/debian/patches/hardening.patch
Removed:
packages/trunk/enemylines7/debian/patches/fix-gcc-4.3.diff
Modified:
packages/trunk/enemylines7/debian/changelog
packages/trunk/enemylines7/debian/control
packages/trunk/enemylines7/debian/copyright
packages/trunk/enemylines7/debian/patches/20_data_in_usr_games.patch
packages/trunk/enemylines7/debian/patches/series
Log:
Add hardening
Update copyright file to format 1.0
Improve the package description
Refresh all patches. Add DEP-3 headers.
Modified: packages/trunk/enemylines7/debian/changelog
===================================================================
--- packages/trunk/enemylines7/debian/changelog 2013-08-10 20:56:43 UTC (rev
14469)
+++ packages/trunk/enemylines7/debian/changelog 2013-08-11 10:20:50 UTC (rev
14470)
@@ -13,18 +13,25 @@
* Bump compat level to 9 and require debhelper >=9 for automatic hardening
build flags.
* Delete enemylines7.sgml and files file. They are not necessary anymore.
+ Create enemylines7.6 man page instead.
+ * Update debian/copyright to copyright format 1.0. The license is GPL-2.
* debian/control:
- Use canonical Vcs-URI.
- Drop quilt build dependeny, format 3.0 uses quilt by default.
- Drop docbook-to-man build dependency and create a new man page manually.
+ - Improve the package description.
* debian/rules:
- Simplify debian/rules by using dh sequencer.
- Build with --parallel.
+ * debian/patches:
+ - Refresh all patches. Add DEP-3 headers. Use patch extension consistently.
+ - Add hardening.patch to provide hardening build flags with
+ dpkg-buildflags.
[ Alexander Reichle-Schmehl ]
* Adapt debian/control to my new name
- -- Markus Koschany <a...@gambaru.de> Tue, 09 Apr 2013 18:24:13 +0200
+ -- Markus Koschany <a...@gambaru.de> Sat, 10 Aug 2013 23:01:26 +0200
enemylines7 (0.6-3) unstable; urgency=low
Modified: packages/trunk/enemylines7/debian/control
===================================================================
--- packages/trunk/enemylines7/debian/control 2013-08-10 20:56:43 UTC (rev
14469)
+++ packages/trunk/enemylines7/debian/control 2013-08-11 10:20:50 UTC (rev
14470)
@@ -5,6 +5,7 @@
Uploaders: Alexander Reichle-Schmehl <toli...@debian.org>
Build-Depends:
debhelper (>= 9),
+ hardening-wrapper,
libsdl-image1.2-dev,
libsdl-mixer1.2-dev,
libsdl1.2-dev
@@ -17,5 +18,9 @@
Architecture: any
Depends: ${misc:Depends}, ${shlibs:Depends}
Description: first person 3d-shooter game
- Enemy Lines 7 is a Single-player game. You have to Shoot down enemy
- bombers threatening your city.
+ Enemy Lines 7 is a single-player game. You have to shoot down enemy
+ bombers threatening your city in a three-dimensional environment.
+ .
+ Enemy bombers are approaching Glysen, your capital. The situation is without
+ hope. But with the new experimental mech you can at least try to take as many
+ of them with you as possible.
Modified: packages/trunk/enemylines7/debian/copyright
===================================================================
--- packages/trunk/enemylines7/debian/copyright 2013-08-10 20:56:43 UTC (rev
14469)
+++ packages/trunk/enemylines7/debian/copyright 2013-08-11 10:20:50 UTC (rev
14470)
@@ -1,16 +1,41 @@
-This package was debianized by Gonéri Le Bouder <gon...@rulezlan.org> on
-Sun, 26 Mar 2006 19:08:45 +0200.
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: Enemylines7
+Source: http://proj.phk.at/el/7/
+Comment:
+ The game was downloaded from http://raum1.memebot.com/enemylines/. This site
+ does not exist anymore and was moved to http://proj.phk.at/el/7/.
+ .
+ The files enelin7, enelin7.exe, libogg-0.dll, libvorbis-0.dll,
+ libvorbisfile-3.dll, SDL.dll, SDL_mixer.dlland smpeg.dll
+ were removed from the tarball.
-It was downloaded from http://raum1.memebot.com/enemylines/
-The current homesite is http://proj.phk.at/el/7/
-The files enelin7, enelin7.exe, libogg-0.dll, libvorbis-0.dll,
-libvorbisfile-3.dll, SDL.dll, SDL_mixer.dlland smpeg.dll
-where removed from the tarball.
+Files: *
+Copyright: Raphael Pikrin
+License: GPL-2
+Comment:
+ The game was accompanied by a COPYING file that indicates that the game
+ is licensed under the GNU General Public License 2.
-Copyright Holder: Raphael Pikrin
+Files: debian/*
+Copyright: 2006-2008, Gonéri Le Bouder <gon...@rulezlan.org>
+ 2006, Alexander Reichle-Schmehl <toli...@debian.org>
+ 2007, Jon Dowland <j...@alcopop.org>
+ 2013, Markus Koschany <a...@gambaru.de>
+License: GPL-2
-License:
-
-GNU Gneral Public License 3 or later
-see /usr/share/common-licenses/GPL-3
+License: GPL-2
+ This package is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License 2 as published by
+ the Free Software Foundation.
+ .
+ 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 program. If not, see <http://www.gnu.org/licenses/>
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
Added:
packages/trunk/enemylines7/debian/patches/10-turn-off-useless-warnings.patch
===================================================================
---
packages/trunk/enemylines7/debian/patches/10-turn-off-useless-warnings.patch
(rev 0)
+++
packages/trunk/enemylines7/debian/patches/10-turn-off-useless-warnings.patch
2013-08-11 10:20:50 UTC (rev 14470)
@@ -0,0 +1,27 @@
+From: =?UTF-8?q?Gon=C3=A9ri=20Le=20Bouder?= <gon...@rulezlan.org>
+Date: Sun, 11 Aug 2013 11:39:25 +0200
+Subject: 10 turn off useless warnings
+
+---
+ main.cc | 8 --------
+ 1 file changed, 8 deletions(-)
+
+diff --git a/main.cc b/main.cc
+index e31a03e..da6a781 100644
+--- a/main.cc
++++ b/main.cc
+@@ -30,14 +30,6 @@ namespace PRJID {
+ std::string load_audio(std::string dir) {
+ std::string path;
+ if (dir=="") {
+- path="data/";
+- std::cout << " Looking in " << path << std::endl;
+- if (Audio::load(path)) return path;
+- path="/usr/local/share/";
+- path+=PATHNAME;
+- path+="/";
+- std::cout << " Looking in " << path << std::endl;
+- if (Audio::load(path)) return path;
+ path="/usr/share/games/";
+ path+=PATHNAME;
+ path+="/";
Modified: packages/trunk/enemylines7/debian/patches/20_data_in_usr_games.patch
===================================================================
--- packages/trunk/enemylines7/debian/patches/20_data_in_usr_games.patch
2013-08-10 20:56:43 UTC (rev 14469)
+++ packages/trunk/enemylines7/debian/patches/20_data_in_usr_games.patch
2013-08-11 10:20:50 UTC (rev 14470)
@@ -1,4 +1,4 @@
-From: Markus Koschany <a...@gambaru.de>
+From: =?UTF-8?q?Gon=C3=A9ri=20Le=20Bouder?= <gon...@rulezlan.org>
Date: Sat, 10 Aug 2013 21:55:18 +0200
Subject: 20_data_in_usr_games
Deleted: packages/trunk/enemylines7/debian/patches/fix-gcc-4.3.diff
===================================================================
--- packages/trunk/enemylines7/debian/patches/fix-gcc-4.3.diff 2013-08-10
20:56:43 UTC (rev 14469)
+++ packages/trunk/enemylines7/debian/patches/fix-gcc-4.3.diff 2013-08-11
10:20:50 UTC (rev 14470)
@@ -1,24 +0,0 @@
-Index: enemylines7-0.6/random.cc
-===================================================================
---- enemylines7-0.6.orig/random.cc 2008-02-03 17:32:36.000000000 +0100
-+++ enemylines7-0.6/random.cc 2008-02-03 17:32:43.000000000 +0100
-@@ -1,5 +1,6 @@
- #include "random.h"
-
-+#include <cstdlib>
- #include <iostream>
-
-
-Index: enemylines7-0.6/math/c3_tpl.h
-===================================================================
---- enemylines7-0.6.orig/math/c3_tpl.h 2008-02-03 17:32:46.000000000 +0100
-+++ enemylines7-0.6/math/c3_tpl.h 2008-02-03 17:32:49.000000000 +0100
-@@ -2,7 +2,7 @@
- #include <sstream>
- #include <utility>
- #include <cmath>
--
-+#include <limits>
-
- using namespace std::rel_ops;
-
Added: packages/trunk/enemylines7/debian/patches/fix-gcc-4.3.patch
===================================================================
--- packages/trunk/enemylines7/debian/patches/fix-gcc-4.3.patch
(rev 0)
+++ packages/trunk/enemylines7/debian/patches/fix-gcc-4.3.patch 2013-08-11
10:20:50 UTC (rev 14470)
@@ -0,0 +1,33 @@
+From: =?UTF-8?q?Gon=C3=A9ri=20Le=20Bouder?= <gon...@rulezlan.org>
+Date: Sun, 11 Aug 2013 11:37:43 +0200
+Subject: fix gcc 4.3
+
+---
+ math/c3_tpl.h | 2 +-
+ random.cc | 1 +
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/math/c3_tpl.h b/math/c3_tpl.h
+index 79f95a2..3233117 100644
+--- a/math/c3_tpl.h
++++ b/math/c3_tpl.h
+@@ -2,7 +2,7 @@
+ #include <sstream>
+ #include <utility>
+ #include <cmath>
+-
++#include <limits>
+
+ using namespace std::rel_ops;
+
+diff --git a/random.cc b/random.cc
+index 8367729..c0b9c82 100644
+--- a/random.cc
++++ b/random.cc
+@@ -1,5 +1,6 @@
+ #include "random.h"
+
++#include <cstdlib>
+ #include <iostream>
+
+
Added: packages/trunk/enemylines7/debian/patches/hardening.patch
===================================================================
--- packages/trunk/enemylines7/debian/patches/hardening.patch
(rev 0)
+++ packages/trunk/enemylines7/debian/patches/hardening.patch 2013-08-11
10:20:50 UTC (rev 14470)
@@ -0,0 +1,33 @@
+From: Markus Koschany <a...@gambaru.de>
+Date: Sun, 11 Aug 2013 11:45:57 +0200
+Subject: hardening
+
+---
+ Makefile | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index afbcc50..091ce5d 100644
+--- a/Makefile
++++ b/Makefile
+@@ -6,8 +6,11 @@ TARGET = enemylines7
+ CXX= g++
+
+ CXXFLAGS = -O2 -Wall `sdl-config --cflags` -I./
++CXXFLAGS += `dpkg-buildflags --get CFLAGS`
++CXXFLAGS += `dpkg-buildflags --get CXXFLAGS`
+
+ LDFLAGS = `sdl-config --libs` -lGL -lGLU -lSDL_mixer -lSDL_image
++LDFLAGS += `dpkg-buildflags --get LDFLAGS`
+
+
+ all: $(TARGET)
+@@ -15,7 +18,7 @@ all: $(TARGET)
+ OFILES = audio.o config.o container.o entity.o random.o game.o util.o menu.o
help.o font_ogl.o skybox.o math/frustum.o math/quaternion.o font_data.o
position.o light.o formation.o tex.o models/sphere.o models/bomb.o
models/displaylists.o models/plane1.o models/slope1_1.o models/slope1_2.o
models/slope2_1.o models/slope2_2.o models/slope3_1.o models/slope3_2.o
models/slope4_1.o models/slope4_2.o models/tower.o models/bunker.o
models/biosphere.o models/plane2.o models/station.o floor.o radio.o main.o
elements/energy.o elements/difficulty.o elements/interval.o elements/score.o
elements/timeleft.o tweak/tweak_release.o block/block.o block/blockinfo.o
block/cacher.o block/collider.o block/cube.o block/debugger.o
block/destructor.o block/infostack.o block/map2.o block/material.o
block/merger.o block/painter3.o block/painter6.o block/selector2.o
+
+ $(TARGET): $(OFILES)
+- $(CXX) -o $(TARGET) $(OFILES) $(LDFLAGS)
++ $(CXX) $(LDFLAGS) $(OFILES) -o $(TARGET)
+
+
+ clean:
Modified: packages/trunk/enemylines7/debian/patches/series
===================================================================
--- packages/trunk/enemylines7/debian/patches/series 2013-08-10 20:56:43 UTC
(rev 14469)
+++ packages/trunk/enemylines7/debian/patches/series 2013-08-11 10:20:50 UTC
(rev 14470)
@@ -1,2 +1,4 @@
20_data_in_usr_games.patch
-fix-gcc-4.3.diff
+fix-gcc-4.3.patch
+10-turn-off-useless-warnings.patch
+hardening.patch
_______________________________________________
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
