r44257 - in /packages/scilab/branches/5.4/debian: changelog control patches/Fix_a_typo_in_the_french_translation.diff patches/adddemo.diff patches/series

sylvestre at users.alioth.debian.org sylvestre at users.alioth.debian.org
Wed Dec 28 11:09:19 UTC 2011


Author: sylvestre
Date: Wed Dec 28 11:09:18 2011
New Revision: 44257

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=44257
Log:
  * Fix a French localization issues
  * Update the minimal version of libjhdf5
  * Fix a bug in the adddemo.diff patch. Also update the error message.

Added:
    packages/scilab/branches/5.4/debian/patches/Fix_a_typo_in_the_french_translation.diff
Modified:
    packages/scilab/branches/5.4/debian/changelog
    packages/scilab/branches/5.4/debian/control
    packages/scilab/branches/5.4/debian/patches/adddemo.diff
    packages/scilab/branches/5.4/debian/patches/series

Modified: packages/scilab/branches/5.4/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/branches/5.4/debian/changelog?rev=44257&op=diff
==============================================================================
--- packages/scilab/branches/5.4/debian/changelog (original)
+++ packages/scilab/branches/5.4/debian/changelog Wed Dec 28 11:09:18 2011
@@ -1,3 +1,11 @@
+scilab (5.4.0-alpha-1-1~exp3) experimental; urgency=low
+
+  * Fix a French localization issues
+  * Update the minimal version of libjhdf5
+  * Fix a bug in the adddemo.diff patch. Also update the error message.
+
+ -- Sylvestre Ledru <sylvestre at debian.org>  Wed, 28 Dec 2011 11:32:41 +0100
+
 scilab (5.4.0-alpha-1-1~exp2) experimental; urgency=low
 
   * Remove the bundled version of arpack and use arpack-ng (ie >= 3.0)

Modified: packages/scilab/branches/5.4/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/branches/5.4/debian/control?rev=44257&op=diff
==============================================================================
--- packages/scilab/branches/5.4/debian/control (original)
+++ packages/scilab/branches/5.4/debian/control Wed Dec 28 11:09:18 2011
@@ -24,7 +24,7 @@
 # latex rendering
  libjlatexmath-java (>= 0.9.4),  libjlatexmath-fop-java (>= 0.9.4),
 # Xcos
- libjgraphx-java (>= 1.8.0.0), libhdf5-dev (>= 1.8.8), libjhdf5-java (>= 2.8-beta-1), imagemagick
+ libjgraphx-java (>= 1.8.0.0), libhdf5-dev (>= 1.8.8), libjhdf5-java (>= 2.8.0), imagemagick
 Standards-Version: 3.9.2
 Homepage: http://www.scilab.org
 Vcs-Svn: svn://svn.debian.org/svn/debian-science/packages/scilab/trunk/
@@ -149,7 +149,7 @@
  libjlatexmath-java (>= 0.9.4), libjlatexmath-fop-java (>= 0.9.4),
  libjeuclid-core-java, libbatik-java (>= 1.7), default-jre, bwidget,
  fop (>= 0.95), libsaxon-java, libavalon-framework-java, docbook-xsl,
- javahelp2, libjgraphx-java (>= 1.8.0.0), libjhdf5-java (>= 2.8-beta-1),
+ javahelp2, libjgraphx-java (>= 1.8.0.0), libjhdf5-java (>= 2.8.0-1),
  libskinlf-java, ${misc:Depends}
 Recommends: pvm
 Replaces: scilab (<< 5.0), scilab-bin, scilab-minimal-bin (<< 5.3)

Added: packages/scilab/branches/5.4/debian/patches/Fix_a_typo_in_the_french_translation.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/branches/5.4/debian/patches/Fix_a_typo_in_the_french_translation.diff?rev=44257&op=file
==============================================================================
--- packages/scilab/branches/5.4/debian/patches/Fix_a_typo_in_the_french_translation.diff (added)
+++ packages/scilab/branches/5.4/debian/patches/Fix_a_typo_in_the_french_translation.diff Wed Dec 28 11:09:18 2011
@@ -1,0 +1,21 @@
+commit 1214f8f2c2bbff4ad3996e9dbdc00e36a2632540
+Author: Sylvestre Ledru <sylvestre.ledru at scilab-enterprises.com>
+Date:   Wed Dec 21 17:23:22 2011 +0100
+
+    Fix a typo in the french translation
+    
+    Change-Id: Id2539333ca5444c9399315090fc1410c8875b694
+
+diff --git a/scilab/modules/gui/locales/fr_FR.po b/scilab/modules/gui/locales/fr_FR.po
+index 345148b..3ce2e79 100644
+--- scilab.orig/modules/gui/locales/fr_FR.po
++++ scilab/modules/gui/locales/fr_FR.po
+@@ -1011,7 +1011,7 @@ msgid ""
+ msgstr ""
+ "disp(\"ATTENTION : À cause des limitations de votre configuration, Scilab "
+ "est passé dans un mode dans lequel mélanger des uicontrols et des graphiques "
+-"n'est pas possible. Tapez \"\"help usecanvas\"\" pour plus d'informations.\")"
++"n''est pas possible. Tapez \"\"help usecanvas\"\" pour plus d''informations.\")"
+ 
+ msgid ""
+ "disp(\"WARNING: Due to your video card drivers limitations, that are not "

Modified: packages/scilab/branches/5.4/debian/patches/adddemo.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/branches/5.4/debian/patches/adddemo.diff?rev=44257&op=diff
==============================================================================
--- packages/scilab/branches/5.4/debian/patches/adddemo.diff (original)
+++ packages/scilab/branches/5.4/debian/patches/adddemo.diff Wed Dec 28 11:09:18 2011
@@ -1,22 +1,13 @@
-Index: scilab-5.3.999~git20111208/modules/demo_tools/macros/add_demo.sci
+Index: scilab-5.4.0-alpha-1/modules/demo_tools/macros/add_demo.sci
 ===================================================================
---- scilab-5.3.999~git20111208.orig/modules/demo_tools/macros/add_demo.sci	2011-12-08 15:04:25.000000000 +0100
-+++ scilab-5.3.999~git20111208/modules/demo_tools/macros/add_demo.sci	2011-12-08 16:40:25.478619557 +0100
-@@ -35,8 +35,6 @@
+--- scilab-5.4.0-alpha-1.orig/modules/demo_tools/macros/add_demo.sci	2011-12-28 11:28:12.875545097 +0100
++++ scilab-5.4.0-alpha-1/modules/demo_tools/macros/add_demo.sci	2011-12-28 11:30:45.319549295 +0100
+@@ -35,7 +35,7 @@
    path = pathconvert(path, %f, %t);
  
    if ~isfile(path) then
 -    error(msprintf(gettext("%s: The file %s does not exist.\n"), "add_demo", path));
--  end
++    error(msprintf(gettext("Demos are not available. Please install the package scilab-doc\n")));
+   end
  
    if isdir(path) then
-     error(msprintf(gettext("%s: Wrong input argument #%d: Path to a scilab script file expected.\n"), "add_demo", 2));
-@@ -52,7 +50,7 @@
-       demolist = [demolist; demotitle + " (" + string(size(k,"*")) + ")", path];
-     end
-   end
--
-+  end
-   clear demolist
- 
- endfunction

Modified: packages/scilab/branches/5.4/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/branches/5.4/debian/patches/series?rev=44257&op=diff
==============================================================================
--- packages/scilab/branches/5.4/debian/patches/series (original)
+++ packages/scilab/branches/5.4/debian/patches/series Wed Dec 28 11:09:18 2011
@@ -3,3 +3,4 @@
 librarypath.diff
 missingaddchapter.diff
 0001-Use-the-arpack-provided-by-the-system-and-not-the-on.patch
+Fix_a_typo_in_the_french_translation.diff




More information about the debian-science-commits mailing list