r44848 - in /packages/scilab/trunk/debian: changelog patches/fixEncodingIssues.diff

[sylvestre at users.alioth.debian.org]

Author: sylvestre
Date: Sun May 20 15:20:20 2012
New Revision: 44848

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=44848
Log:
Fix also the javadoc encoding issue (Closes: #672618)

Modified:
    packages/scilab/trunk/debian/changelog
    packages/scilab/trunk/debian/patches/fixEncodingIssues.diff

Modified: packages/scilab/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/trunk/debian/changelog?rev=44848&op=diff
==============================================================================
--- packages/scilab/trunk/debian/changelog (original)
+++ packages/scilab/trunk/debian/changelog Sun May 20 15:20:20 2012
@@ -1,3 +1,9 @@
+scilab (5.3.3-10) unstable; urgency=low
+
+  * Fix also the javadoc encoding issue (Closes: #672618)
+
+ -- Sylvestre Ledru <sylvestre at debian.org>  Sun, 20 May 2012 16:55:54 +0200
+
 scilab (5.3.3-9) unstable; urgency=low
 
   * Fix a build issue with openjdk7 (Closes: #672618)

Modified: packages/scilab/trunk/debian/patches/fixEncodingIssues.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/trunk/debian/patches/fixEncodingIssues.diff?rev=44848&op=diff
==============================================================================
--- packages/scilab/trunk/debian/patches/fixEncodingIssues.diff (original)
+++ packages/scilab/trunk/debian/patches/fixEncodingIssues.diff Sun May 20 15:20:20 2012
@@ -1,7 +1,7 @@
 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-18 17:38:26.480377244 +0200
++++ scilab-5.3.3/build.incl.xml	2012-05-20 16:57:00.022227731 +0200
 @@ -160,7 +160,7 @@
    </target>
    <!-- Compile sources -->
@@ -20,3 +20,16 @@
        <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