r14092 - in packages/trunk/ii-esu/debian: . patches
Barry deFreese
bdefreese at alioth.debian.org
Mon May 20 15:27:40 UTC 2013
Author: bdefreese
Date: 2013-05-20 15:27:39 +0000 (Mon, 20 May 2013)
New Revision: 14092
Added:
packages/trunk/ii-esu/debian/patches/dlang_v2.patch
packages/trunk/ii-esu/debian/watch
Modified:
packages/trunk/ii-esu/debian/changelog
packages/trunk/ii-esu/debian/control
packages/trunk/ii-esu/debian/patches/makefile.patch
packages/trunk/ii-esu/debian/patches/series
packages/trunk/ii-esu/debian/rules
Log:
Patch to build with D v2. Clean up.
Modified: packages/trunk/ii-esu/debian/changelog
===================================================================
--- packages/trunk/ii-esu/debian/changelog 2013-05-20 13:31:48 UTC (rev 14091)
+++ packages/trunk/ii-esu/debian/changelog 2013-05-20 15:27:39 UTC (rev 14092)
@@ -1,3 +1,15 @@
+ii-esu (1.0a.dfsg1-5) unstable; urgency=low
+
+ * Add patch to build with D v2. (Closes: #707265)
+ - Remove -d (deprecated) flag.
+ * Update Homepage tag to new address.
+ * Remove deprecated DM-Upload-allowed.
+ * Replace dh_clean -k with dh_prep.
+ * Add empty watch file. (Upstream tarball not versioned).
+ * Bump Standards Version to 3.9.4.
+
+ -- Barry deFreese <bdefreese at debian.org> Sun, 19 May 2013 15:44:36 -0400
+
ii-esu (1.0a.dfsg1-4) unstable; urgency=medium
* Team upload
Modified: packages/trunk/ii-esu/debian/control
===================================================================
--- packages/trunk/ii-esu/debian/control 2013-05-20 13:31:48 UTC (rev 14091)
+++ packages/trunk/ii-esu/debian/control 2013-05-20 15:27:39 UTC (rev 14092)
@@ -3,14 +3,13 @@
Priority: extra
Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
Uploaders: Miriam Ruiz <little_miry at yahoo.es>, Peter De Wachter <pdewacht at gmail.com>
-Build-Depends: debhelper (>= 5), gdc-v1,
+Build-Depends: debhelper (>= 5), gdc,
libglu1-mesa-dev | libglu-dev, libgl1-mesa-dev | libgl-dev,
libsdl1.2-dev, libsdl-mixer1.2-dev
-Standards-Version: 3.9.2
-Homepage: http://hizuoka.web.fc2.com/game/ES/index_en.html
+Standards-Version: 3.9.4
+Homepage: http://hiz.fool.jp/hp/index_en.html
Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/ii-esu/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/ii-esu/?op=log
-DM-Upload-Allowed: yes
Package: ii-esu
Architecture: any
Added: packages/trunk/ii-esu/debian/patches/dlang_v2.patch
===================================================================
--- packages/trunk/ii-esu/debian/patches/dlang_v2.patch (rev 0)
+++ packages/trunk/ii-esu/debian/patches/dlang_v2.patch 2013-05-20 15:27:39 UTC (rev 14092)
@@ -0,0 +1,556 @@
+# Copyright (C) 2013 Barry deFreese <bdefreese at debian.org>
+# Distributed under the same license as the game. See debian/copyright.
+
+Index: ii-esu-1.0a.dfsg1/import/SDL_types.d
+===================================================================
+--- ii-esu-1.0a.dfsg1.orig/import/SDL_types.d 2013-05-19 15:49:21.000000000 -0400
++++ ii-esu-1.0a.dfsg1/import/SDL_types.d 2013-05-19 15:49:53.000000000 -0400
+@@ -38,6 +38,8 @@
+ alias ulong Uint64;
+ alias long Sint64;
+
++alias bool bit;
++
+ /* General keyboard/mouse state definitions */
+ enum { SDL_PRESSED = 0x01, SDL_RELEASED = 0x00 };
+
+Index: ii-esu-1.0a.dfsg1/import/opengl.d
+===================================================================
+--- ii-esu-1.0a.dfsg1.orig/import/opengl.d 2013-05-19 15:49:53.000000000 -0400
++++ ii-esu-1.0a.dfsg1/import/opengl.d 2013-05-19 16:03:31.000000000 -0400
+@@ -1448,35 +1448,35 @@
+
+
+ /* EXT_vertex_array */
+-typedef void (* PFNGLARRAYELEMENTEXTPROC) (GLint i);
+-typedef void (* PFNGLDRAWARRAYSEXTPROC) (GLenum mode, GLint first, GLsizei count);
+-typedef void (* PFNGLVERTEXPOINTEREXTPROC) (GLint size, GLenum type, GLsizei stride, GLsizei count, GLvoid *pointer);
+-typedef void (* PFNGLNORMALPOINTEREXTPROC) (GLenum type, GLsizei stride, GLsizei count, GLvoid *pointer);
+-typedef void (* PFNGLCOLORPOINTEREXTPROC) (GLint size, GLenum type, GLsizei stride, GLsizei count, GLvoid *pointer);
+-typedef void (* PFNGLINDEXPOINTEREXTPROC) (GLenum type, GLsizei stride, GLsizei count, GLvoid *pointer);
+-typedef void (* PFNGLTEXCOORDPOINTEREXTPROC) (GLint size, GLenum type, GLsizei stride, GLsizei count, GLvoid *pointer);
+-typedef void (* PFNGLEDGEFLAGPOINTEREXTPROC) (GLsizei stride, GLsizei count, GLboolean *pointer);
+-typedef void (* PFNGLGETPOINTERVEXTPROC) (GLenum pname, GLvoid* *params);
+-typedef void (* PFNGLARRAYELEMENTARRAYEXTPROC)(GLenum mode, GLsizei count, GLvoid* pi);
++typedef void function(GLint i) PFNGLARRAYELEMENTEXTPROC;
++typedef void function(GLenum mode, GLint first, GLsizei count) PFNGLDRAWARRAYSEXTPROC;
++typedef void function(GLint size, GLenum type, GLsizei stride, GLsizei count, GLvoid *pointer) PFNGLVERTEXPOINTEREXTPROC;
++typedef void function(GLenum type, GLsizei stride, GLsizei count, GLvoid *pointer) PFNGLNORMALPOINTEREXTPROC;
++typedef void function(GLint size, GLenum type, GLsizei stride, GLsizei count, GLvoid *pointer) PFNGLCOLORPOINTEREXTPROC;
++typedef void function(GLenum type, GLsizei stride, GLsizei count, GLvoid *pointer) PFNGLINDEXPOINTEREXTPROC;
++typedef void function(GLint size, GLenum type, GLsizei stride, GLsizei count, GLvoid *pointer) PFNGLTEXCOORDPOINTEREXTPROC;
++typedef void function(GLsizei stride, GLsizei count, GLboolean *pointer) PFNGLEDGEFLAGPOINTEREXTPROC;
++typedef void function(GLenum pname, GLvoid* *params) PFNGLGETPOINTERVEXTPROC;
++typedef void function(GLenum mode, GLsizei count, GLvoid* pi) PFNGLARRAYELEMENTARRAYEXTPROC;
+
+ /* WIN_draw_range_elements */
+-typedef void (* PFNGLDRAWRANGEELEMENTSWINPROC) (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, GLvoid *indices);
++typedef void function(GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, GLvoid *indices) PFNGLDRAWRANGEELEMENTSWINPROC;
+
+ /* WIN_swap_hint */
+-typedef void (* PFNGLADDSWAPHINTRECTWINPROC) (GLint x, GLint y, GLsizei width, GLsizei height);
++typedef void function(GLint x, GLint y, GLsizei width, GLsizei height) PFNGLADDSWAPHINTRECTWINPROC;
+
+ /* EXT_paletted_texture */
+-typedef void (* PFNGLCOLORTABLEEXTPROC)
++typedef void function
+ (GLenum target, GLenum internalFormat, GLsizei width, GLenum format,
+- GLenum type, GLvoid *data);
+-typedef void (* PFNGLCOLORSUBTABLEEXTPROC)
++ GLenum type, GLvoid *data) PFNGLCOLORTABLEEXTPROC;
++typedef void function
+ (GLenum target, GLsizei start, GLsizei count, GLenum format,
+- GLenum type, GLvoid *data);
+-typedef void (* PFNGLGETCOLORTABLEEXTPROC)
+- (GLenum target, GLenum format, GLenum type, GLvoid *data);
+-typedef void (* PFNGLGETCOLORTABLEPARAMETERIVEXTPROC)
+- (GLenum target, GLenum pname, GLint *params);
+-typedef void (* PFNGLGETCOLORTABLEPARAMETERFVEXTPROC)
+- (GLenum target, GLenum pname, GLfloat *params);
++ GLenum type, GLvoid *data) PFNGLCOLORSUBTABLEEXTPROC;
++typedef void function
++ (GLenum target, GLenum format, GLenum type, GLvoid *data) PFNGLGETCOLORTABLEEXTPROC;
++typedef void function
++ (GLenum target, GLenum pname, GLint *params) PFNGLGETCOLORTABLEPARAMETERIVEXTPROC;
++typedef void function
++ (GLenum target, GLenum pname, GLfloat *params) PFNGLGETCOLORTABLEPARAMETERFVEXTPROC;
+
+ //import openglu;
+Index: ii-esu-1.0a.dfsg1/import/openglu.d
+===================================================================
+--- ii-esu-1.0a.dfsg1.orig/import/openglu.d 2013-05-19 15:49:53.000000000 -0400
++++ ii-esu-1.0a.dfsg1/import/openglu.d 2013-05-19 16:46:59.000000000 -0400
+@@ -157,7 +157,7 @@
+ void gluQuadricCallback (
+ GLUquadric *qobj,
+ GLenum which,
+- void (* fn)());
++ void function() fn );
+
+ GLUtesselator* gluNewTess(
+ );
+@@ -197,7 +197,7 @@
+ void gluTessCallback(
+ GLUtesselator *tess,
+ GLenum which,
+- void ( *fn)());
++ void function() fn );
+
+ void gluGetTessProperty(
+ GLUtesselator *tess,
+@@ -280,37 +280,37 @@
+ gluNurbsCallback (
+ GLUnurbs *nobj,
+ GLenum which,
+- void (* fn)() );
++ void function() fn );
+
+
+ /**** function prototypes ****/
+
+ /* gluQuadricCallback */
+-typedef void (* GLUquadricErrorProc) (GLenum);
++typedef void function(GLenum) GLUquadricErrorProc;
+
+ /* gluTessCallback */
+-typedef void (* GLUtessBeginProc) (GLenum);
+-typedef void (* GLUtessEdgeFlagProc) (GLboolean);
+-typedef void (* GLUtessVertexProc) (void *);
+-typedef void (* GLUtessEndProc) ();
+-typedef void (* GLUtessErrorProc) (GLenum);
+-typedef void (* GLUtessCombineProc) (GLdouble[3],
++typedef void function(GLenum) GLUtessBeginProc;
++typedef void function(GLboolean) GLUtessEdgeFlagProc;
++typedef void function(void *) GLUtessVertexProc;
++typedef void function() GLUtessEndProc;
++typedef void function(GLenum) GLUtessErrorProc;
++typedef void function(GLdouble[3],
+ void*[4],
+ GLfloat[4],
+- void** );
+-typedef void (* GLUtessBeginDataProc) (GLenum, void *);
+-typedef void (* GLUtessEdgeFlagDataProc) (GLboolean, void *);
+-typedef void (* GLUtessVertexDataProc) (void *, void *);
+-typedef void (* GLUtessEndDataProc) (void *);
+-typedef void (* GLUtessErrorDataProc) (GLenum, void *);
+-typedef void (* GLUtessCombineDataProc) (GLdouble[3],
++ void** ) GLUtessCombineProc;
++typedef void function(GLenum, void *) GLUtessBeginDataProc;
++typedef void function(GLboolean, void *) GLUtessEdgeFlagDataProc;
++typedef void function(void *, void *) GLUtessVertexDataProc;
++typedef void function(void *) GLUtessEndDataProc;
++typedef void function(GLenum, void *) GLUtessErrorDataProc;
++typedef void function(GLdouble[3],
+ void*[4],
+ GLfloat[4],
+ void**,
+- void* );
++ void* ) GLUtessCombineDataProc;
+
+ /* gluNurbsCallback */
+-typedef void (* GLUnurbsErrorProc) (GLenum);
++typedef void function(GLenum) GLUnurbsErrorProc;
+
+
+ /**** Generic constants ****/
+Index: ii-esu-1.0a.dfsg1/import/SDL_audio.d
+===================================================================
+--- ii-esu-1.0a.dfsg1.orig/import/SDL_audio.d 2006-07-25 14:40:28.000000000 -0400
++++ ii-esu-1.0a.dfsg1/import/SDL_audio.d 2013-05-19 16:49:42.000000000 -0400
+@@ -42,7 +42,7 @@
+ Once the callback returns, the buffer will no longer be valid.
+ Stereo samples are stored in a LRLRLR ordering.
+ */
+- void (*callback)(void *userdata, Uint8 *stream, int len);
++ void function(void *userdata, Uint8 *stream, int len) callback;
+ void *userdata;
+ }
+
+@@ -74,7 +74,7 @@
+ int len_cvt; /* Length of converted audio buffer */
+ int len_mult; /* buffer must be len*len_mult big */
+ double len_ratio; /* Given len, final size is len*len_ratio */
+- void (*filters[10])(SDL_AudioCVT *cvt, Uint16 format);
++ void function(SDL_AudioCVT *cvt, Uint16 format) filters[10];
+ int filter_index; /* Current audio conversion function */
+ }
+
+Index: ii-esu-1.0a.dfsg1/import/SDL_rwops.d
+===================================================================
+--- ii-esu-1.0a.dfsg1.orig/import/SDL_rwops.d 2006-07-25 14:40:28.000000000 -0400
++++ ii-esu-1.0a.dfsg1/import/SDL_rwops.d 2013-05-20 07:06:12.000000000 -0400
+@@ -28,10 +28,10 @@
+
+ extern(C):
+
+-typedef int (*_seek_func_t)(SDL_RWops *context, int offset, int whence);
+-typedef int (*_read_func_t)(SDL_RWops *context, void *ptr, int size, int maxnum);
+-typedef int (*_write_func_t)(SDL_RWops *context, void *ptr, int size, int num);
+-typedef int (*_close_func_t)(SDL_RWops *context);
++typedef int function(SDL_RWops *context, int offset, int whence) _seek_func_t;
++typedef int function(SDL_RWops *context, void *ptr, int size, int maxnum) _read_func_t;
++typedef int function(SDL_RWops *context, void *ptr, int size, int num) _write_func_t;
++typedef int function(SDL_RWops *context) _close_func_t;
+
+ /* This is the read/write operation structure -- very basic */
+
+@@ -81,7 +81,7 @@
+
+ /* Functions to create SDL_RWops structures from various data sources */
+
+-SDL_RWops * SDL_RWFromFile(char *file, char *mode);
++SDL_RWops * SDL_RWFromFile(const(char*) file, const(char*) mode);
+
+ SDL_RWops * SDL_RWFromFP(void *fp, int autoclose);
+
+Index: ii-esu-1.0a.dfsg1/import/SDL_events.d
+===================================================================
+--- ii-esu-1.0a.dfsg1.orig/import/SDL_events.d 2006-07-25 14:40:28.000000000 -0400
++++ ii-esu-1.0a.dfsg1/import/SDL_events.d 2013-05-19 16:55:30.000000000 -0400
+@@ -271,7 +271,7 @@
+
+ The filter is protypted as:
+ */
+-alias int (*SDL_EventFilter)(SDL_Event *event);
++alias int function(SDL_Event *event) SDL_EventFilter;
+ /*
+ If the filter returns 1, then the event will be added to the internal queue.
+ If it returns 0, then the event will be dropped from the queue, but the
+Index: ii-esu-1.0a.dfsg1/import/SDL_video.d
+===================================================================
+--- ii-esu-1.0a.dfsg1.orig/import/SDL_video.d 2006-07-25 14:40:28.000000000 -0400
++++ ii-esu-1.0a.dfsg1/import/SDL_video.d 2013-05-20 07:04:21.000000000 -0400
+@@ -75,8 +75,8 @@
+ }
+
+ /* typedef for private surface blitting functions */
+-typedef int (*SDL_blit)(SDL_Surface *src, SDL_Rect *srcrect,
+- SDL_Surface *dst, SDL_Rect *dstrect);
++typedef int function(SDL_Surface *src, SDL_Rect *srcrect,
++ SDL_Surface *dst, SDL_Rect *dstrect) SDL_blit;
+
+ /* This structure should be treated as read-only, except for 'pixels',
+ which, if not NULL, contains the raw pixel data for the surface.
+@@ -540,7 +540,7 @@
+ SDL_Surface * SDL_LoadBMP_RW(SDL_RWops *src, int freesrc);
+
+ /* Convenience macro -- load a surface from a file */
+-SDL_Surface * SDL_LoadBMP(char* file)
++SDL_Surface * SDL_LoadBMP(const(char*) file)
+ {
+ return SDL_LoadBMP_RW(SDL_RWFromFile(file, "rb"), 1);
+ }
+@@ -554,7 +554,7 @@
+ (SDL_Surface *surface, SDL_RWops *dst, int freedst);
+
+ /* Convenience macro -- save a surface to a file */
+-int SDL_SaveBMP(SDL_Surface *surface, char* file)
++int SDL_SaveBMP(SDL_Surface *surface, const(char*) file)
+ {
+ return SDL_SaveBMP_RW(surface, SDL_RWFromFile(file, "wb"), 1);
+ }
+@@ -799,7 +799,7 @@
+ /*
+ * Get the address of a GL function (for extension functions)
+ */
+-void *SDL_GL_GetProcAddress(char* proc);
++void *SDL_GL_GetProcAddress(const(char*) proc);
+
+ /*
+ * Set an attribute of the OpenGL subsystem before intialization.
+@@ -837,8 +837,8 @@
+ /*
+ * Sets/Gets the title and icon text of the display window
+ */
+-void SDL_WM_SetCaption(char *title, char *icon);
+-void SDL_WM_GetCaption(char **title, char **icon);
++void SDL_WM_SetCaption(const(char*) title, const(char*) icon);
++void SDL_WM_GetCaption(const(char*) *title, const(char*) *icon);
+
+ /*
+ * Sets the icon for the display window.
+Index: ii-esu-1.0a.dfsg1/import/SDL_thread.d
+===================================================================
+--- ii-esu-1.0a.dfsg1.orig/import/SDL_thread.d 2006-07-25 14:40:28.000000000 -0400
++++ ii-esu-1.0a.dfsg1/import/SDL_thread.d 2013-05-19 16:58:53.000000000 -0400
+@@ -34,7 +34,7 @@
+ struct SDL_Thread { }
+
+ /* Create a thread */
+-SDL_Thread * SDL_CreateThread(int (*fn)(void *), void *data);
++SDL_Thread * SDL_CreateThread(int function(void *) fn, void *data);
+
+ /* Get the 32-bit thread identifier for the current thread */
+ Uint32 SDL_ThreadID();
+Index: ii-esu-1.0a.dfsg1/import/SDL_timer.d
+===================================================================
+--- ii-esu-1.0a.dfsg1.orig/import/SDL_timer.d 2006-07-25 14:40:28.000000000 -0400
++++ ii-esu-1.0a.dfsg1/import/SDL_timer.d 2013-05-19 17:00:31.000000000 -0400
+@@ -39,7 +39,7 @@
+ void SDL_Delay(Uint32 ms);
+
+ /* Function prototype for the timer callback function */
+-alias Uint32 (*SDL_TimerCallback)(Uint32 interval);
++alias Uint32 function(Uint32 interval) SDL_TimerCallback;
+
+ /* Set a callback to run after the specified number of milliseconds has
+ * elapsed. The callback function is passed the current timer interval
+@@ -79,7 +79,7 @@
+ * passed in, the periodic alarm continues, otherwise a new alarm is
+ * scheduled. If the callback returns 0, the periodic alarm is cancelled.
+ */
+-alias Uint32 (*SDL_NewTimerCallback)(Uint32 interval, void *param);
++alias Uint32 function(Uint32 interval, void *param) SDL_NewTimerCallback;
+
+ /* Definition of the timer ID type */
+ alias void *SDL_TimerID;
+Index: ii-esu-1.0a.dfsg1/import/SDL_mixer.d
+===================================================================
+--- ii-esu-1.0a.dfsg1.orig/import/SDL_mixer.d 2003-12-20 20:32:52.000000000 -0500
++++ ii-esu-1.0a.dfsg1/import/SDL_mixer.d 2013-05-19 17:50:47.000000000 -0400
+@@ -107,7 +107,7 @@
+ Mix_Chunk * Mix_LoadWAV(char *file) {
+ return Mix_LoadWAV_RW(SDL_RWFromFile(file, "rb"), 1);
+ }
+- Mix_Music * Mix_LoadMUS(char *file);
++ Mix_Music * Mix_LoadMUS(const(char*) file);
+
+ /* Load a wave file of the mixer format from a memory buffer */
+ Mix_Chunk * Mix_QuickLoad_WAV(Uint8 *mem);
+@@ -128,19 +128,19 @@
+ This can be used to provide real-time visual display of the audio stream
+ or add a custom mixer filter for the stream data.
+ */
+- void Mix_SetPostMix(void (*mix_func)
+- (void *udata, Uint8 *stream, int len), void *arg);
++ void Mix_SetPostMix(void function(void *udata, Uint8 *stream, int len) mix_func,
++ void *arg);
+
+ /* Add your own music player or additional mixer function.
+ If 'mix_func' is NULL, the default music player is re-enabled.
+ */
+- void Mix_HookMusic(void (*mix_func)
+- (void *udata, Uint8 *stream, int len), void *arg);
++ void Mix_HookMusic(void function(void *udata, Uint8 *stream, int len) mix_func,
++ void *arg);
+
+ /* Add your own callback when the music has finished playing.
+ This callback is only called if the music finishes naturally.
+ */
+- void Mix_HookMusicFinished(void (*music_finished)());
++ void Mix_HookMusicFinished(void function() music_finished);
+
+ /* Get a pointer to the user data for the current music hook */
+ void * Mix_GetMusicHookData();
+@@ -153,7 +153,7 @@
+ * inside the audio callback, or SDL_mixer will explicitly lock the audio
+ * before calling your callback.
+ */
+- void Mix_ChannelFinished(void (*channel_finished)(int channel));
++ void Mix_ChannelFinished(void function(int channel) channel_finished);
+
+
+ /* Special Effects API by ryan c. gordon. (icculus at linuxgames.com) */
+@@ -177,7 +177,7 @@
+ *
+ * DO NOT EVER call SDL_LockAudio() from your callback function!
+ */
+- typedef void (*Mix_EffectFunc_t)(int chan, void *stream, int len, void *udata);
++ typedef void function(int chan, void *stream, int len, void *udata) Mix_EffectFunc_t;
+
+ /*
+ * This is a callback that signifies that a channel has finished all its
+@@ -188,7 +188,7 @@
+ *
+ * DO NOT EVER call SDL_LockAudio() from your callback function!
+ */
+- typedef void (*Mix_EffectDone_t)(int chan, void *udata);
++ typedef void function(int chan, void *udata) Mix_EffectDone_t;
+
+
+ /* Register a special effect function. At mixing time, the channel data is
+Index: ii-esu-1.0a.dfsg1/import/SDL_quit.d
+===================================================================
+--- ii-esu-1.0a.dfsg1.orig/import/SDL_quit.d 2006-07-25 14:40:28.000000000 -0400
++++ ii-esu-1.0a.dfsg1/import/SDL_quit.d 2013-05-19 17:09:49.000000000 -0400
+@@ -22,6 +22,7 @@
+
+ /* Include file for SDL quit event handling */
+
++import SDL_types;
+ import SDL_events;
+
+ /*
+Index: ii-esu-1.0a.dfsg1/src/es/enemy.d
+===================================================================
+--- ii-esu-1.0a.dfsg1.orig/src/es/enemy.d 2013-05-19 15:49:53.000000000 -0400
++++ ii-esu-1.0a.dfsg1/src/es/enemy.d 2013-05-19 17:40:13.000000000 -0400
+@@ -585,7 +585,7 @@
+ enemyIdx = 0;
+ }
+ public void clear(){
+- foreach(inout Enemy e;enemy){
++ foreach(ref Enemy e;enemy){
+ if(e !is null){
+ e.setExist(false);
+ }
+@@ -648,7 +648,7 @@
+ }
+
+ public void allDamage(real power){
+- foreach(inout Enemy e;enemy){
++ foreach(ref Enemy e;enemy){
+ if(e !is null && e.isExist()){
+ e.damage(power);
+ }
+@@ -710,4 +710,4 @@
+ }
+ }
+ }
+-*/
+\ No newline at end of file
++*/
+Index: ii-esu-1.0a.dfsg1/src/es/rand.d
+===================================================================
+--- ii-esu-1.0a.dfsg1.orig/src/es/rand.d 2007-06-22 07:12:00.000000000 -0400
++++ ii-esu-1.0a.dfsg1/src/es/rand.d 2013-05-20 07:03:25.000000000 -0400
+@@ -6,7 +6,7 @@
+ module es.rand;
+
+ private import std.stream;
+-private import std.date;
++private import std.datetime;
+
+ /**
+ * Random number generator.
+@@ -14,7 +14,7 @@
+ public class Rand {
+
+ public this() {
+- d_time timer = getUTCtime();
++ long timer = Clock.currStdTime();
+ init_genrand(cast(uint)timer);
+ }
+
+Index: ii-esu-1.0a.dfsg1/src/es/gamemanager.d
+===================================================================
+--- ii-esu-1.0a.dfsg1.orig/src/es/gamemanager.d 2007-07-14 09:21:46.000000000 -0400
++++ ii-esu-1.0a.dfsg1/src/es/gamemanager.d 2013-05-19 17:48:30.000000000 -0400
+@@ -145,7 +145,7 @@
+ setNextState("titleState");
+
+ }
+- public void setNextState(char[] name){
++ public void setNextState(string name){
+ switch(name){
+ case "gameState":nextState = inGameState;break;
+ case "titleState":nextState = inTitleState;break;
+@@ -173,7 +173,7 @@
+ public void start();
+ public void move();
+ public void draw();
+- public char[] name();
++ public string name();
+ }
+ public class InGameState:GameState{
+ private:
+@@ -181,7 +181,7 @@
+ int count;
+
+ Shape BULLET_SHAPE;
+- const char[] _name = "gameState";
++ const string _name = "gameState";
+ public this(){
+ }
+
+@@ -236,7 +236,7 @@
+
+ }
+
+- public char[] name(){
++ public string name(){
+ return _name;
+ }
+ }
+@@ -248,7 +248,7 @@
+ bool onStart;
+ bool onMusic;
+
+- const char[] _name = "titleState";
++ const string _name = "titleState";
+ public this(){
+ }
+
+@@ -351,7 +351,7 @@
+ */
+ }
+
+- public char[] name(){
++ public string name(){
+ return _name;
+ }
+ }
+@@ -396,4 +396,4 @@
+ // camera(eyeX ,eyeY ,eyeZ ,centerX ,centerY ,centerZ ,upX ,upY ,upZ);
+ }
+ }
+-
+\ No newline at end of file
++
+Index: ii-esu-1.0a.dfsg1/src/es/screen.d
+===================================================================
+--- ii-esu-1.0a.dfsg1.orig/src/es/screen.d 2007-07-14 09:24:46.000000000 -0400
++++ ii-esu-1.0a.dfsg1/src/es/screen.d 2013-05-19 18:54:48.000000000 -0400
+@@ -1,6 +1,7 @@
+ module es.screen;
+ private import opengl;
+ private import SDL;
++private import std.conv;
+ private import std.string;
+ private import std.c.stdlib;
+
+@@ -29,7 +30,7 @@
+
+ if(SDL_Init( SDL_INIT_VIDEO | SDL_INIT_AUDIO) < 0 ) {
+ throw new Exception(
+- "Unable to init SDL video: " ~ std.string.toString(SDL_GetError()));
++ "Unable to init SDL video: " ~ to!string(SDL_GetError()));
+
+ }
+ //info = SDL_GetVideoInfo( );
+@@ -89,7 +90,7 @@
+ if (error == GL_NO_ERROR)
+ return;
+ closeSDL();
+- throw new Exception("OpenGL error(" ~ std.string.toString(error) ~ ")");
++ throw new Exception("OpenGL error(" ~ to!string(error) ~ ")");
+ }
+ public void closeSDL() {
+ close();
+@@ -112,4 +113,4 @@
+ public void saveBMP(char[] name){
+ SDL_SaveBMP(gScreenSurface, "screenshot.bmp");
+ }
+-}
+\ No newline at end of file
++}
+Index: ii-esu-1.0a.dfsg1/src/es/shot.d
+===================================================================
+--- ii-esu-1.0a.dfsg1.orig/src/es/shot.d 2007-07-06 22:36:46.000000000 -0400
++++ ii-esu-1.0a.dfsg1/src/es/shot.d 2013-05-19 18:55:50.000000000 -0400
+@@ -146,7 +146,7 @@
+
+ }
+ public void clear(){
+- foreach(inout Shot s;shots){
++ foreach(ref Shot s;shots){
+ if(s !is null){
+ s.vanish();
+ }
+@@ -255,4 +255,4 @@
+ }
+ }
+ }
+-*/
+\ No newline at end of file
++*/
Modified: packages/trunk/ii-esu/debian/patches/makefile.patch
===================================================================
--- packages/trunk/ii-esu/debian/patches/makefile.patch 2013-05-20 13:31:48 UTC (rev 14091)
+++ packages/trunk/ii-esu/debian/patches/makefile.patch 2013-05-20 15:27:39 UTC (rev 14092)
@@ -5,10 +5,10 @@
Index: ii-esu-1.0a.dfsg1/Makefile
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ ii-esu-1.0a.dfsg1/Makefile 2008-01-07 16:26:20.000000000 +0000
++++ ii-esu-1.0a.dfsg1/Makefile 2013-05-19 15:49:42.000000000 -0400
@@ -0,0 +1,24 @@
-+DC=gdmd-v1
-+DFLAGS=-g -O -d -release
++DC=gdmd
++DFLAGS=-g -O -release
+DOUT=-of
+
+DSRC=$(shell find src/ -name "*.d")
@@ -19,7 +19,7 @@
+all: $(EXE)
+
+$(EXE): $(OBJS)
-+ gdc-v1 -o $@ $(OBJS) -lSDL -lGL -lSDL_mixer
++ gdc -o $@ $(OBJS) -lSDL -lGL -lSDL_mixer
+
+$(OBJS): %.o: %.d
+ $(DC) -c $(DOUT)$@ $(DFLAGS) -Iimport -Isrc $<
Modified: packages/trunk/ii-esu/debian/patches/series
===================================================================
--- packages/trunk/ii-esu/debian/patches/series 2013-05-20 13:31:48 UTC (rev 14091)
+++ packages/trunk/ii-esu/debian/patches/series 2013-05-20 15:27:39 UTC (rev 14092)
@@ -4,3 +4,4 @@
directories.patch
d1.043.patch
fix-return-type.patch
+dlang_v2.patch
Modified: packages/trunk/ii-esu/debian/rules
===================================================================
--- packages/trunk/ii-esu/debian/rules 2013-05-20 13:31:48 UTC (rev 14091)
+++ packages/trunk/ii-esu/debian/rules 2013-05-20 15:27:39 UTC (rev 14092)
@@ -7,10 +7,10 @@
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
CFLAGS += -O0
- DFLAGS = -g -debug -d
+ DFLAGS = -g -debug
else
CFLAGS += -O2
- DFLAGS = -O -g -release -d
+ DFLAGS = -O -g -release
endif
configure: configure-stamp
@@ -41,7 +41,7 @@
install: build
dh_testdir
dh_testroot
- dh_clean -k
+ dh_prep
dh_installdirs
# Build architecture-independent files here.
Added: packages/trunk/ii-esu/debian/watch
===================================================================
--- packages/trunk/ii-esu/debian/watch (rev 0)
+++ packages/trunk/ii-esu/debian/watch 2013-05-20 15:27:39 UTC (rev 14092)
@@ -0,0 +1,2 @@
+#Upstream has mostly abandoned maintenance and the upstream tarball is not versioned.
+
More information about the Pkg-games-commits
mailing list