r35468 - in /packages/scilab/trunk/debian: changelog patches/switchOrder.diff patches/xmltoformat.diff
sylvestre-guest at users.alioth.debian.org
sylvestre-guest at users.alioth.debian.org
Wed Feb 4 11:11:46 UTC 2009
Author: sylvestre-guest
Date: Wed Feb 4 11:11:46 2009
New Revision: 35468
URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=35468
Log:
Integration of a patch to be able to build french without the locale
Added:
packages/scilab/trunk/debian/patches/switchOrder.diff
Modified:
packages/scilab/trunk/debian/changelog
packages/scilab/trunk/debian/patches/xmltoformat.diff
Modified: packages/scilab/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/trunk/debian/changelog?rev=35468&op=diff
==============================================================================
--- packages/scilab/trunk/debian/changelog (original)
+++ packages/scilab/trunk/debian/changelog Wed Feb 4 11:11:46 2009
@@ -1,3 +1,9 @@
+scilab (5.0.3-6) experimental; urgency=low
+
+ * Integration of a patch to be able to build french without the locale
+
+ -- Sylvestre Ledru <sylvestre.ledru at inria.fr> Wed, 21 Jan 2009 16:52:36 +0100
+
scilab (5.0.3-5) experimental; urgency=low
* Add a backported patch from upstream to be able to build the
Added: packages/scilab/trunk/debian/patches/switchOrder.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/trunk/debian/patches/switchOrder.diff?rev=35468&op=file
==============================================================================
--- packages/scilab/trunk/debian/patches/switchOrder.diff (added)
+++ packages/scilab/trunk/debian/patches/switchOrder.diff Wed Feb 4 11:11:46 2009
@@ -1,0 +1,19 @@
+--- plop/scilab-5.0.3/modules/core/src/c/InitScilab.c 2008-11-05 18:42:13.000000000 +0100
++++ scilab-5.0.3/modules/core/src/c/InitScilab.c 2009-02-03 12:46:56.000000000 +0100
+@@ -45,6 +45,8 @@
+
+ if ( getScilabMode() != SCILAB_NWNI )
+ {
++ InitializeTclTk();
++
+ InitializeJVM();
+ InitializeGUI();
+
+@@ -58,7 +60,6 @@
+ InitializeConsole();
+ }
+
+- InitializeTclTk();
+ loadBackGroundClassPath();
+ }
+ return 0;
Modified: packages/scilab/trunk/debian/patches/xmltoformat.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/trunk/debian/patches/xmltoformat.diff?rev=35468&op=diff
==============================================================================
--- packages/scilab/trunk/debian/patches/xmltoformat.diff (original)
+++ packages/scilab/trunk/debian/patches/xmltoformat.diff Wed Feb 4 11:11:46 2009
@@ -1,5 +1,5 @@
---- scilab-5.0.3.orig/modules/helptools/macros/xmltoformat.sci 2008-11-05 18:42:14.000000000 +0100
-+++ scilab-5.0.3/modules/helptools/macros/xmltoformat.sci 2009-01-28 10:50:10.000000000 +0100
+--- plop/scilab-5.0.3/modules/helptools/macros/xmltoformat.sci 2008-11-05 18:42:14.000000000 +0100
++++ scilab-5.0.3/modules/helptools/macros/xmltoformat.sci 2009-02-03 16:29:35.000000000 +0100
@@ -1,5 +1,7 @@
// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
// Copyright (C) 2008 INRIA - Pierre MARECHAL <pierre.marechal at inria.fr>
@@ -496,7 +496,22 @@
" xmlns=""http://docbook.org/ns/docbook"""; ..
" xmlns:xlink=""http://www.w3.org/1999/xlink"""; ..
" xmlns:xi=""http://www.w3.org/2001/XInclude"""; ..
-@@ -1076,7 +1095,9 @@
+@@ -1041,11 +1060,13 @@
+
+ for k=1:size(dirs,"*");
+ xml_files = gsort(basename(listfiles(dirs(k)+"/*.xml")),"lr","i");
+- master_document = [ master_document; ..
++ if (size(xml_files,"*") <> 0) then
++ master_document = [ master_document; ..
+ "<reference xml:id=''"+title2category(titles(k))+"''>"; ..
+ "<title>"+text2html(titles(k))+"</title>"; ..
+ "&"+xml_files+";"; ..
+ "</reference>"]
++ end
+
+ end
+
+@@ -1076,7 +1097,9 @@
xml_files(grep(xml_files,"master_help.xml")) = [];
if MSDOS then
@@ -507,7 +522,26 @@
else
xml_files_tmp = xml_files;
end
-@@ -1120,62 +1141,62 @@
+@@ -1099,12 +1122,14 @@
+ " <title>"+my_title+"</title>"; ..
+ " </info>"; ..
+ "<!--Begin Reference-->"];
+-
++
+ master_document = [ master_document; ..
+ "<reference xml:id=''"+title2category(my_title)+"''>"; ..
+- "<title>"+text2html(my_title)+"</title>"; ..
+- "&"+basename(xml_files)+";"; ..
+- "</reference>"]
++ "<title>"+text2html(my_title)+"</title>" ];
++ if (size(xml_files,"*") <> 0) then
++ master_document = [ master_document; "&"+basename(xml_files)+";" ];
++ end
++ master_document = [ master_document; "</reference>" ];
+
+
+ master_document = [ master_document; ..
+@@ -1120,62 +1145,62 @@
category = mytitle;
category = strsubst(category , "&" , "_" );
@@ -626,7 +660,7 @@
category = strsubst(category , ":" , "" );
category = strsubst(category , "\" , "_" );
-@@ -1200,73 +1221,73 @@
+@@ -1200,73 +1225,73 @@
//
// out = strsubst(out , """" , """ );
// out = strsubst(out , "&" , "&" );
@@ -763,7 +797,7 @@
dirs_out = [];
-@@ -1276,10 +1297,10 @@
+@@ -1276,10 +1301,10 @@
help_basepath = part(dirs_in(k),1:length(dirs_in(k))-4) + filesep() + "help";
@@ -777,7 +811,7 @@
else
dirs_out(k) = "";
end
-@@ -1304,3 +1325,194 @@
+@@ -1304,3 +1329,194 @@
end
endfunction
More information about the debian-science-commits
mailing list