[pkg-fgfs-crew] r200 - in /simgear/trunk: debian/changelog debian/patches/ debian/patches/nasal-endian.patch debian/patches/series debian/rules debian/source/ debian/source/format simgear/nasal/naref.h

[ovek at users.alioth.debian.org]

Author: ovek
Date: Mon Jul 16 00:19:05 2012
New Revision: 200

URL: http://svn.debian.org/wsvn/pkg-fgfs/?sc=1&rev=200
Log:
Switch to 3.0 (quilt) format.

Added:
    simgear/trunk/debian/patches/
    simgear/trunk/debian/patches/nasal-endian.patch
    simgear/trunk/debian/patches/series
    simgear/trunk/debian/source/
    simgear/trunk/debian/source/format
Modified:
    simgear/trunk/debian/changelog
    simgear/trunk/debian/rules
    simgear/trunk/simgear/nasal/naref.h

Modified: simgear/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-fgfs/simgear/trunk/debian/changelog?rev=200&op=diff
==============================================================================
--- simgear/trunk/debian/changelog (original)
+++ simgear/trunk/debian/changelog Mon Jul 16 00:19:05 2012
@@ -4,9 +4,10 @@
   * Depend on cmake. No longer depend on autotools-dev.
   * Updated debian/rules for the new cmake-based build
     system used by upstream, and cleaned it up a bit.
-  * Use upstream's new SIMGEAR_SHARED build option to
+  * Used upstream's new SIMGEAR_SHARED build option to
     build the shared libraries. Deleted the previous
     debian/sorules stuff.
+  * Switched source package format to 3.0 (quilt).
   * Removed libplib-dev from the Build-Dependencies.
   * Added the "Thanks" file to debian/docs.
   * Updated debian/watch, the mirror is now ibiblio.org.

Added: simgear/trunk/debian/patches/nasal-endian.patch
URL: http://svn.debian.org/wsvn/pkg-fgfs/simgear/trunk/debian/patches/nasal-endian.patch?rev=200&op=file
==============================================================================
--- simgear/trunk/debian/patches/nasal-endian.patch (added)
+++ simgear/trunk/debian/patches/nasal-endian.patch Mon Jul 16 00:19:05 2012
@@ -1,0 +1,29 @@
+Description: Added Nasal endianness definitions
+ Define byte order for Alpha, PA-RISC, S/390, and SuperH architectures.
+ (Not successfully forwarded upstream because the Nasal developer
+ seemed to have attitude issues about non-mainstream architectures.)
+Origin: vendor
+Bug-Debian: http://bugs.debian.org/461399
+Bug-Debian: http://bugs.debian.org/572428
+Forwarded: no
+Author: Ove Kaaven <ovek at arcticnet.no>
+Last-Update: 2012-07-16
+
+--- simgear-2.6.0.orig/simgear/nasal/naref.h
++++ simgear-2.6.0/simgear/nasal/naref.h
+@@ -12,10 +12,13 @@
+ # define NASAL_NAN64
+ #elif defined(_M_IX86) || defined(i386) || defined(__x86_64) || \
+       defined(__ia64__) || defined(_M_IA64) || defined(__ARMEL__) || \
+-      defined(_M_X64) 
++      defined(_M_X64) || defined(__alpha__) || \
++      (defined(__sh__) && defined(__LITTLE_ENDIAN__))
+ # define NASAL_LE
+ #elif defined(__sparc) || defined(__ppc__) || defined(__PPC) || \
+-      defined(__mips) || defined(__ARMEB__)
++      defined(__mips) || defined(__ARMEB__) || \
++      defined(__hppa__) || defined(__s390__) || defined(__s390x__) || \
++      (defined(__sh__) && !defined(__LITTLE_ENDIAN__))
+ # define NASAL_BE
+ #else
+ # error Unrecognized CPU architecture

Added: simgear/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-fgfs/simgear/trunk/debian/patches/series?rev=200&op=file
==============================================================================
--- simgear/trunk/debian/patches/series (added)
+++ simgear/trunk/debian/patches/series Mon Jul 16 00:19:05 2012
@@ -1,0 +1,1 @@
+nasal-endian.patch

Modified: simgear/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-fgfs/simgear/trunk/debian/rules?rev=200&op=diff
==============================================================================
--- simgear/trunk/debian/rules (original)
+++ simgear/trunk/debian/rules Mon Jul 16 00:19:05 2012
@@ -20,7 +20,7 @@
 package := simgear$(version)
 
 CMAKE_FLAGS=-DCMAKE_INSTALL_PREFIX=/usr \
-    -DJPEG_FACTORY=ON
+	-DJPEG_FACTORY=ON
 CMAKE_SOFLAGS=-DSIMGEAR_SHARED=ON
 CMAKE_LIBFLAGS=
 

Added: simgear/trunk/debian/source/format
URL: http://svn.debian.org/wsvn/pkg-fgfs/simgear/trunk/debian/source/format?rev=200&op=file
==============================================================================
--- simgear/trunk/debian/source/format (added)
+++ simgear/trunk/debian/source/format Mon Jul 16 00:19:05 2012
@@ -1,0 +1,1 @@
+3.0 (quilt)

Modified: simgear/trunk/simgear/nasal/naref.h
URL: http://svn.debian.org/wsvn/pkg-fgfs/simgear/trunk/simgear/nasal/naref.h?rev=200&op=diff
==============================================================================
--- simgear/trunk/simgear/nasal/naref.h (original)
+++ simgear/trunk/simgear/nasal/naref.h Mon Jul 16 00:19:05 2012
@@ -12,13 +12,10 @@
 # define NASAL_NAN64
 #elif defined(_M_IX86) || defined(i386) || defined(__x86_64) || \
       defined(__ia64__) || defined(_M_IA64) || defined(__ARMEL__) || \
-      defined(_M_X64) || defined(__alpha__) || \
-      (defined(__sh__) && defined(__LITTLE_ENDIAN__))
+      defined(_M_X64) 
 # define NASAL_LE
 #elif defined(__sparc) || defined(__ppc__) || defined(__PPC) || \
-      defined(__mips) || defined(__ARMEB__) || \
-      defined(__hppa__) || defined(__s390__) || defined(__s390x__) || \
-      (defined(__sh__) && !defined(__LITTLE_ENDIAN__))
+      defined(__mips) || defined(__ARMEB__)
 # define NASAL_BE
 #else
 # error Unrecognized CPU architecture