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

Vincent Fourmond fourmond at alioth.debian.org
Thu Mar 29 20:08:41 UTC 2012 

Author: fourmond
Date: 2012-03-29 20:08:40 +0000 (Thu, 29 Mar 2012)
New Revision: 13436

Modified:
   packages/trunk/torus-trooper/debian/changelog
   packages/trunk/torus-trooper/debian/control
   packages/trunk/torus-trooper/debian/patches/fixes.patch
Log:
[torus-trooper] fix link order problems

Modified: packages/trunk/torus-trooper/debian/changelog
===================================================================
--- packages/trunk/torus-trooper/debian/changelog	2012-03-28 04:17:34 UTC (rev 13435)
+++ packages/trunk/torus-trooper/debian/changelog	2012-03-29 20:08:40 UTC (rev 13436)
@@ -1,3 +1,11 @@
+torus-trooper (0.22.dfsg1-8) unstable; urgency=low
+
+  * Team upload.
+  * Tweak the build order to avoid circular dependencies (closes: #664799)
+  * Conforms to standards 3.9.3
+
+ -- Vincent Fourmond <fourmond at debian.org>  Thu, 29 Mar 2012 21:49:01 +0200
+
 torus-trooper (0.22.dfsg1-7) unstable; urgency=low
 
   * Team upload.
@@ -6,7 +14,6 @@
   * Provide build-arch and build-indep targets
   * Conforms to standards 3.9.2
 
-
  -- Vincent Fourmond <fourmond at debian.org>  Sat, 07 Jan 2012 16:40:02 +0100
 
 torus-trooper (0.22.dfsg1-6) unstable; urgency=low

Modified: packages/trunk/torus-trooper/debian/control
===================================================================
--- packages/trunk/torus-trooper/debian/control	2012-03-28 04:17:34 UTC (rev 13435)
+++ packages/trunk/torus-trooper/debian/control	2012-03-29 20:08:40 UTC (rev 13436)
@@ -6,7 +6,7 @@
 Build-Depends: debhelper (>= 5), gdc-v1,
  libglu1-mesa-dev | libglu-dev, libgl1-mesa-dev | libgl-dev,
  libsdl1.2-dev, libsdl-mixer1.2-dev, libbulletml-dev
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
 Homepage: http://www.asahi-net.or.jp/~cs8k-cyu/windows/tt_e.html
 Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/torus-trooper/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/torus-trooper/?op=log

Modified: packages/trunk/torus-trooper/debian/patches/fixes.patch
===================================================================
--- packages/trunk/torus-trooper/debian/patches/fixes.patch	2012-03-28 04:17:34 UTC (rev 13435)
+++ packages/trunk/torus-trooper/debian/patches/fixes.patch	2012-03-29 20:08:40 UTC (rev 13436)
@@ -1,8 +1,10 @@
 # Copyright (C) 2007  Marcel Unbehaun <frostworks at gmx.de>
 # Distributed under the same license as the game. See debian/copyright.
 
---- a/import/SDL.d
-+++ b/import/SDL.d
+Index: torus-trooper-0.22.dfsg1/import/SDL.d
+===================================================================
+--- torus-trooper-0.22.dfsg1.orig/import/SDL.d	2004-11-10 23:45:22.000000000 +0100
++++ torus-trooper-0.22.dfsg1/import/SDL.d	2012-03-29 22:04:24.516751384 +0200
 @@ -20,18 +20,28 @@
      slouken at devolution.com
  */
@@ -65,8 +67,10 @@
 -	SDL_Quit();
 -}
 -+/
---- a/import/SDL_events.d
-+++ b/import/SDL_events.d
+Index: torus-trooper-0.22.dfsg1/import/SDL_events.d
+===================================================================
+--- torus-trooper-0.22.dfsg1.orig/import/SDL_events.d	2005-01-01 22:40:28.000000000 +0100
++++ torus-trooper-0.22.dfsg1/import/SDL_events.d	2012-03-29 22:04:24.516751384 +0200
 @@ -304,8 +304,8 @@
    If 'state' is set to SDL_QUERY, SDL_EventState() will return the 
    current processing state of the specified event.
@@ -80,19 +84,22 @@
 +const int SDL_DISABLE	= 0;
 +const int SDL_ENABLE	= 1;
  Uint8 SDL_EventState(Uint8 type, int state);
---- /dev/null
-+++ b/Makefile
-@@ -0,0 +1,30 @@
+Index: torus-trooper-0.22.dfsg1/Makefile
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ torus-trooper-0.22.dfsg1/Makefile	2012-03-29 22:04:24.516751384 +0200
+@@ -0,0 +1,31 @@
 +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/replay.d src/abagames/tt/shape.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/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\
@@ -113,8 +120,10 @@
 +
 +$(OBJS): %.o: %.d
 +	gdc-v1 -c -o $@ -Iimport -Isrc $(DFLAGS) $<
---- a/src/abagames/util/logger.d
-+++ b/src/abagames/util/logger.d
+Index: torus-trooper-0.22.dfsg1/src/abagames/util/logger.d
+===================================================================
+--- torus-trooper-0.22.dfsg1.orig/src/abagames/util/logger.d	2004-11-10 23:45:22.000000000 +0100
++++ torus-trooper-0.22.dfsg1/src/abagames/util/logger.d	2012-03-29 22:04:24.516751384 +0200
 @@ -5,7 +5,7 @@
   */
  module abagames.util.logger;
@@ -160,8 +169,10 @@
      if (e.next)
        error(e.next);
    }
---- a/src/abagames/util/sdl/luminous.d
-+++ b/src/abagames/util/sdl/luminous.d
+Index: torus-trooper-0.22.dfsg1/src/abagames/util/sdl/luminous.d
+===================================================================
+--- torus-trooper-0.22.dfsg1.orig/src/abagames/util/sdl/luminous.d	2005-01-01 22:40:28.000000000 +0100
++++ torus-trooper-0.22.dfsg1/src/abagames/util/sdl/luminous.d	2012-03-29 22:04:24.516751384 +0200
 @@ -9,6 +9,7 @@
  private import std.string;
  private import opengl;
@@ -179,8 +190,10 @@
      int i;
      memset(data, 0, luminousTextureWidth * luminousTextureHeight * 4 * uint.sizeof);
      glGenTextures(1, &luminousTexture);
---- a/src/abagames/tt/barrage.d
-+++ b/src/abagames/tt/barrage.d
+Index: torus-trooper-0.22.dfsg1/src/abagames/tt/barrage.d
+===================================================================
+--- torus-trooper-0.22.dfsg1.orig/src/abagames/tt/barrage.d	2005-01-01 22:40:28.000000000 +0100
++++ torus-trooper-0.22.dfsg1/src/abagames/tt/barrage.d	2012-03-29 22:04:24.516751384 +0200
 @@ -98,6 +98,7 @@
    public static void load() {
      char[][] dirs = listdir(BARRAGE_DIR_NAME);
@@ -189,8 +202,10 @@
        char[][] files = listdir(BARRAGE_DIR_NAME ~ "/" ~ dirName);
        foreach (char[] fileName; files) {
          if (getExt(fileName) != "xml")
---- a/src/abagames/tt/camera.d
-+++ b/src/abagames/tt/camera.d
+Index: torus-trooper-0.22.dfsg1/src/abagames/tt/camera.d
+===================================================================
+--- torus-trooper-0.22.dfsg1.orig/src/abagames/tt/camera.d	2005-01-09 13:50:00.000000000 +0100
++++ torus-trooper-0.22.dfsg1/src/abagames/tt/camera.d	2012-03-29 22:04:24.516751384 +0200
 @@ -155,10 +155,10 @@
      moveCnt--;
      if (moveCnt < 0) {
@@ -206,8 +221,10 @@
        zoomTrg = 3.0f / ofs;
        if (zoomTrg < zoomMin)
          zoomTrg = zoomMin;
---- a/src/abagames/tt/shape.d
-+++ b/src/abagames/tt/shape.d
+Index: torus-trooper-0.22.dfsg1/src/abagames/tt/shape.d
+===================================================================
+--- torus-trooper-0.22.dfsg1.orig/src/abagames/tt/shape.d	2004-11-13 00:46:02.000000000 +0100
++++ torus-trooper-0.22.dfsg1/src/abagames/tt/shape.d	2012-03-29 22:04:24.516751384 +0200
 @@ -248,21 +248,23 @@
                                    float wingD1, float wingD2, int color, int shp, int divNum,
                                    int rev, bool damaged = false) {
@@ -247,8 +264,10 @@
      float wofs = offset;
      float whgt = rocketLength * (rand.nextFloat(0.5) + 1.5);
      for (int i = 0; i < wingNum; i++) {
---- a/src/abagames/util/rand.d
-+++ b/src/abagames/util/rand.d
+Index: torus-trooper-0.22.dfsg1/src/abagames/util/rand.d
+===================================================================
+--- torus-trooper-0.22.dfsg1.orig/src/abagames/util/rand.d	2005-01-01 22:40:28.000000000 +0100
++++ torus-trooper-0.22.dfsg1/src/abagames/util/rand.d	2012-03-29 22:04:24.516751384 +0200
 @@ -165,14 +165,14 @@
  
  void next_state()
@@ -266,8 +285,10 @@
      
      for (int j=N-M+1; --j; p++) 
          *p = p[M] ^ TWIST(p[0], p[1]);
---- a/import/opengl.d
-+++ b/import/opengl.d
+Index: torus-trooper-0.22.dfsg1/import/opengl.d
+===================================================================
+--- torus-trooper-0.22.dfsg1.orig/import/opengl.d	2004-11-10 23:45:22.000000000 +0100
++++ torus-trooper-0.22.dfsg1/import/opengl.d	2012-03-29 22:04:24.520751384 +0200
 @@ -1116,7 +1116,7 @@
  /*************************************************************/
  
@@ -286,11 +307,14 @@
  void /*APIENTRY*/glStencilMask (GLuint mask);
  void /*APIENTRY*/glStencilOp (GLenum fail, GLenum zfail, GLenum zpass);
  void /*APIENTRY*/glTexCoord1d (GLdouble s);
---- /dev/null
-+++ b/Makefile.pure
-@@ -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\
+Index: torus-trooper-0.22.dfsg1/Makefile.pure
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ torus-trooper-0.22.dfsg1/Makefile.pure	2012-03-29 22:04:37.796751719 +0200
+@@ -0,0 +1,35 @@
++SOURCES= src-hiz/abagames/tt/crystal.d src-hiz/abagames/tt/shape.d 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\
@@ -299,8 +323,8 @@
 + 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/tt/floatletter.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\

More information about the Pkg-games-commits mailing list