[SCM] freewrl packaging branch, master, updated. 7cf414d7349f2192ab879d5f0e146e31b5443211

[rzr-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 5fe856b520ec131da9412e44d415b12b881e6269
Merge: f5f838119444b8ae83a8e7aec561f5b0d1c37148 9593b24019a5ba4d6355324fb01f3c2054717f2d
Author: Philippe Coval <rzr at gna.org>
Date:   Sat Mar 20 15:25:55 2010 +0100

    Merged since failure on : git-import-dsc ../freewrl_0.20.a1-3.dsc

diff --combined FreeWRL-0.20/Config.pm
index 0000000,f720f3e..49a31bc
mode 000000,100644..100644
--- a/FreeWRL-0.20/Config.pm
+++ b/FreeWRL-0.20/Config.pm
@@@ -1,0 -1,19 +1,19 @@@
+ # AUTOMATICALLY GENERATED BY TOP-LEVEL MAKEFILE.PL -- DO NOT EDIT
+ %VRML::Config = (
+ 	JPEG_DEFINE	=>	"",
+ 	JS_INC	=>	"\-Ijs\/Linux_All_DBG\.OBJ\ \-Ijs\/",
+ 	JS_LIBS	=>	"\-Ljs\/Linux_All_DBG\.OBJ\ \-ljs",
+ 	FREETYPE_INC	=>	"",
+ 	FREETYPE_LIBS	=>	"\-lttf",
+ 	PNG_INC	=>	"",
+ 	PNG_LIBS	=>	"\-lpng\ \-lz",
+ 	FREETYPE_DEFINE	=>	"",
+ 	OPENGL_INC	=>	"",
 -	OPENGL_LIBS	=>	"\-L\/usr\/local\/home\/luigi\/Mesa\-3\.0\/lib\ \-L\/usr\/lib\ \-L\/usr\/X11R6\/lib\ \-lMesaGL\ \-lMesaGLU\ \-lXext\ \-lX11",
++	OPENGL_LIBS	=>	"\-L\/home\/l\/u\/lukka\/lib\ \-L\/usr\/X11R6\/lib\ \-L\/usr\/lib\/mesa\ \-lMesaGL\ \-lMesaGLU\ \-lXext\ \-lX11",
+ 	PNG_DEFINE	=>	"",
+ 	JPEG_INC	=>	"",
+ 	JPEG_LIBS	=>	"\-ljpeg",
+ 	OPENGL_DEFINE	=>	"",
+ VERSION => "0.17a"
+ );
+ 1;
diff --combined FreeWRL-0.20/JS/js/prcpucfg.c
index ae94777,cf18819..ae94777
--- a/FreeWRL-0.20/JS/js/prcpucfg.c
+++ b/FreeWRL-0.20/JS/js/prcpucfg.c
@@@ -45,7 -45,7 +45,7 @@@
  #endif
  #endif
  
 -#if defined(__alpha)
 +#if defined(__alpha) && !defined(linux)
  #ifndef OSF1
  # error "OSF1 is not defined"
  #endif
diff --combined FreeWRL-0.20/JS/js/prcpucfg.h
index 804f27f,f55d02f..804f27f
--- a/FreeWRL-0.20/JS/js/prcpucfg.h
+++ b/FreeWRL-0.20/JS/js/prcpucfg.h
@@@ -333,9 -333,6 +333,9 @@@
  #elif  __i386__
  #define IS_LITTLE_ENDIAN 1
  #undef  IS_BIG_ENDIAN
 +#elif  __alpha__
 +#define IS_LITTLE_ENDIAN 1
 +#undef  IS_BIG_ENDIAN
  #else
  #error "linux cpu architecture not supported by prcpucfg.h"
  #endif
diff --combined FreeWRL-0.20/JS/js/prtypes.h
index 5b0cb09,ab1f722..5b0cb09
--- a/FreeWRL-0.20/JS/js/prtypes.h
+++ b/FreeWRL-0.20/JS/js/prtypes.h
@@@ -22,7 -22,7 +22,7 @@@
   * Fundamental types and related macros.
   */
  #include <stddef.h>
 -#include "prcpucfg.h"
 +#include <prcpucfg.h>
  
  /*
   * Bitsize-explicit integer types.

-- 
freewrl packaging