scilab (5.3.3-10) fixEncodingIssues.diff

Summary

 Makefile.am    |    2 +-
 build.incl.xml |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

    
download this patch

Patch contents

Index: scilab-5.3.3/build.incl.xml
===================================================================
--- scilab-5.3.3.orig/build.incl.xml	2011-07-20 10:15:42.000000000 +0200
+++ scilab-5.3.3/build.incl.xml	2012-05-20 16:57:00.022227731 +0200
@@ -160,7 +160,7 @@
   </target>
   <!-- Compile sources -->
   <target name="compile" description="Build sources" depends="init">
-    <javac srcdir="${src.dir}" destdir="${classes.dir}" classpathref="compile.classpath" deprecation="on" debug="${build.debug}" verbose="off" listfiles="on" includeAntRuntime="no" source="5"/>
+    <javac encoding="ISO-8859-1" srcdir="${src.dir}" destdir="${classes.dir}" classpathref="compile.classpath" deprecation="on" debug="${build.debug}" verbose="off" listfiles="on" includeAntRuntime="no" source="5"/>
   </target>
   <target name="existing-tests">
     <available property="test-present" file="${src.test.dir}"/>
@@ -168,7 +168,7 @@
   <!-- Compile test sources -->
   <target name="compile-test" description="Build tests" depends="existing-tests, clean-test, jar" if="test-present">
     <!-- clean the test to make sure it will build properly -->
-    <javac srcdir="${src.test.dir}" destdir="${classes.test.dir}" deprecation="on" debug="${build.debug}" verbose="off" listfiles="on" includeAntRuntime="no" source="5">
+    <javac encoding="ISO-8859-1" srcdir="${src.test.dir}" destdir="${classes.test.dir}" deprecation="on" debug="${build.debug}" verbose="off" listfiles="on" includeAntRuntime="no" source="5">
       <classpath>
         <path refid="unittest.classpath"/>
         <path refid="compile.classpath"/>
Index: scilab-5.3.3/Makefile.am
===================================================================
--- scilab-5.3.3.orig/Makefile.am	2011-07-20 10:15:42.000000000 +0200
+++ scilab-5.3.3/Makefile.am	2012-05-20 16:57:21.090227465 +0200
@@ -163,7 +163,7 @@
 # This is not done in the module itself because its needs also the "types"
 # module
 javadoc:
-	$(JAVADOC) -noindex -nohelp -nonavbar -notree \
+	$(JAVADOC) -encoding ISO-8859-1 -noindex -nohelp -nonavbar -notree \
 	-d $(top_builddir)/modules/javasci/javadoc \
 	-sourcepath $(top_srcdir)/modules/javasci/src/java:$(top_srcdir)/modules/types/src/java \
 	org.scilab.modules.javasci org.scilab.modules.types