r35714 - in /packages/scilab/trunk/debian: changelog patches/alphabuild.diff patches/s390javadetection.diff rules

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

Author: sylvestre-guest
Date: Wed May 13 12:37:03 2009
New Revision: 35714

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=35714
Log:
  * install/scilab wasn't called when building binary for other archs. 
    Therefor not installing correctly everything (Closes: #528517)
  * A bad define was causing a silly include (alphabuild.diff)
  * uname -m is returning s390x on some s390 archs (s390javadetection.diff)

Added:
    packages/scilab/trunk/debian/patches/alphabuild.diff
    packages/scilab/trunk/debian/patches/s390javadetection.diff
Modified:
    packages/scilab/trunk/debian/changelog
    packages/scilab/trunk/debian/rules

Modified: packages/scilab/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/trunk/debian/changelog?rev=35714&op=diff
==============================================================================
--- packages/scilab/trunk/debian/changelog (original)
+++ packages/scilab/trunk/debian/changelog Wed May 13 12:37:03 2009
@@ -1,3 +1,12 @@
+scilab (5.1.1-5) unstable; urgency=low
+
+  * install/scilab wasn't called when building binary for other archs. 
+    Therefor not installing correctly everything (Closes: #528517)
+  * A bad define was causing a silly include (alphabuild.diff)
+  * uname -m is returning s390x on some s390 archs (s390javadetection.diff)
+
+ -- Sylvestre Ledru <sylvestre.ledru at inria.fr>  Wed, 13 May 2009 14:12:23 +0200
+
 scilab (5.1.1-4) unstable; urgency=low
 
   * librefblas3-dev does not exist (yet). Thanks to Jose Ramon

Added: packages/scilab/trunk/debian/patches/alphabuild.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/trunk/debian/patches/alphabuild.diff?rev=35714&op=file
==============================================================================
--- packages/scilab/trunk/debian/patches/alphabuild.diff (added)
+++ packages/scilab/trunk/debian/patches/alphabuild.diff Wed May 13 12:37:03 2009
@@ -1,0 +1,13 @@
+diff --git a/scilab/modules/core/includes/getmemory.h b/scilab/modules/core/includes/getmemory.h
+index fac5427..43546bb 100644
+--- a/scilab/modules/core/includes/getmemory.h
++++ b/scilab/modules/core/includes/getmemory.h
+@@ -28,7 +28,7 @@
+         #endif
+       #endif
+    #endif
+-   #if defined(__alpha)	&& !defined(__NetBSD__)
++   #if defined(__alpha)	&& !defined(__NetBSD__) && !defined(linux)
+      #include <sys/sysinfo.h> 
+      #include <machine/hal_sysinfo.h>
+    #endif

Added: packages/scilab/trunk/debian/patches/s390javadetection.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/trunk/debian/patches/s390javadetection.diff?rev=35714&op=file
==============================================================================
--- packages/scilab/trunk/debian/patches/s390javadetection.diff (added)
+++ packages/scilab/trunk/debian/patches/s390javadetection.diff Wed May 13 12:37:03 2009
@@ -1,0 +1,14 @@
+diff --git a/scilab/m4/java.m4 b/scilab/m4/java.m4
+index 294de10..52c571f 100644
+--- a/scilab/m4/java.m4
++++ b/scilab/m4/java.m4
+@@ -425,6 +425,9 @@ AC_DEFUN([AC_JAVA_JNI_LIBS], [
+ 	    powerpc|ppc64)
+ 	  	  machine=ppc
+ 		  ;;
++		  s390x) # s390 arch can also returns s390x
++		  machine=s390
++		  ;;
+     esac
+ 
+     # Check for known JDK installation layouts

Modified: packages/scilab/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/trunk/debian/rules?rev=35714&op=diff
==============================================================================
--- packages/scilab/trunk/debian/rules (original)
+++ packages/scilab/trunk/debian/rules Wed May 13 12:37:03 2009
@@ -36,7 +36,7 @@
 
 #DEB_MAKE_CHECK_TARGET = check
 
-install/scilab::
+install/scilab-bin::
 # Remove empty directories
 	find $(DEB_DESTDIR)/usr/share/scilab -type d -empty -delete
 # Remove extra license files to make lintian happier