r36819 - in /packages/scilab/trunk/debian: changelog patches/sparcstartup.diff patches/writable-string.diff

[sylvestre at users.alioth.debian.org]

Author: sylvestre
Date: Mon Aug 16 12:47:05 2010
New Revision: 36819

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=36819
Log:
  * Remove option -fwritable-string. writable-string.diff (Closes: #593114)
  * Fix a problem in the detection of sparc for sivp sparcstartup.diff
    (Closes: #591541)

Added:
    packages/scilab/trunk/debian/patches/sparcstartup.diff
    packages/scilab/trunk/debian/patches/writable-string.diff
Modified:
    packages/scilab/trunk/debian/changelog

Modified: packages/scilab/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/trunk/debian/changelog?rev=36819&op=diff
==============================================================================
--- packages/scilab/trunk/debian/changelog (original)
+++ packages/scilab/trunk/debian/changelog Mon Aug 16 12:47:05 2010
@@ -1,3 +1,11 @@
+scilab (5.2.2-3) unstable; urgency=low
+
+  * Remove option -fwritable-string. writable-string.diff (Closes: #593114)
+  * Fix a problem in the detection of sparc for sivp sparcstartup.diff
+    (Closes: #591541)
+
+ -- Sylvestre Ledru <sylvestre at debian.org>  Mon, 16 Aug 2010 13:29:20 +0200
+
 scilab (5.2.2-2) unstable; urgency=low
 
   * Missing files in libjavasci (Closes: #585679)

Added: packages/scilab/trunk/debian/patches/sparcstartup.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/trunk/debian/patches/sparcstartup.diff?rev=36819&op=file
==============================================================================
--- packages/scilab/trunk/debian/patches/sparcstartup.diff (added)
+++ packages/scilab/trunk/debian/patches/sparcstartup.diff Mon Aug 16 12:47:05 2010
@@ -1,0 +1,13 @@
+Index: scilab-5.2.2/bin/scilab
+===================================================================
+--- scilab-5.2.2.orig/bin/scilab	2010-08-16 12:13:09.000000000 +0200
++++ scilab-5.2.2/bin/scilab	2010-08-16 13:28:35.000000000 +0200
+@@ -374,7 +374,7 @@
+ 					"alpha")
+ 						proc="alpha"
+ 						;;
+-					"sparc64")
++					"sparc"|"sparc64")
+ 						proc="sparc"
+ 						;;
+ 					sh*)

Added: packages/scilab/trunk/debian/patches/writable-string.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/trunk/debian/patches/writable-string.diff?rev=36819&op=file
==============================================================================
--- packages/scilab/trunk/debian/patches/writable-string.diff (added)
+++ packages/scilab/trunk/debian/patches/writable-string.diff Mon Aug 16 12:47:05 2010
@@ -1,0 +1,29 @@
+Index: scilab-5.2.2/configure.ac
+===================================================================
+--- scilab-5.2.2.orig/configure.ac	2010-08-16 10:09:25.000000000 +0000
++++ scilab-5.2.2/configure.ac	2010-08-16 10:09:55.000000000 +0000
+@@ -518,10 +518,6 @@
+    CFLAGS="$CFLAGS -fno-stack-protector" # bug 3131
+ 
+    case "$host" in
+-   # Linux sparc | Linux, old binary format a.out (NO LONGER SUPPORTED)
+-	 sparc-*-linux-gnu|*-pc-linux-gnuaout)
+-	    CFLAGS="$CFLAGS -fwritable-strings"
+-	;;
+ 	 x86_64-*-linux-gnu | x86_64-linux-gnu)
+ 		CFLAGS="$CFLAGS -DNARROWPROTO -m64"
+     ;;
+@@ -532,11 +528,11 @@
+ 		CFLAGS="$CFLAGS -DNARROWPROTO"
+     ;;
+ 	 alpha-*-linux-gnu)
+-		CFLAGS="$CFLAGS  -mieee-with-inexact -fwritable-strings"
++		CFLAGS="$CFLAGS  -mieee-with-inexact"
+ 		LDFLAGS="$LDFLAGS -mieee-with-inexact"
+ 	;;
+ 	 powerpc-*-linux-gnu)
+-		CFLAGS="$CFLAGS -D_GNU_SOURCE -fwritable-strings"
++		CFLAGS="$CFLAGS -D_GNU_SOURCE"
+ 	;;
+ 	 *-*-solaris*)
+         if test "$enable_debug_C" = yes; then