Author: apo-guest
Date: 2013-08-10 20:56:43 +0000 (Sat, 10 Aug 2013)
New Revision: 14469
Added:
packages/trunk/enemylines7/debian/enemylines7.6
packages/trunk/enemylines7/debian/patches/fix-gcc-4.3.diff
Removed:
packages/trunk/enemylines7/debian/TODO.Debian
packages/trunk/enemylines7/debian/enelin7.6
packages/trunk/enemylines7/debian/patches/debug.patch
packages/trunk/enemylines7/debian/patches/rapidxml_print.hpp-gcc4.7.patch
packages/trunk/enemylines7/debian/patches/util_math.h-gcc4.7.patch
Modified:
packages/trunk/enemylines7/debian/README.source
packages/trunk/enemylines7/debian/changelog
packages/trunk/enemylines7/debian/control
packages/trunk/enemylines7/debian/enemylines7.desktop
packages/trunk/enemylines7/debian/install
packages/trunk/enemylines7/debian/manpages
packages/trunk/enemylines7/debian/menu
packages/trunk/enemylines7/debian/patches/20_data_in_usr_games.patch
packages/trunk/enemylines7/debian/patches/series
packages/trunk/enemylines7/debian/rules
packages/trunk/enemylines7/debian/watch
Log:
enemylines 0.6-4
Use debhelper 9, compat level 9
Refresh 20_data_in_usr_games.patch
Drop quilt build-dependency
Use dh sequencer
Create a man page for enemylines7, don't use docbook-to-man anymore
See also debian/changelog
Outline the steps to bring version 0.8 into shape
Modified: packages/trunk/enemylines7/debian/README.source
===================================================================
--- packages/trunk/enemylines7/debian/README.source 2013-08-10 01:28:38 UTC
(rev 14468)
+++ packages/trunk/enemylines7/debian/README.source 2013-08-10 20:56:43 UTC
(rev 14469)
@@ -1,5 +1,18 @@
-enemylines7 for Debian
-======================
+For those brave enough trying to get version 0.8 into Debian
+============================================================
-The game was repacked to remove pre-built binaries and *.dll files. Please use
-debian/rules get-orig-source to obtain the original and dfsg free sources.
+- Version 0.8 compiles but the game segfaults on startup.
+- Probably an error with SDL or linkage problem.
+- Please start with revision 14002. It includes a patch to make the game
+ compile.
+- The game embeds multiple third party software
+ + Glee
+ + physfs
+ + SDL ? they all need to be removed and replaced.
+ + rapidxml (is not available in Debian yet)
+- The game needs to be split in two packages enemylines7 and enemylines7-data.
+ The new version is considerably larger than 0.6.
+- The whole copyright file must be updated.
+- Version 0.8 is more than 4 years old. It is questionable whether the new
+ version is worth packaging because there is no documentation available and
+ the effort to bring it in shape is high.
Deleted: packages/trunk/enemylines7/debian/TODO.Debian
===================================================================
--- packages/trunk/enemylines7/debian/TODO.Debian 2013-08-10 01:28:38 UTC
(rev 14468)
+++ packages/trunk/enemylines7/debian/TODO.Debian 2013-08-10 20:56:43 UTC
(rev 14469)
@@ -1,15 +0,0 @@
-- Version 0.8 compiles but the game segfaults on startup.
- + Please use debian/rules get-orig-source to obtain the sources.
-- Probably an error with SDL or linkage problem.
-- The game embeds multiple third party software
- + Glee
- + physfs
- + SDL ? they all need to be removed and replaced.
- + rapidxml (is not available in Debian yet)
-- The game needs to be split in two packages enemylines7 and enemylines7-data.
- The new version is considerably larger than 0.6.
-- The whole copyright file must be updated.
-- Version 0.8 is more than 4 years old. It is questionable whether the new
- version is worth packaging because there is no documentation available and
- the effort to bring it in shape is high.
-
Modified: packages/trunk/enemylines7/debian/changelog
===================================================================
--- packages/trunk/enemylines7/debian/changelog 2013-08-10 01:28:38 UTC (rev
14468)
+++ packages/trunk/enemylines7/debian/changelog 2013-08-10 20:56:43 UTC (rev
14469)
@@ -1,4 +1,4 @@
-enemylines7 (0.8+dfsg-1) UNRELEASED; urgency=low
+enemylines7 (0.6-4) unstable; urgency=low
* Team upload.
@@ -6,7 +6,8 @@
* Remove deprecated Encoding key from .desktop file
[ Markus Koschany ]
- * Improve watch file and create a more flexible extension regex. (Closes:
#531617)
+ * Improve watch file and create a more flexible extension regex.
+ (Closes: #531617)
* Switch to package format 3.0 (quilt).
* Bump Standards-Version to 3.9.4, no changes required.
* Bump compat level to 9 and require debhelper >=9 for automatic hardening
@@ -16,24 +17,12 @@
- 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.
- - Add glee-dev to Build-Depends.
* debian/rules:
- Simplify debian/rules by using dh sequencer.
- - Add get-orig-source target.
- Build with --parallel.
- * debian/patches:
- - Add rapidxml_print.hpp-gcc4.7.patch and util_math.h-gcc4.7.patch to make
- enemylines7 compile with >= gcc4.7.
[ Alexander Reichle-Schmehl ]
- * New upstream release (Closes: #527366)
- * Drop debian/patches/fix-gcc-4.3.diff, applied upstream
- * Drop debian/patches/10_turn_off_useless_warnings.patch not needed
- anymore
- * Refresh debian/patches/20_data_in_usr_games.patch
- * Adapt menu and desktop entry to renamed binary
* Adapt debian/control to my new name
- * Add debian/README.source
-- Markus Koschany <a...@gambaru.de> Tue, 09 Apr 2013 18:24:13 +0200
Modified: packages/trunk/enemylines7/debian/control
===================================================================
--- packages/trunk/enemylines7/debian/control 2013-08-10 01:28:38 UTC (rev
14468)
+++ packages/trunk/enemylines7/debian/control 2013-08-10 20:56:43 UTC (rev
14469)
@@ -5,7 +5,6 @@
Uploaders: Alexander Reichle-Schmehl <toli...@debian.org>
Build-Depends:
debhelper (>= 9),
- glee-dev,
libsdl-image1.2-dev,
libsdl-mixer1.2-dev,
libsdl1.2-dev
@@ -20,12 +19,3 @@
Description: first person 3d-shooter game
Enemy Lines 7 is a Single-player game. You have to Shoot down enemy
bombers threatening your city.
-
-Package: enemylines7-dbg
-Section: debug
-Priority: extra
-Architecture: any
-Depends: enemylines7 (= ${binary:Version}), ${misc:Depends}
-Description: debugging symbols for enemylines7
- This package contains debugging symbols for the game enemylines7. It is only
- required for testing and not to be meant for release.
Deleted: packages/trunk/enemylines7/debian/enelin7.6
===================================================================
--- packages/trunk/enemylines7/debian/enelin7.6 2013-08-10 01:28:38 UTC (rev
14468)
+++ packages/trunk/enemylines7/debian/enelin7.6 2013-08-10 20:56:43 UTC (rev
14469)
@@ -1,56 +0,0 @@
-.TH "ENEMYLINES7" "6"
-.SH "NAME"
-enemylines7 - a shoot'em up game
-.SH "SYNOPSIS"
-.PP
-\fBenemylines7\fR
-.SH "DESCRIPTION"
-.PP
-This manual page documents briefly the
-\fBenemylines7\fR command.
-.PP
-This manual page was written for the \fBDebian\fP distribution
-because the original program does not have a manual page.
-Instead, it has documentation in the GNU \fBInfo\fP format; see below.
-.PP
-\fBenemylines7\fR is a OpenGL video game.
-.SH "HISTORY"
-.PP
-Enemy bombers are approaching Glysen, our capital.
-The situation is without hope.
-But with the new experimental mech we developed you can at least try to take
-as many of them with you as possible.
-
-.PP
-Good hunting.
-
-.SH "OPTIONS"
-.PP
-This program accepts some optional parameters.
-.IP "\fB-width\fP"
-to give a specific width to the window
-.IP "\fB-height\fP"
-to give a specific height to the window
-.IP "\fB-fullscreen\fP"
-to active the fullscreen mode
-.IP "\fB-noaudio\fP"
-to turn off the sound
-.IP "\fB-dir\fP"
-to use a specific data directory
-.SH "SEE ALSO"
-.PP
-You can visit the \fI enemylines7 homepage (link to URL
-http://raum1.memebot.com/enemylines/) \fR.
-.SH "AUTHOR"
-.PP
-This manual page was written by Goneri Le Bouder gon...@rulezlan.org for
-the \fBDebian\fP system (but may be used by others). Permission is
-granted to copy, distribute and/or modify this document under
-the terms of the GNU General Public License, Version 2 any
-later version published by the Free Software Foundation.
-
-.PP
-On Debian systems, the complete text of the GNU General Public
-License can be found in /usr/share/common-licenses/GPL.
-
-
Added: packages/trunk/enemylines7/debian/enemylines7.6
===================================================================
--- packages/trunk/enemylines7/debian/enemylines7.6
(rev 0)
+++ packages/trunk/enemylines7/debian/enemylines7.6 2013-08-10 20:56:43 UTC
(rev 14469)
@@ -0,0 +1,56 @@
+.TH "ENEMYLINES7" "6"
+.SH "NAME"
+enemylines7 - a shoot'em up game
+.SH "SYNOPSIS"
+.PP
+\fBenemylines7\fR
+.SH "DESCRIPTION"
+.PP
+This manual page documents briefly the
+\fBenemylines7\fR command.
+.PP
+This manual page was written for the \fBDebian\fP distribution
+because the original program does not have a manual page.
+Instead, it has documentation in the GNU \fBInfo\fP format; see below.
+.PP
+\fBenemylines7\fR is a OpenGL video game.
+.SH "HISTORY"
+.PP
+Enemy bombers are approaching Glysen, our capital.
+The situation is without hope.
+But with the new experimental mech we developed you can at least try to take
+as many of them with you as possible.
+
+.PP
+Good hunting.
+
+.SH "OPTIONS"
+.PP
+This program accepts some optional parameters.
+.IP "\fB-width\fP"
+to give a specific width to the window
+.IP "\fB-height\fP"
+to give a specific height to the window
+.IP "\fB-fullscreen\fP"
+to active the fullscreen mode
+.IP "\fB-noaudio\fP"
+to turn off the sound
+.IP "\fB-dir\fP"
+to use a specific data directory
+.SH "SEE ALSO"
+.PP
+You can visit the \fI enemylines7 homepage (link to URL
+http://raum1.memebot.com/enemylines/) \fR.
+.SH "AUTHOR"
+.PP
+This manual page was written by Goneri Le Bouder gon...@rulezlan.org for
+the \fBDebian\fP system (but may be used by others). Permission is
+granted to copy, distribute and/or modify this document under
+the terms of the GNU General Public License, Version 2 any
+later version published by the Free Software Foundation.
+
+.PP
+On Debian systems, the complete text of the GNU General Public
+License can be found in /usr/share/common-licenses/GPL.
+
+
Modified: packages/trunk/enemylines7/debian/enemylines7.desktop
===================================================================
--- packages/trunk/enemylines7/debian/enemylines7.desktop 2013-08-10
01:28:38 UTC (rev 14468)
+++ packages/trunk/enemylines7/debian/enemylines7.desktop 2013-08-10
20:56:43 UTC (rev 14469)
@@ -2,7 +2,8 @@
Name=Enemylines7
Comment=first person 3d-shooter game
Comment[fr_FR]=un jeu de tir à la premiere personne
-Exec=enelin7
+Comment[de]=3D-Ego-Shooter-Spiel
+Exec=enemylines7
Icon=enemylines7
Terminal=false
Type=Application
Modified: packages/trunk/enemylines7/debian/install
===================================================================
--- packages/trunk/enemylines7/debian/install 2013-08-10 01:28:38 UTC (rev
14468)
+++ packages/trunk/enemylines7/debian/install 2013-08-10 20:56:43 UTC (rev
14469)
@@ -1,4 +1,2 @@
-data usr/share/games/enemylines7
debian/enemylines7.desktop usr/share/applications
debian/enemylines7.xpm usr/share/pixmaps
-src/enelin7 usr/games/
Modified: packages/trunk/enemylines7/debian/manpages
===================================================================
--- packages/trunk/enemylines7/debian/manpages 2013-08-10 01:28:38 UTC (rev
14468)
+++ packages/trunk/enemylines7/debian/manpages 2013-08-10 20:56:43 UTC (rev
14469)
@@ -1 +1 @@
-debian/enelin7.6
+debian/*.6
Modified: packages/trunk/enemylines7/debian/menu
===================================================================
--- packages/trunk/enemylines7/debian/menu 2013-08-10 01:28:38 UTC (rev
14468)
+++ packages/trunk/enemylines7/debian/menu 2013-08-10 20:56:43 UTC (rev
14469)
@@ -1,6 +1,6 @@
?package(enemylines7):needs="X11" \
section="Games/Action" \
title="Enemylines7" \
- command="/usr/games/enelin7" \
+ command="/usr/games/enemylines7" \
longtitle="Enemylines7 - first person 3d-shooter game" \
icon="/usr/share/pixmaps/enemylines7.xpm"
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 01:28:38 UTC (rev 14468)
+++ packages/trunk/enemylines7/debian/patches/20_data_in_usr_games.patch
2013-08-10 20:56:43 UTC (rev 14469)
@@ -1,20 +1,36 @@
-From: Debian Games Team <pkg-games-de...@lists.alioth.debian.org>
-Date: Tue, 9 Apr 2013 23:27:35 +0200
+From: Markus Koschany <a...@gambaru.de>
+Date: Sat, 10 Aug 2013 21:55:18 +0200
Subject: 20_data_in_usr_games
---
- src/lib01/filesystem1/filesystem1.cc | 1 +
- 1 file changed, 1 insertion(+)
+ Makefile | 4 ++--
+ main.cc | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
-diff --git a/src/lib01/filesystem1/filesystem1.cc
b/src/lib01/filesystem1/filesystem1.cc
-index 3a85170..76f0c0b 100644
---- a/src/lib01/filesystem1/filesystem1.cc
-+++ b/src/lib01/filesystem1/filesystem1.cc
-@@ -57,6 +57,7 @@ FileSystem1::FileSystem1(std::string
my):myname(my),physfs(false) {
- dirs.push_back("(archive)/$");
- dirs.push_back("(archive)/data");
- dirs.push_back("(archive)");
-+ dirs.push_back("/usr/share/games/enemylines7/data");
- }
+diff --git a/Makefile b/Makefile
+index 2bcdf41..afbcc50 100644
+--- a/Makefile
++++ b/Makefile
+@@ -22,7 +22,7 @@ clean:
+ rm -f *.o models/*.o block/*.o tweak/*.o math/*.o elements/*.o $(TARGET)
- bool FileSystem1::test_archive_file(std::string filename) {
+ install:
+- mkdir -p $(DESTDIR)/share/enemylines7/
++ mkdir -p $(DESTDIR)/share/games/enemylines7/
+ mkdir -p $(DESTDIR)/bin/
+ cp enemylines7 $(DESTDIR)/bin/
+- cp data/* $(DESTDIR)/share/enemylines7/
++ cp data/* $(DESTDIR)/share/games/enemylines7/
+diff --git a/main.cc b/main.cc
+index 90d9199..e31a03e 100644
+--- a/main.cc
++++ b/main.cc
+@@ -38,7 +38,7 @@ std::string load_audio(std::string dir) {
+ path+="/";
+ std::cout << " Looking in " << path << std::endl;
+ if (Audio::load(path)) return path;
+- path="/usr/share/";
++ path="/usr/share/games/";
+ path+=PATHNAME;
+ path+="/";
+ std::cout << " Looking in " << path << std::endl;
Deleted: packages/trunk/enemylines7/debian/patches/debug.patch
===================================================================
--- packages/trunk/enemylines7/debian/patches/debug.patch 2013-08-10
01:28:38 UTC (rev 14468)
+++ packages/trunk/enemylines7/debian/patches/debug.patch 2013-08-10
20:56:43 UTC (rev 14469)
@@ -1,23 +0,0 @@
-From: Markus Koschany <a...@gambaru.de>
-Date: Wed, 10 Apr 2013 18:13:19 +0200
-Subject: debug
-
----
- src/Makefile | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/Makefile b/src/Makefile
-index c7ab04c..9476873 100644
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -2,8 +2,8 @@ DESTDIR ?= /usr/local
- TARGET = enelin7
- CXX= g++
- LIB01_OPTIONS=-DL01_GLEE -DL01_SDL -DL01_GAMEPLAY -DL01_V=08 -DL01_S=el7
-DL01_OPENGL -DL01_PHYSFS_INT -DL01_FORMATIONS -DL01_FILESYSTEM1 -DL01_R=15
-DL01_BLOCK -DL01_VBLOCK -DL01_MODEL1 -DL01_PARTICLES3 -DNDEBUG
--CXXFLAGS = -O2 -Wall `sdl-config --cflags` -I./ $(LIB01_OPTIONS)
--CFLAGS = -O2 -Wall `sdl-config --cflags` -I./ $(LIB01_OPTIONS)
-+CXXFLAGS = -g -O0 -Wall `sdl-config --cflags` -I./ $(LIB01_OPTIONS)
-+CFLAGS = -g -O0 -Wall `sdl-config --cflags` -I./ $(LIB01_OPTIONS)
- LDFLAGS = `sdl-config --libs` -lGL -lGLU
- OFILES= lib01/tset/tset.o lib01/tweak/tweak.o lib01/tweak/tweakobject.o
lib01/tweak/tweakerror.o lib01/tweak/tweakcore.o lib01/tweak/tweakaccess.o
lib01/tweak/tweakconstant.o lib01/tweak/tweakbool.o lib01/tweak/tweakint.o
lib01/tweak/tweakuint.o lib01/tweak/tweakfloat.o lib01/tweak/tweakstring.o
lib01/tweak/tweakc3.o lib01/tweak/tweakc3f.o lib01/tweak/tweakenum.o
lib01/tweak/tweakbitset.o lib01/tweak/tweakreference.o
lib01/tweak/tweakiterator.o lib01/tweak/tweakrequest.o
lib01/tweak/tweakserver.o lib01/tweak/tweakloader.o lib01/tweak/tweaksaver.o
lib01/tweak/tweakargs.o lib01/tweak/tweakfile.o lib01/tweak/tweakdebug.o
lib01/tweak/t_tweak.o lib01/tweak/tests_tweak_basic.o lib01/tweak/tests_tweak.o
lib01/model1/model.o lib01/model1/loader_obj.o lib01/model1/loader.o
lib01/model1/keeper.o lib01/model1/v_model.o lib01/model1/t_model1_viewer.o
lib01/model1/tests_model.o lib01/random/random.o lib01/random/tests_random.o
lib01/filesystem1/filesystem1.o lib01/filesystem1/t_filesystem1.o
lib01/filesystem1/tests_filesystem1.o lib01/general/util_general.o
lib01/general/defineinfo.o lib01/general/imagedata.o lib01/general/fontdata.o
lib01/general/stringified.o lib01/general/alert.o lib01/general/tests_general.o
lib01/wrappers/posix/posix.o lib01/wrappers/posix/tests_posix.o
lib01/tools/tools.o lib01/opengl/util_opengl.o lib01/opengl/primitives.o
lib01/opengl/glut_geometry.o lib01/opengl/lighttweak.o
lib01/opengl/setuptweak.o lib01/opengl/fogtweak.o lib01/opengl/glstate.o
lib01/opengl/draw_im.o lib01/opengl/draw_vbo.o lib01/opengl/shader.o
lib01/opengl/enums.o lib01/opengl/texturekeeper_base.o
lib01/opengl/reflection.o lib01/opengl/t_shader_test.o lib01/opengl/water1.o
lib01/opengl/water2.o lib01/opengl/minimap.o lib01/opengl/tests_opengl.o
lib01/formations/formationclasses.o lib01/formations/formations.o
lib01/formations/formationstweak.o lib01/formations/t_formations.o
lib01/formations/tests_formations.o lib01/assimilated/rapidxml/util_rapidxml.o
lib01/assimilated/rapidxml/tests_rapidxml.o lib01/math/frustum.o
lib01/math/bits.o lib01/math/pick.o lib01/math/trig.o lib01/math/position.o
lib01/math/quaternion.o lib01/math/direction123.o lib01/math/direction.o
lib01/math/direction3d.o lib01/math/direction3d_val.o lib01/math/quad.o
lib01/math/matrix4.o lib01/math/obox3f.o lib01/math/intersection.o
lib01/math/util_math.o lib01/math/t_intersectiontest.o
lib01/math/t_frustumtest.o lib01/math/tests_math.o lib01/v_block/v_block.o
lib01/v_block/v_block_edit.o lib01/v_block/v_block_select.o
lib01/v_block/cacher_displaylist.o lib01/v_block/cacher_vbo.o
lib01/v_block/v_cube.o lib01/v_block/v_material.o lib01/v_block/util_v_block.o
lib01/v_block/t_block_viewer.o lib01/v_block/t_block_destruct.o
lib01/v_block/tests_v_block.o lib01/assimilated/glee/GLee.o
lib01/assimilated/glee/util_glee.o lib01/sdl/util_sdl.o
lib01/sdl/util_sdlopengl.o lib01/sdl/clipstack.o lib01/sdl/image.o
lib01/sdl/mixer.o lib01/sdl/ttf.o lib01/sdl/video.o lib01/sdl/imagekeeper.o
lib01/sdl/texturekeeper.o lib01/sdl/audiokeeper.o lib01/sdl/write.o
lib01/sdl/draw.o lib01/sdl/dirt.o lib01/sdl/input.o lib01/sdl/map_sdl.o
lib01/sdl/t_sdl_viewer.o lib01/sdl/t_sdl_info.o lib01/sdl/t_sdl_input.o
lib01/sdl/t_sdl_modes.o lib01/sdl/tests_sdl.o lib01/gameplay/wavetweak.o
lib01/gameplay/energy.o lib01/gameplay/money.o lib01/gameplay/timeleft.o
lib01/gameplay/score.o lib01/gameplay/difficulty.o lib01/gameplay/radio2.o
lib01/gameplay/skills3.o lib01/gameplay/factions1.o
lib01/gameplay/tests_gameplay.o lib01/assimilated/misc/md5.o
lib01/assimilated/misc/tests_assimilated.o lib01/stringstuff/filenames.o
lib01/stringstuff/files.o lib01/stringstuff/split.o lib01/stringstuff/numbers.o
lib01/stringstuff/util_stringstuff.o lib01/stringstuff/tests_stringstuff.o
lib01/assimilated/physfs/physfs.o lib01/assimilated/physfs/physfs_byteorder.o
lib01/assimilated/physfs/physfs_unicode.o
lib01/assimilated/physfs/extras/physfsrwops.o
lib01/assimilated/physfs/archivers/zip.o
lib01/assimilated/physfs/archivers/dir.o
lib01/assimilated/physfs/platform/beos.o
lib01/assimilated/physfs/platform/macosx.o
lib01/assimilated/physfs/platform/os2.o
lib01/assimilated/physfs/platform/pocketpc.o
lib01/assimilated/physfs/platform/posix.o
lib01/assimilated/physfs/platform/unix.o
lib01/assimilated/physfs/platform/windows.o lib01/particles3/particles3.o
lib01/particles3/step1.o lib01/particles3/step2.o
lib01/particles3/v_particles3.o lib01/particles3/t_particles3.o
lib01/particles3/tests_particles3.o lib01/algorithms/misc.o
lib01/algorithms/active.o lib01/algorithms/sectors.o lib01/algorithms/uistack.o
lib01/algorithms/drawnlist.o lib01/algorithms/areapick.o
lib01/algorithms/container_tpl.o lib01/algorithms/proximity_tpl.o
lib01/algorithms/collisionmatrix.o lib01/algorithms/collisiondistances.o
lib01/algorithms/framecounter.o lib01/algorithms/animation.o
lib01/algorithms/sequences.o lib01/algorithms/tests_algorithms.o
lib01/debug/dout.o lib01/debug/tune.o lib01/block/block.o
lib01/block/blockdata.o lib01/block/blockinfo.o lib01/block/blockenvironment.o
lib01/block/material.o lib01/block/triangulator.o lib01/block/texturer.o
lib01/block/iterator.o lib01/block/collider.o lib01/block/rotator.o
lib01/block/debugger.o lib01/block/infostack.o lib01/block/merger.o
lib01/block/selection.o lib01/block/world.o lib01/block/saver.o
lib01/block/loader.o lib01/block/builtin.o lib01/block/lookup.o
lib01/block/neighbour.o lib01/block/sidechecker.o lib01/block/faceremover3.o
lib01/block/faceremover6.o lib01/block/faceremover8.o
lib01/block/faceremover9.o lib01/block/destructor6.o lib01/block/creator1.o
lib01/block/gravity1.o lib01/block/gravity2.o lib01/block/gravity3.o
lib01/block/mirror.o lib01/block/gridaccess.o lib01/block/sphere.o
lib01/block/util_block.o lib01/block/t_block_info.o
lib01/block/tests_block_multi.o lib01/block/tests_block.o main.o base.o world.o
control.o entity.o destructor.o view.o v_mech.o tool.o
- all: $(TARGET)
Added: packages/trunk/enemylines7/debian/patches/fix-gcc-4.3.diff
===================================================================
--- packages/trunk/enemylines7/debian/patches/fix-gcc-4.3.diff
(rev 0)
+++ packages/trunk/enemylines7/debian/patches/fix-gcc-4.3.diff 2013-08-10
20:56:43 UTC (rev 14469)
@@ -0,0 +1,24 @@
+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;
+
Deleted:
packages/trunk/enemylines7/debian/patches/rapidxml_print.hpp-gcc4.7.patch
===================================================================
--- packages/trunk/enemylines7/debian/patches/rapidxml_print.hpp-gcc4.7.patch
2013-08-10 01:28:38 UTC (rev 14468)
+++ packages/trunk/enemylines7/debian/patches/rapidxml_print.hpp-gcc4.7.patch
2013-08-10 20:56:43 UTC (rev 14469)
@@ -1,55 +0,0 @@
-From: Markus Koschany <a...@gambaru.de>
-Date: Tue, 9 Apr 2013 23:29:09 +0200
-Subject: rapidxml_print.hpp gcc4.7
-
----
- src/lib01/assimilated/rapidxml/rapidxml_print.hpp | 36 +++++++++++++++++++++
- 1 file changed, 36 insertions(+)
-
-diff --git a/src/lib01/assimilated/rapidxml/rapidxml_print.hpp
b/src/lib01/assimilated/rapidxml/rapidxml_print.hpp
-index 008705b..1b08f1a 100644
---- a/src/lib01/assimilated/rapidxml/rapidxml_print.hpp
-+++ b/src/lib01/assimilated/rapidxml/rapidxml_print.hpp
-@@ -117,6 +117,42 @@ namespace rapidxml
- return false;
- }
-
-+ template<class OutIt, class Ch>
-+ inline OutIt print_children(OutIt out, const xml_node<Ch> *node,
int flags,
-+ int indent);
-+
-+ template<class OutIt, class Ch>
-+ inline OutIt print_attributes(OutIt out, const xml_node<Ch>
*node, int
-+ flags);
-+
-+ template<class OutIt, class Ch>
-+ inline OutIt print_data_node(OutIt out, const xml_node<Ch> *node,
int
-+ flags, int indent);
-+
-+ template<class OutIt, class Ch>
-+ inline OutIt print_cdata_node(OutIt out, const xml_node<Ch>
*node, int
-+ flags, int indent);
-+
-+ template<class OutIt, class Ch>
-+ inline OutIt print_element_node(OutIt out, const xml_node<Ch>
*node, int
-+ flags, int indent);
-+
-+ template<class OutIt, class Ch>
-+ inline OutIt print_declaration_node(OutIt out, const xml_node<Ch>
*node,
-+ int flags, int indent);
-+
-+ template<class OutIt, class Ch>
-+ inline OutIt print_comment_node(OutIt out, const xml_node<Ch>
*node, int
-+ flags, int indent);
-+
-+ template<class OutIt, class Ch>
-+ inline OutIt print_doctype_node(OutIt out, const xml_node<Ch>
*node, int
-+ flags, int indent);
-+
-+ template<class OutIt, class Ch>
-+ inline OutIt print_pi_node(OutIt out, const xml_node<Ch> *node,
int flags,
-+ int indent);
-+
-
///////////////////////////////////////////////////////////////////////////
- // Internal printing operations
-
Modified: packages/trunk/enemylines7/debian/patches/series
===================================================================
--- packages/trunk/enemylines7/debian/patches/series 2013-08-10 01:28:38 UTC
(rev 14468)
+++ packages/trunk/enemylines7/debian/patches/series 2013-08-10 20:56:43 UTC
(rev 14469)
@@ -1,4 +1,2 @@
20_data_in_usr_games.patch
-rapidxml_print.hpp-gcc4.7.patch
-util_math.h-gcc4.7.patch
-debug.patch
+fix-gcc-4.3.diff
Deleted: packages/trunk/enemylines7/debian/patches/util_math.h-gcc4.7.patch
===================================================================
--- packages/trunk/enemylines7/debian/patches/util_math.h-gcc4.7.patch
2013-08-10 01:28:38 UTC (rev 14468)
+++ packages/trunk/enemylines7/debian/patches/util_math.h-gcc4.7.patch
2013-08-10 20:56:43 UTC (rev 14469)
@@ -1,62 +0,0 @@
-From: Markus Koschany <a...@gambaru.de>
-Date: Tue, 9 Apr 2013 23:51:00 +0200
-Subject: util_math.h gcc4.7
-
----
- src/lib01/math/util_math.h | 31 ++++++++++++++-----------------
- 1 file changed, 14 insertions(+), 17 deletions(-)
-
-diff --git a/src/lib01/math/util_math.h b/src/lib01/math/util_math.h
-index d5840ac..9012109 100644
---- a/src/lib01/math/util_math.h
-+++ b/src/lib01/math/util_math.h
-@@ -26,35 +26,32 @@
- namespace lib01 {
- namespace util_math {
-
-+template <class T> T cantor(T x,T y) {
-+ return (x+y)*(x+y+1)/2+y;
-+}
-+template <class T> T cantor_y(T z) {
-+ T j = static_cast<T>(floor(sqrt(0.25 + 2*z) - 0.5));
-+ return z - j*(j+1)/2;
-+}
- template <class T> T cantor3(T x,T y,T z) {
- T a=cantor(x,y);
- return cantor(a,z);
- }
--template <class T> T cantor3_x(T z) {
-- T a=cantor_x(z);
-- return cantor_x(a);
--}
--template <class T> T cantor3_y(T z) {
-- T a=cantor_x(z);
-- return cantor_y(a);
--}
- template <class T> T cantor3_z(T z) {
- return cantor_y(z);
- }
--
--
--template <class T> T cantor(T x,T y) {
-- return (x+y)*(x+y+1)/2+y;
--}
- template <class T> T cantor_x(T z) {
- T j = static_cast<T>(floor(sqrt(0.25 + 2*z) - 0.5));
- return j - cantor_y(z);
- }
--template <class T> T cantor_y(T z) {
-- T j = static_cast<T>(floor(sqrt(0.25 + 2*z) - 0.5));
-- return z - j*(j+1)/2;
-+template <class T> T cantor3_y(T z) {
-+ T a=cantor_x(z);
-+ return cantor_y(a);
-+}
-+template <class T> T cantor3_x(T z) {
-+ T a=cantor_x(z);
-+ return cantor_x(a);
- }
--
-
- int ggt(int a,int b);
- void get_aspect_ratio(int& a,int& b);
Modified: packages/trunk/enemylines7/debian/rules
===================================================================
--- packages/trunk/enemylines7/debian/rules 2013-08-10 01:28:38 UTC (rev
14468)
+++ packages/trunk/enemylines7/debian/rules 2013-08-10 20:56:43 UTC (rev
14469)
@@ -1,41 +1,9 @@
#!/usr/bin/make -f
#export DH_VERBOSE=1
-DPATH := $(abspath $(dir $(MAKEFILE_LIST)))
-DTYPE := +dfsg
-PKG := enemylines7
-VER ?= $(shell dpkg-parsechangelog -l$(DPATH)/changelog | perl -ne 'print $$1
if m{Version:\s*(\d[\d\.]+)}')
-
%:
dh $@ --parallel
-override_dh_auto_build:
- cd $(CURDIR)/src && $(MAKE)
-
-override_dh_clean:
- dh_clean
- cd $(CURDIR)/src && $(MAKE) clean
-
-override_dh_strip:
- dh_strip --dbg-package=enemylines7-dbg
-
-.PHONY: get-orig-source
-get-orig-source: $(PKG)_$(VER)$(DTYPE).orig.tar.xz
- @
-
-$(PKG)_$(VER)$(DTYPE).orig.tar.xz:
- @echo "# Downloading..."
- uscan --noconf --verbose --repack --rename --destdir=$(CURDIR)
--check-dirname-level=0 --force-download --download-version $(VER) $(DPATH)
- @echo "# Extracting..."
- mkdir $(PKG)-$(VER) \
- && tar xf $(PKG)_$(VER).orig.tar.* --directory $(PKG)-$(VER)
--strip-components 1 \
- || $(RM) -r $(PKG)-$(VER)
- @echo "# Clean-up..."
- cd $(PKG)-$(VER) \
- && $(RM) -r -v \
- *.dll \
- enelin7*
- @echo "# Packing..."
- tar -caf "$(PKG)_$(VER)$(DTYPE).orig.tar.xz" "$(PKG)-$(VER)" \
- && $(RM) -r "$(PKG)-$(VER)"
-
+override_dh_auto_install:
+ $(MAKE) install DESTDIR=$(CURDIR)/debian/enemylines7/usr
+ mv $(CURDIR)/debian/enemylines7/usr/bin
$(CURDIR)/debian/enemylines7/usr/games
Modified: packages/trunk/enemylines7/debian/watch
===================================================================
--- packages/trunk/enemylines7/debian/watch 2013-08-10 01:28:38 UTC (rev
14468)
+++ packages/trunk/enemylines7/debian/watch 2013-08-10 20:56:43 UTC (rev
14469)
@@ -1,3 +1,2 @@
version=3
-opts="dversionmangle=s/\+dfsg//" \
http://proj.phk.at/el/7
enelin7-([\d\.]+)\.(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))
_______________________________________________
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
