r10989 - in packages/trunk/parsec47/debian: . patches

[Peter De Wachter]

Author: pdewacht-guest
Date: 2010-05-29 09:07:01 +0000 (Sat, 29 May 2010)
New Revision: 10989

Modified:
   packages/trunk/parsec47/debian/changelog
   packages/trunk/parsec47/debian/patches/makefile.patch
Log:
parsec47: fix "circular initialization dependency" error


Modified: packages/trunk/parsec47/debian/changelog
===================================================================
--- packages/trunk/parsec47/debian/changelog	2010-05-25 14:14:44 UTC (rev 10988)
+++ packages/trunk/parsec47/debian/changelog	2010-05-29 09:07:01 UTC (rev 10989)
@@ -1,3 +1,10 @@
+parsec47 (0.2.dfsg1-3) unstable; urgency=low
+
+  * Hard-coded link order to avoid "circular initialization dependency"
+    error (Closes: #583638). See also #521582.
+
+ -- Peter De Wachter <pdewacht at gmail.com>  Sat, 29 May 2010 11:02:22 +0200
+
 parsec47 (0.2.dfsg1-2) unstable; urgency=low
 
   [ Peter De Wachter ]

Modified: packages/trunk/parsec47/debian/patches/makefile.patch
===================================================================
--- packages/trunk/parsec47/debian/patches/makefile.patch	2010-05-25 14:14:44 UTC (rev 10988)
+++ packages/trunk/parsec47/debian/patches/makefile.patch	2010-05-29 09:07:01 UTC (rev 10989)
@@ -2,28 +2,48 @@
 # Copyright (C) 2007  Miriam Ruiz <little_miry at yahoo.es>
 # Distributed under the same license as the game. See debian/copyright.
 
-Index: parsec47-0.2.dfsg1/Makefile
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ parsec47-0.2.dfsg1/Makefile	2007-08-29 18:08:28.000000000 +0000
-@@ -0,0 +1,30 @@
-+DSRC=$(shell find src -name "*.d")
-+SOURCES=$(DSRC) import/SDL_video.d import/SDL_mixer.d
-+OBJS=$(SOURCES:.d=.o)
+--- /dev/null
++++ b/Makefile
+@@ -0,0 +1,47 @@
++OBJS=src/dirent.o src/abagames/util/bulletml/Bullet.o\
++  src/abagames/util/bulletml/BulletsManager.o\
++  src/abagames/util/ActorInitializer.o src/abagames/util/Rand.o\
++  src/abagames/util/Actor.o src/abagames/util/ActorPool.o\
++  src/abagames/util/Logger.o src/abagames/util/sdl/MainLoop.o\
++  src/abagames/util/sdl/Sound.o src/abagames/util/sdl/Screen.o\
++  src/abagames/util/sdl/SDLInitFailedException.o\
++  src/abagames/util/sdl/Texture.o src/abagames/util/sdl/Pad.o\
++  src/abagames/util/sdl/GameManager.o src/abagames/util/sdl/Input.o\
++  src/abagames/util/sdl/Screen3D.o src/abagames/util/Vector.o\
++  src/abagames/util/PrefManager.o src/abagames/p47/StageManager.o\
++  src/abagames/p47/P47Boot.o src/abagames/p47/MorphBullet.o\
++  src/abagames/p47/Shot.o src/abagames/p47/Ship.o\
++  src/abagames/p47/LetterRender.o src/abagames/p47/SoundManager.o\
++  src/abagames/p47/BulletActor.o src/abagames/p47/EnemyType.o\
++  src/abagames/p47/Roll.o src/abagames/p47/Fragment.o\
++  src/abagames/p47/LuminousActorPool.o src/abagames/p47/Lock.o\
++  src/abagames/p47/LuminousScreen.o src/abagames/p47/Title.o\
++  src/abagames/p47/Bonus.o src/abagames/p47/P47Bullet.o\
++  src/abagames/p47/P47GameManager.o src/abagames/p47/Particle.o\
++  src/abagames/p47/P47Screen.o src/abagames/p47/Field.o\
++  src/abagames/p47/Enemy.o src/abagames/p47/LuminousActor.o\
++  src/abagames/p47/P47PrefManager.o src/abagames/p47/BulletActorPool.o\
++  src/abagames/p47/BarrageManager.o src/mt.o import/SDL_video.o\
++  import/SDL_mixer.o src/dirent_d.o
++
 +CFLAGS=-O2 -Wall
 +DFLAGS=-O -release
 +EXE=parsec47
-+COBJS=src/dirent_d.o
 +
 +all: $(EXE)
 +
-+$(EXE): import/SDL_Keysym.d $(OBJS) $(COBJS)
-+	gdc $(CFLAGS) -o $@ $(OBJS) $(COBJS) -lbulletml -lSDL_mixer -lSDL -lGLU -lGL -lm
++$(EXE): import/SDL_Keysym.d $(OBJS)
++	gdc -o $@ $(OBJS)  -lbulletml -lSDL_mixer -lSDL -lGLU -lGL -lm
 +
-+$(OBJS): %.o: %.d
++%.o: %.d
 +	gdmd -d -c -of$@ $(DFLAGS) -Iimport -Isrc -I/usr/X11R6/include/ $<
 +
-+src/dirent_d.o: src/dirent_d.c
++%.o: %.c
 +	gcc -c $< -o $@ $(CFLAGS)
 +
 +import/SDL_Keysym.d:
@@ -31,9 +51,4 @@
 +
 +
 +clean:
-+	$(RM) src/*.o
-+	$(RM) src/abagames/p47/*.o
-+	$(RM) src/abagames/util/*.o
-+	$(RM) src/abagames/util/sdl/*.o
-+	$(RM) src/abagames/util/bulletml/*.o
-+	$(RM) import/*.o
++	$(RM) $(OBJS) $(EXE)