r9282 - in packages/trunk/torus-trooper/debian: . patches

[Peter De Wachter]

Author: pdewacht-guest
Date: 2009-03-28 16:49:04 +0000 (Sat, 28 Mar 2009)
New Revision: 9282

Modified:
   packages/trunk/torus-trooper/debian/changelog
   packages/trunk/torus-trooper/debian/patches/fixes.patch
Log:
torus-trooper: Hardcoded the order in which object files are passed to
the linker, avoiding the "circular initialization dependency" error.
(Closes: #521387)    


Modified: packages/trunk/torus-trooper/debian/changelog
===================================================================
--- packages/trunk/torus-trooper/debian/changelog	2009-03-28 16:43:15 UTC (rev 9281)
+++ packages/trunk/torus-trooper/debian/changelog	2009-03-28 16:49:04 UTC (rev 9282)
@@ -1,3 +1,10 @@
+torus-trooper (0.22.dfsg1-5) UNRELEASED; urgency=low
+
+  * Hardcoded the order in which object files are passed to the linker,
+    avoiding the "circular initialization dependency" error. (Closes: #521387)
+
+ -- Peter De Wachter <pdewacht at gmail.com>  Sat, 28 Mar 2009 17:42:36 +0100
+
 torus-trooper (0.22.dfsg1-4) unstable; urgency=low
 
   [ Sylvain Beucler]

Modified: packages/trunk/torus-trooper/debian/patches/fixes.patch
===================================================================
--- packages/trunk/torus-trooper/debian/patches/fixes.patch	2009-03-28 16:43:15 UTC (rev 9281)
+++ packages/trunk/torus-trooper/debian/patches/fixes.patch	2009-03-28 16:49:04 UTC (rev 9282)
@@ -82,9 +82,27 @@
  Uint8 SDL_EventState(Uint8 type, int state);
 --- /dev/null
 +++ b/Makefile
-@@ -0,0 +1,12 @@
-+DSRC=$(shell find src -name "*.d")
-+SOURCES=$(DSRC) import/SDL_video.d import/SDL_mixer.d
+@@ -0,0 +1,30 @@
++SOURCES=src/abagames/tt/camera.d src/abagames/tt/boot.d\
++ src/abagames/tt/barrage.d src/abagames/tt/bullettarget.d\
++ src/abagames/tt/replay.d src/abagames/tt/ship.d src/abagames/tt/particle.d\
++ src/abagames/tt/tunnel.d src/abagames/tt/enemy.d src/abagames/tt/bulletactor.d\
++ src/abagames/tt/gamemanager.d src/abagames/tt/screen.d src/abagames/tt/title.d\
++ src/abagames/tt/stagemanager.d src/abagames/tt/bulletactorpool.d\
++ src/abagames/tt/shot.d src/abagames/tt/prefmanager.d\
++ src/abagames/tt/bulletimpl.d src/abagames/tt/letter.d\
++ src/abagames/tt/soundmanager.d src/abagames/tt/floatletter.d\
++ src/abagames/tt/shape.d src/abagames/util/actor.d src/abagames/util/rand.d\
++ src/abagames/util/sdl/input.d src/abagames/util/sdl/sound.d\
++ src/abagames/util/sdl/pad.d src/abagames/util/sdl/screen3d.d\
++ src/abagames/util/sdl/mainloop.d src/abagames/util/sdl/gamemanager.d\
++ src/abagames/util/sdl/screen.d src/abagames/util/sdl/recordablepad.d\
++ src/abagames/util/sdl/luminous.d src/abagames/util/sdl/sdlexception.d\
++ src/abagames/util/sdl/displaylist.d src/abagames/util/sdl/texture.d\
++ src/abagames/util/iterator.d src/abagames/util/bulletml/bullet.d\
++ src/abagames/util/bulletml/bulletsmanager.d src/abagames/util/tokenizer.d\
++ src/abagames/util/prefmanager.d src/abagames/util/vector.d\
++ src/abagames/util/logger.d import/SDL_video.d import/SDL_mixer.d
 +OBJS=$(SOURCES:.d=.o)
 +EXE=torus-trooper
 +
@@ -270,9 +288,31 @@
  void /*APIENTRY*/glTexCoord1d (GLdouble s);
 --- /dev/null
 +++ b/Makefile.pure
-@@ -0,0 +1,12 @@
-+DSRC=$(shell find src-hiz -name "*.d")
-+SOURCES=$(DSRC) import/SDL_video.d import/SDL_mixer.d
+@@ -0,0 +1,34 @@
++SOURCES=src-hiz/abagames/tt/camera.d src-hiz/abagames/tt/boot.d\
++ src-hiz/abagames/tt/barrage.d src-hiz/abagames/tt/bullettarget.d\
++ src-hiz/abagames/tt/replay.d src-hiz/abagames/tt/ship.d\
++ src-hiz/abagames/tt/particle.d src-hiz/abagames/tt/tunnel.d\
++ src-hiz/abagames/tt/enemy.d src-hiz/abagames/tt/bulletactor.d\
++ src-hiz/abagames/tt/gamemanager.d src-hiz/abagames/tt/screen.d\
++ src-hiz/abagames/tt/title.d src-hiz/abagames/tt/stagemanager.d\
++ src-hiz/abagames/tt/bulletactorpool.d src-hiz/abagames/tt/shot.d\
++ src-hiz/abagames/tt/prefmanager.d src-hiz/abagames/tt/bulletimpl.d\
++ src-hiz/abagames/tt/letter.d src-hiz/abagames/tt/soundmanager.d\
++ src-hiz/abagames/tt/floatletter.d src-hiz/abagames/tt/shape.d\
++ src-hiz/abagames/tt/crystal.d\
++ src-hiz/abagames/util/actor.d src-hiz/abagames/util/rand.d\
++ src-hiz/abagames/util/sdl/input.d src-hiz/abagames/util/sdl/sound.d\
++ src-hiz/abagames/util/sdl/pad.d src-hiz/abagames/util/sdl/screen3d.d\
++ src-hiz/abagames/util/sdl/mainloop.d src-hiz/abagames/util/sdl/gamemanager.d\
++ src-hiz/abagames/util/sdl/screen.d src-hiz/abagames/util/sdl/recordablepad.d\
++ src-hiz/abagames/util/sdl/luminous.d src-hiz/abagames/util/sdl/sdlexception.d\
++ src-hiz/abagames/util/sdl/displaylist.d src-hiz/abagames/util/sdl/texture.d\
++ src-hiz/abagames/util/iterator.d src-hiz/abagames/util/bulletml/bullet.d\
++ src-hiz/abagames/util/bulletml/bulletsmanager.d\
++ src-hiz/abagames/util/tokenizer.d src-hiz/abagames/util/prefmanager.d\
++ src-hiz/abagames/util/vector.d src-hiz/abagames/util/logger.d\
++ import/SDL_video.d import/SDL_mixer.d
 +OBJS=$(SOURCES:.d=.o)
 +EXE=torus-trooper-pure
 +