[patchlogo]

Debian patch tracking system

- val-and-rick - val-and-rick/0.1a.dfsg1-2 - series patch import.patch

val-and-rick (0.1a.dfsg1-2) import.patch

Summary

 import/SDL.d          |   24 ++++++++++++------------
 import/SDL_Version.d  |    2 +-
 import/SDL_active.d   |    2 +-
 import/SDL_audio.d    |    8 ++++----
 import/SDL_cdrom.d    |    2 +-
 import/SDL_endian.d   |    6 +++---
 import/SDL_events.d   |   12 ++++++------
 import/SDL_joystick.d |    2 +-
 import/SDL_keyboard.d |    4 ++--
 import/SDL_mixer.d    |    4 ++--
 import/SDL_mouse.d    |    4 ++--
 import/SDL_mutex.d    |    2 +-
 import/SDL_quit.d     |    2 +-
 import/SDL_rwops.d    |    2 +-
 import/SDL_syswm.d    |    2 +-
 import/SDL_thread.d   |    4 ++--
 import/SDL_timer.d    |    2 +-
 import/SDL_video.d    |    6 +++---
 import/opengl.d       |   12 +++---------
 import/openglu.d      |    7 +------
 20 files changed, 49 insertions(+), 60 deletions(-)
download this patch

Patch contents

# Copyright (C) 2007  Peter De Wachter <pdewacht@gmail.com>
# Copyright (C) 2007  Miriam Ruiz <little_miry@yahoo.es>
# Distributed under the same license as the game. See debian/copyright.

Index: val-and-rick-0.1a.dfsg1/import/SDL.d
===================================================================
--- val-and-rick-0.1a.dfsg1.orig/import/SDL.d	2005-03-14 01:15:04.000000000 +0000
+++ val-and-rick-0.1a.dfsg1/import/SDL.d	2007-09-05 07:48:36.000000000 +0000
@@ -20,18 +20,18 @@
     slouken@devolution.com
 */
 
-import SDL_types;
-import SDL_getenv;
-import SDL_error;
-import SDL_rwops;
-import SDL_timer;
-import SDL_audio;
-import SDL_cdrom;
-import SDL_joystick;
-import SDL_events;
-import SDL_video;
-import SDL_byteorder;
-import SDL_Version;
+public import SDL_types;
+public import SDL_getenv;
+public import SDL_error;
+public import SDL_rwops;
+public import SDL_timer;
+public import SDL_audio;
+public import SDL_cdrom;
+public import SDL_joystick;
+public import SDL_events;
+public import SDL_video;
+public import SDL_byteorder;
+public import SDL_Version;
 
 extern(C):
 
Index: val-and-rick-0.1a.dfsg1/import/SDL_Version.d
===================================================================
--- val-and-rick-0.1a.dfsg1.orig/import/SDL_Version.d	2005-03-14 01:15:04.000000000 +0000
+++ val-and-rick-0.1a.dfsg1/import/SDL_Version.d	2007-09-05 07:48:36.000000000 +0000
@@ -22,7 +22,7 @@
 
 /* This header defines the current SDL version */
 
-import SDL_types;
+public import SDL_types;
 
 extern(C):
 
Index: val-and-rick-0.1a.dfsg1/import/SDL_active.d
===================================================================
--- val-and-rick-0.1a.dfsg1.orig/import/SDL_active.d	2005-03-14 01:15:04.000000000 +0000
+++ val-and-rick-0.1a.dfsg1/import/SDL_active.d	2007-09-05 07:48:36.000000000 +0000
@@ -22,7 +22,7 @@
 
 /* Include file for SDL application focus event handling */
 
-import SDL_types;
+public import SDL_types;
 
 extern(C):
 
Index: val-and-rick-0.1a.dfsg1/import/SDL_audio.d
===================================================================
--- val-and-rick-0.1a.dfsg1.orig/import/SDL_audio.d	2005-03-14 01:15:04.000000000 +0000
+++ val-and-rick-0.1a.dfsg1/import/SDL_audio.d	2007-09-05 07:48:36.000000000 +0000
@@ -20,10 +20,10 @@
     slouken@devolution.com
 */
 
-import SDL_types;
-import SDL_error;
-import SDL_rwops;
-import SDL_byteorder;
+public import SDL_types;
+public import SDL_error;
+public import SDL_rwops;
+public import SDL_byteorder;
 
 extern(C):
 
Index: val-and-rick-0.1a.dfsg1/import/SDL_cdrom.d
===================================================================
--- val-and-rick-0.1a.dfsg1.orig/import/SDL_cdrom.d	2005-03-14 01:15:04.000000000 +0000
+++ val-and-rick-0.1a.dfsg1/import/SDL_cdrom.d	2007-09-05 07:48:36.000000000 +0000
@@ -22,7 +22,7 @@
 
 /* This is the CD-audio control API for Simple DirectMedia Layer */
 
-import SDL_types;
+public import SDL_types;
 
 extern(C):
 
Index: val-and-rick-0.1a.dfsg1/import/SDL_endian.d
===================================================================
--- val-and-rick-0.1a.dfsg1.orig/import/SDL_endian.d	2005-03-14 01:15:04.000000000 +0000
+++ val-and-rick-0.1a.dfsg1/import/SDL_endian.d	2007-09-05 07:48:36.000000000 +0000
@@ -34,9 +34,9 @@
          and other data sources.
 */
 
-import SDL_types;
-import SDL_rwops;
-import SDL_byteorder;
+public import SDL_types;
+public import SDL_rwops;
+public import SDL_byteorder;
 
 extern(C):
 
Index: val-and-rick-0.1a.dfsg1/import/SDL_events.d
===================================================================
--- val-and-rick-0.1a.dfsg1.orig/import/SDL_events.d	2005-03-14 01:15:04.000000000 +0000
+++ val-and-rick-0.1a.dfsg1/import/SDL_events.d	2007-09-05 07:48:36.000000000 +0000
@@ -22,12 +22,12 @@
 
 /* Include file for SDL event handling */
 
-import SDL_types;
-import SDL_active;
-import SDL_keyboard;
-import SDL_mouse;
-import SDL_joystick;
-import SDL_syswm;
+public import SDL_types;
+public import SDL_active;
+public import SDL_keyboard;
+public import SDL_mouse;
+public import SDL_joystick;
+public import SDL_syswm;
 
 extern(C):
 
Index: val-and-rick-0.1a.dfsg1/import/SDL_joystick.d
===================================================================
--- val-and-rick-0.1a.dfsg1.orig/import/SDL_joystick.d	2005-03-14 01:15:04.000000000 +0000
+++ val-and-rick-0.1a.dfsg1/import/SDL_joystick.d	2007-09-05 07:48:36.000000000 +0000
@@ -22,7 +22,7 @@
 
 /* Include file for SDL joystick event handling */
 
-import SDL_types;
+public import SDL_types;
 
 extern(C):
 
Index: val-and-rick-0.1a.dfsg1/import/SDL_keyboard.d
===================================================================
--- val-and-rick-0.1a.dfsg1.orig/import/SDL_keyboard.d	2005-03-14 01:15:04.000000000 +0000
+++ val-and-rick-0.1a.dfsg1/import/SDL_keyboard.d	2007-09-05 07:48:36.000000000 +0000
@@ -22,11 +22,11 @@
 
 /* Include file for SDL keyboard event handling */
 
-import SDL_types;
+public import SDL_types;
 // !!! A hack! struct SDL_keysym is defined in this module,
 // !!! so we need to resolve the nameclash...
 // !!! Definitely won't work on *NIX but for now will do.
-import SDL_Keysym;
+public import SDL_Keysym;
 
 extern(C):
 
Index: val-and-rick-0.1a.dfsg1/import/SDL_mixer.d
===================================================================
--- val-and-rick-0.1a.dfsg1.orig/import/SDL_mixer.d	2005-03-14 01:15:04.000000000 +0000
+++ val-and-rick-0.1a.dfsg1/import/SDL_mixer.d	2007-09-05 07:48:36.000000000 +0000
@@ -22,9 +22,9 @@
 
 // convert to D by shinichiro.h
 
-/* $Id: SDL_mixer.d,v 1.1.1.1 2005/03/13 16:15:04 kenta Exp $ */
+/* $Id: SDL_mixer.d,v 1.1.1.1 2005/06/18 00:46:00 kenta Exp $ */
 
-import SDL;
+public import SDL;
 
 extern (C) {
 
Index: val-and-rick-0.1a.dfsg1/import/SDL_mouse.d
===================================================================
--- val-and-rick-0.1a.dfsg1.orig/import/SDL_mouse.d	2005-03-14 01:15:04.000000000 +0000
+++ val-and-rick-0.1a.dfsg1/import/SDL_mouse.d	2007-09-05 07:48:36.000000000 +0000
@@ -22,8 +22,8 @@
 
 /* Include file for SDL mouse event handling */
 
-import SDL_types;
-import SDL_video;
+public import SDL_types;
+public import SDL_video;
 
 extern(C):
 
Index: val-and-rick-0.1a.dfsg1/import/SDL_mutex.d
===================================================================
--- val-and-rick-0.1a.dfsg1.orig/import/SDL_mutex.d	2005-03-14 01:15:04.000000000 +0000
+++ val-and-rick-0.1a.dfsg1/import/SDL_mutex.d	2007-09-05 07:48:36.000000000 +0000
@@ -25,7 +25,7 @@
 	These are independent of the other SDL routines.
 */
 
-import SDL_types;
+public import SDL_types;
 
 extern(C):
 
Index: val-and-rick-0.1a.dfsg1/import/SDL_quit.d
===================================================================
--- val-and-rick-0.1a.dfsg1.orig/import/SDL_quit.d	2005-03-14 01:15:04.000000000 +0000
+++ val-and-rick-0.1a.dfsg1/import/SDL_quit.d	2007-09-05 07:48:36.000000000 +0000
@@ -22,7 +22,7 @@
 
 /* Include file for SDL quit event handling */
 
-import SDL_events;
+public import SDL_events;
 
 /* 
   An SDL_QUITEVENT is generated when the user tries to close the application
Index: val-and-rick-0.1a.dfsg1/import/SDL_rwops.d
===================================================================
--- val-and-rick-0.1a.dfsg1.orig/import/SDL_rwops.d	2005-03-14 01:15:04.000000000 +0000
+++ val-and-rick-0.1a.dfsg1/import/SDL_rwops.d	2007-09-05 07:48:36.000000000 +0000
@@ -24,7 +24,7 @@
    data sources.  It can easily be extended to files, memory, etc.
 */
 
-import SDL_types;
+public import SDL_types;
 
 extern(C):
 
Index: val-and-rick-0.1a.dfsg1/import/SDL_syswm.d
===================================================================
--- val-and-rick-0.1a.dfsg1.orig/import/SDL_syswm.d	2005-03-14 01:15:04.000000000 +0000
+++ val-and-rick-0.1a.dfsg1/import/SDL_syswm.d	2007-09-05 07:48:36.000000000 +0000
@@ -22,7 +22,7 @@
 
 /* Include file for SDL custom system window manager hooks */
 
-import SDL_Version;
+public import SDL_Version;
 
 extern(C):
 
Index: val-and-rick-0.1a.dfsg1/import/SDL_thread.d
===================================================================
--- val-and-rick-0.1a.dfsg1.orig/import/SDL_thread.d	2005-03-14 01:15:04.000000000 +0000
+++ val-and-rick-0.1a.dfsg1/import/SDL_thread.d	2007-09-05 07:48:36.000000000 +0000
@@ -25,8 +25,8 @@
 	These are independent of the other SDL routines.
 */
 
-import SDL_types;
-import SDL_mutex;
+public import SDL_types;
+public import SDL_mutex;
 
 extern(C):
 
Index: val-and-rick-0.1a.dfsg1/import/SDL_timer.d
===================================================================
--- val-and-rick-0.1a.dfsg1.orig/import/SDL_timer.d	2005-03-14 01:15:04.000000000 +0000
+++ val-and-rick-0.1a.dfsg1/import/SDL_timer.d	2007-09-05 07:48:36.000000000 +0000
@@ -20,7 +20,7 @@
     slouken@devolution.com
 */
 
-import SDL_types;
+public import SDL_types;
 
 extern(C):
 
Index: val-and-rick-0.1a.dfsg1/import/SDL_video.d
===================================================================
--- val-and-rick-0.1a.dfsg1.orig/import/SDL_video.d	2005-03-14 01:15:04.000000000 +0000
+++ val-and-rick-0.1a.dfsg1/import/SDL_video.d	2007-09-05 07:48:36.000000000 +0000
@@ -22,9 +22,9 @@
 
 /* Header file for access to the SDL raw framebuffer window */
 
-import SDL_types;
-import SDL_mutex;
-import SDL_rwops;
+public import SDL_types;
+public import SDL_mutex;
+public import SDL_rwops;
 
 extern(C):
 
Index: val-and-rick-0.1a.dfsg1/import/opengl.d
===================================================================
--- val-and-rick-0.1a.dfsg1.orig/import/opengl.d	2005-03-14 01:15:04.000000000 +0000
+++ val-and-rick-0.1a.dfsg1/import/opengl.d	2007-09-05 07:48:36.000000000 +0000
@@ -1,10 +1,4 @@
-version (Win32) {
-	private import std.c.windows.windows;
-	extern(Windows):
-}
-version (linux) {
-	extern(C):
-}
+extern(C):
 
 alias uint GLenum;
 alias ubyte GLboolean;
@@ -1116,7 +1110,7 @@
 /*************************************************************/
 
 void /*APIENTRY*/glAccum (GLenum op, GLfloat value);
-void /*APIENTRY*/glAlphaFunc (GLenum func, GLclampf ref);
+void /*APIENTRY*/glAlphaFunc (GLenum func, GLclampf ref_);
 GLboolean /*APIENTRY*/glAreTexturesResident (GLsizei n, GLuint *textures, GLboolean *residences);
 void /*APIENTRY*/glArrayElement (GLint i);
 void /*APIENTRY*/glBegin (GLenum mode);
@@ -1369,7 +1363,7 @@
 void /*APIENTRY*/glScissor (GLint x, GLint y, GLsizei width, GLsizei height);
 void /*APIENTRY*/glSelectBuffer (GLsizei size, GLuint *buffer);
 void /*APIENTRY*/glShadeModel (GLenum mode);
-void /*APIENTRY*/glStencilFunc (GLenum func, GLint ref, GLuint mask);
+void /*APIENTRY*/glStencilFunc (GLenum func, GLint ref_, GLuint mask);
 void /*APIENTRY*/glStencilMask (GLuint mask);
 void /*APIENTRY*/glStencilOp (GLenum fail, GLenum zfail, GLenum zpass);
 void /*APIENTRY*/glTexCoord1d (GLdouble s);
Index: val-and-rick-0.1a.dfsg1/import/openglu.d
===================================================================
--- val-and-rick-0.1a.dfsg1.orig/import/openglu.d	2005-03-14 01:15:04.000000000 +0000
+++ val-and-rick-0.1a.dfsg1/import/openglu.d	2007-09-05 07:48:36.000000000 +0000
@@ -1,11 +1,6 @@
 import opengl;
 
-version (Win32) {
-	extern(Windows):
-}
-version (linux) {
-	extern(C):
-}
+extern(C):
 
 GLubyte* gluErrorString (
     GLenum   errCode);
page code/design/content is copyright (c) 2008 sean finney <seanius@debian.org>.
patches viewed/retrieved through this system are copyrighted by their respective authors.
browse git repo - clone git repo