[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 2338ac2ffc5a184a74099ace1763186c9b8529aa
Merge: 5353177282b89535531822cae6d893c8c2727bc6 845fe3a0afdf0a12df4b11b18e0429421a8ac698
Author: Philippe Coval <rzr at gna.org>
Date:   Sat Mar 20 15:44:08 2010 +0100

    Resolved conflicts :
    rm FreeWRL-0.20/JS/Makefile.old  FreeWRL-0.20/JPEG/Makefile.old  FreeWRL-0.20/OpenGL/Makefile.old  FreeWRL-0.20/PNG/Makefile.old FreeWRL-0.20/Text/Makefile.old

diff --combined JS/js/prcpucfg.c
index ae94777,cf18819..ae94777
--- a/JS/js/prcpucfg.c
+++ b/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 JS/js/prcpucfg.h
index 79363df,f55d02f..79363df
--- a/JS/js/prcpucfg.h
+++ b/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 JS/js/prtypes.h
index 5b0cb09,ab1f722..5b0cb09
--- a/JS/js/prtypes.h
+++ b/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