1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
|
Description: use libintl.jar from the system instead of a shipped binary
Author: Julien Puydt
Forwarded: Debian-specific
--- a/scilab/modules/external_objects_java/Makefile.am
+++ b/scilab/modules/external_objects_java/Makefile.am
@@ -154,7 +154,7 @@
#### external_objects_java : test files ####
libsciexternal_objects_java_la_testsdir = $(mydatadir)/tests/
libsciexternal_objects_java_la_tests_DATA = \
-tests/libintl.jar
+/usr/share/java/libintl.jar
if NEED_JAVA
USEANT=1
--- a/scilab/modules/external_objects_java/tests/unit_tests/jimport.dia.ref
+++ b/scilab/modules/external_objects_java/tests/unit_tests/jimport.dia.ref
@@ -4,6 +4,6 @@
//
// This file is distributed under the same license as the Scilab package.
// =============================================================================
-javaclasspath(SCI + "/modules/external_objects_java/tests/libintl.jar");
+javaclasspath("/usr/share/java/libintl.jar");
jimport("gnu.gettext.GettextResource");
assert_checkequal(jgetclassname(GettextResource),"gnu.gettext.GettextResource");
--- a/scilab/modules/external_objects_java/tests/unit_tests/jimport.tst
+++ b/scilab/modules/external_objects_java/tests/unit_tests/jimport.tst
@@ -5,7 +5,7 @@
// This file is distributed under the same license as the Scilab package.
// =============================================================================
-javaclasspath(SCI + "/modules/external_objects_java/tests/libintl.jar");
+javaclasspath("/usr/share/java/libintl.jar");
jimport("gnu.gettext.GettextResource");
assert_checkequal(jgetclassname(GettextResource),"gnu.gettext.GettextResource");
|
