r36094 - in /packages/scilab/trunk/debian: ./ patches/

sylvestre-guest at users.alioth.debian.org sylvestre-guest at users.alioth.debian.org
Mon Jan 18 22:01:03 UTC 2010


Author: sylvestre-guest
Date: Mon Jan 18 22:00:59 2010
New Revision: 36094

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=36094
Log:
  * New upstream release (dependencies added: jlatexmath, jhdf, hdf5, 
    libjgraphx)
  * alphabuild.diff, exitincode.diff, fpu_control.diff, jvm-powerpc.diff
    javaruntimedetection.diff, malloc.diff, z_java_debug.diff, 
    z_mipsel_arm_mgmt.diff, autoconf-libs-filed-updated.diff, 
    ocaml-not-available.diff, typo.diff removed (applied upstream)
  * PVM_ROOT set is no longer required
        

Removed:
    packages/scilab/trunk/debian/patches/alphabuild.diff
    packages/scilab/trunk/debian/patches/autoconf-libs-filed-updated.diff
    packages/scilab/trunk/debian/patches/exitincode.diff
    packages/scilab/trunk/debian/patches/fpu_control.diff
    packages/scilab/trunk/debian/patches/javaruntimedetection.diff
    packages/scilab/trunk/debian/patches/jvm-powerpc.diff
    packages/scilab/trunk/debian/patches/malloc.diff
    packages/scilab/trunk/debian/patches/ocaml-not-available.diff
    packages/scilab/trunk/debian/patches/typo.diff
    packages/scilab/trunk/debian/patches/z_java_debug.diff
    packages/scilab/trunk/debian/patches/z_mipsel_arm_mgmt.diff
Modified:
    packages/scilab/trunk/debian/changelog
    packages/scilab/trunk/debian/control
    packages/scilab/trunk/debian/patches/modelicac-not-available.diff
    packages/scilab/trunk/debian/rules

Modified: packages/scilab/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/trunk/debian/changelog?rev=36094&op=diff
==============================================================================
--- packages/scilab/trunk/debian/changelog (original)
+++ packages/scilab/trunk/debian/changelog Mon Jan 18 22:00:59 2010
@@ -1,3 +1,15 @@
+scilab (5.2.0-1) experimental; urgency=low
+
+  * New upstream release (dependencies added: jlatexmath, jhdf, hdf5, 
+    libjgraphx)
+  * alphabuild.diff, exitincode.diff, fpu_control.diff, jvm-powerpc.diff
+    javaruntimedetection.diff, malloc.diff, z_java_debug.diff, 
+    z_mipsel_arm_mgmt.diff, autoconf-libs-filed-updated.diff, 
+    ocaml-not-available.diff, typo.diff removed (applied upstream)
+  * PVM_ROOT set is no longer required
+	
+ -- Sylvestre Ledru <sylvestre at debian.org>  Tue, 22 Dec 2009 13:47:23 +0100
+
 scilab (5.1.1-13) unstable; urgency=low
 
   * Recommends sivp => scilab-sivp (Closes: #560174)
@@ -229,6 +241,226 @@
 
  -- Sylvestre Ledru <sylvestre.ledru at inria.fr>  Wed, 10 Sep 2008 13:35:28 +0200
 
+=======
+scilab (5.1.1-11) unstable; urgency=low
+
+  * In the version 5.1.1-10, I changed a mv by a cp and it caused the help
+    file to be stored in both packages (Closes: #547624)
+
+ -- Sylvestre Ledru <sylvestre at debian.org>  Mon, 21 Sep 2009 10:18:54 +0200
+
+scilab (5.1.1-10) unstable; urgency=low
+
+  * Do not build the help on arch != amd64/i386. Waiting for upstream to 
+    improve the build time
+  * Force the dependency on openjdk-6-jre | sun-java6-jre on scilab-bin to 
+    make sure that libjava is available (Closes: #538359)
+
+ -- Sylvestre Ledru <sylvestre at debian.org>  Sat, 19 Sep 2009 14:13:52 +0200
+
+scilab (5.1.1-9) unstable; urgency=low
+
+  * mipsel and armel management added (z_mipsel_arm_mgmt.diff patch added)
+
+ -- Sylvestre Ledru <sylvestre at debian.org>  Wed, 09 Sep 2009 00:28:10 +0200
+
+scilab (5.1.1-8) unstable; urgency=low
+
+  * Update libs_by_debian.m4 which is the libs.m4 of autoconf 2.64 
+     (bug reported upstream) (LP: #414410)
+  * Removal of Torsten on his request (Thanks for everything)
+  * Standards-Version updated to 3.8.3
+  * DM-Upload-Allowed removed
+
+ -- Sylvestre Ledru <sylvestre at debian.org>  Sun, 30 Aug 2009 11:07:45 +0200
+
+scilab (5.1.1-7) unstable; urgency=low
+
+  [ Sylvestre Ledru ]
+  * Change of my email address since I am now DD \o/
+  * Better processing with the removal of the rpath
+  * dh_desktop call removed
+  * Standards-Version updated to 3.8.2
+  * Force the minimal version of suitesparse to 3.4.0-1. This version 
+    introduced new binary packages (libumfpack and libamd here)
+    
+  [ Christoph Korn ]
+  * debian/control:
+    * Set libscilab-java as architecture independent because it only
+      contains a jar file.
+    * Added scilab-bin-dbg as debugging package. CDBS should do the rest.
+  * debian/rules:
+    * Moved the install code for icons from "binary-install/libscilab-java::"
+      target to "install/scilab::" target.
+
+ -- Sylvestre Ledru <sylvestre at debian.org>  Fri, 14 Aug 2009 16:06:35 +0200
+
+scilab (5.1.1-6) unstable; urgency=low
+
+  * better install which should really fix the previous bug 
+    (Closes: #528517)
+  * More feedbacks on the java detection (z_java_debug.diff)
+  * Enable a default case on the startup about the java detection 
+    (javaruntimedetection.diff)
+
+ -- Sylvestre Ledru <sylvestre.ledru at inria.fr>  Thu, 14 May 2009 16:38:17 +0200
+
+scilab (5.1.1-5) unstable; urgency=low
+
+  * install/scilab wasn't called when building binary for other archs. 
+    Therefor not installing correctly everything (Closes: #528517)
+  * A bad define was causing a silly include (alphabuild.diff)
+  * uname -m is returning s390x on some s390 archs (s390javadetection.diff)
+  * manpage of modelicac updated with the information about the 
+    availability of this binary
+
+ -- Sylvestre Ledru <sylvestre.ledru at inria.fr>  Wed, 13 May 2009 14:12:23 +0200
+
+scilab (5.1.1-4) unstable; urgency=low
+
+  * librefblas3-dev does not exist (yet). Thanks to Jose Ramon
+  * Do not stop when ocamlopt is not available on the arch 
+    (ocaml-not-available.diff)
+  * Provide a clear error message for archs where modelicac compiler is 
+    not available (modelicac-not-available.diff)
+  * scilab startup script moved from package scilab => scilab-bin (because of
+    the ocamlopt problem, I cannot predict if modelicac will be available or
+    not. Therefor, I ship usr/bin/ instead of binary per binary. This will
+    also simplifies the packaging of Scilab 5.2)
+
+ -- Sylvestre Ledru <sylvestre.ledru at inria.fr>  Tue, 28 Apr 2009 18:47:03 +0200
+
+scilab (5.1.1-3) unstable; urgency=low
+
+  * Fix warnings in the manpages (modelicac.1 & scilab.1)
+  * Fix a few typo in the code (typo.diff)
+  * Remove some exit() in some libs of Scilab (exitincode.diff)
+  * Encoding removed from scilab.desktop (it is now the default encoding)
+  * call_scilab documentation was not correctly loaded (missingaddchapter.diff)
+  * change of the order of the dependencies of the numerical deps (didn't work
+    buildd) (Closes: #525935)
+  * Build-dep atlas3-base-dev renamed to libatlas-base-dev
+
+ -- Sylvestre Ledru <sylvestre.ledru at inria.fr>  Mon, 27 Apr 2009 14:51:57 +0200
+
+scilab (5.1.1-2) unstable; urgency=low
+
+  * More windows-devel-file-in-package lintian ignored 
+  * libscilab-java is now in Section: java
+  * Upload in unstable
+  * Standards-Version updated to 3.8.1
+  * compat & debhelpder dep updated from 4 => 7
+
+ -- Sylvestre Ledru <sylvestre.ledru at inria.fr>  Wed, 22 Apr 2009 14:58:37 +0200
+
+scilab (5.1.1-1) experimental; urgency=low
+
+  [ Christoph Korn ]
+  * New upstream version.
+    (patches 64bitsdetection.diff filesWithSpace.diff javaHeadLess.diff 
+    displayStack.diff xmlCleanupParser.diff removed. Applied upstream)
+
+  [ Sylvestre Ledru ]
+  * Add a patch to manage powerpc detection of the JVM (jvm-powerpc.diff)
+  * Add a patch to use only fpu_control under Linux & x86 (fpu_control.diff)
+
+ -- Sylvestre Ledru <sylvestre.ledru at inria.fr>  Sun, 19 Apr 2009 16:42:49 +0200
+
+scilab (5.1-2) experimental; urgency=low
+
+  [ Sylvestre Ledru ]
+  * Package scilab-include added (was missing in the previous version)
+  * sivp added in the recommanded packages (Closes: #505203)
+  * Replaces: scilab (< 5.0) added in scilab-bin (caused issue in the 4.X
+   => 5.X upgrade)
+  * Patch xmlCleanupParser.diff added (fix some problems with the latest 
+    version of libxml... which is not yet present in Debian).
+  * Add a lintian override for some visual project files
+  * Copyright update about javasci's examples (public domain now)
+  * Missing deps on docbook-xsl for scilab-doc
+	
+  [ Christoph Korn ]
+  * debian/patches/filesWithSpace.diff: Removes a space in two filenames.
+  * debian/rules: Remove empty translation files (Closes LP: #272264)
+
+ -- Sylvestre Ledru <sylvestre.ledru at inria.fr>  Tue, 24 Feb 2009 11:38:38 +0100
+
+scilab (5.1-1) experimental; urgency=low
+
+  * New upstream release
+  * Some patches removed (included upstream)
+  * Better watch file
+  * Missing dep to pkg-config
+  * Patch javaHeadLess.diff added (build Scilab into a chroot)
+  * Patch 64bitsdetection.diff added (better detection of a 64 bits CPU)
+
+  [ Christoph Korn ]
+  * ${misc:Depends} added to make lintian happy
+  * deleted debian/patches/series because quilt is not used as patch system
+  * Dropped g++ build dependency to make lintian happy.
+  * debian/control: Changed the unique package descriptions to
+    make lintian happy.
+
+ -- Sylvestre Ledru <sylvestre.ledru at inria.fr>  Fri, 13 Feb 2009 09:44:31 +0100
+
+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 
+    documentation without the french localization installed on the 
+    system
+
+ -- Sylvestre Ledru <sylvestre.ledru at inria.fr>  Wed, 28 Jan 2009 14:02:06 +0100
+
+scilab (5.0.3-4) experimental; urgency=low
+
+  * scilab.desktop wasn't install (thanks again to Christoph Korn) and 
+    and the categories were wrong
+
+ -- Sylvestre Ledru <sylvestre.ledru at inria.fr>  Wed, 07 Jan 2009 12:57:24 +0100
+
+scilab (5.0.3-3) experimental; urgency=low
+
+  * Missing dep to ant & docbook-xsl
+  * Information about the LGPL added in the copyright file
+  * Force a minimal version of jeuclid
+  * Install the icon
+  * Fix a problem in the scilab.desktop file (thanks to Christoph Korn)
+  * Icons added to the menu item
+
+ -- Sylvestre Ledru <sylvestre.ledru at inria.fr>  Tue, 30 Dec 2008 09:38:59 +0100
+
+scilab (5.0.3-2) experimental; urgency=medium
+
+  * Warnings removed on startup
+  * Tests moved to scilab-test package
+
+ -- Sylvestre Ledru <sylvestre.ledru at inria.fr>  Sat, 22 Nov 2008 10:28:30 +0100
+
+scilab (5.0.3-1) experimental; urgency=medium
+
+  * New upstream version (Closes: #483682, #499565, #486876)
+    Massive changes in the package construction
+  * Package moved to main since Scilab is free (CeCILL license)
+  * modelicac, intersci and scilab manpages added
+
+ -- Sylvestre Ledru <sylvestre.ledru at inria.fr>  Fri, 1 Oct 2008 13:37:08 +0200
+
+scilab (4.1.2-6) unstable; urgency=low
+
+  * Debian-science added as maintainer
+  * SVN moved to debian-science repository
+  * Standards-Version updated to 3.8.0
+  * Fix a security issue reported by Dmitry E. Oboukhov. (Closes: #496414)
+
+ -- Sylvestre Ledru <sylvestre.ledru at inria.fr>  Wed, 10 Sep 2008 13:35:28 +0200
+
+>>>>>>> .fusion-droit.r35957
 scilab (4.1.2-5) unstable; urgency=low
 
   * Add DM-Upload-Allowed: yes to enable uploads for Sylvestre.

Modified: packages/scilab/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/trunk/debian/control?rev=36094&op=diff
==============================================================================
--- packages/scilab/trunk/debian/control (original)
+++ packages/scilab/trunk/debian/control Mon Jan 18 22:00:59 2010
@@ -18,8 +18,11 @@
  libxml-commons-external-java,
 # Optional Scilab features
  pvm-dev, fftw3-dev | libfftw3-dev, libsuitesparse-dev (>= 3.4.0), 
- libmatio-dev
-# libxml2-utils, 
+ libmatio-dev,
+# latex rendering
+ libjlatexmath-java (>= 0.8), 
+# Xcos
+ libjgraphx-java, libhdf5-serial-dev, libjhdf5-java
 Standards-Version: 3.8.3
 Homepage: http://www.scilab.org
 Vcs-Svn: svn://svn.debian.org/svn/debian-science/packages/scilab/trunk/
@@ -73,8 +76,10 @@
 Architecture: any
 Depends: ${shlibs:Depends}, scilab-data (= ${source:Version}),
  openjdk-6-jre | sun-java6-jre,
- libflexdock-java, libjogl-java (>= 1.1.1), libjrosetta-java (>= 1.0.1), 
- javahelp2, ${misc:Depends}
+ libflexdock-java, libjogl-java (>= 1.1.1), libjrosetta-java (>= 1.0.1),
+ libjlatexmath-java,  
+ javahelp2, ${misc:Depends},
+ libjgraphx-java, libjhdf5-java
 Recommends: pvm
 Replaces: scilab (< 5.0)
 Description: Scientific software package for numerical computations (binary files)
@@ -85,6 +90,19 @@
  control, signal processing, ...
  .
  This package contains the architecture specific binary files.
+
+#Package: scilab-xcos
+#Architecture: any
+#Depends: ${shlibs:Depends}, scilab-bin, ${misc:Depends}, libjgraphx-java, 
+# libjhdf5-java
+#Description: Scientific software package for numerical computations (binary files)
+# Scilab is a matrix-based scientific software package.
+# Scilab contains hundreds of built-in mathematical functions, rich
+# data structures (including polynomials, rationals,linear systems, lists,
+# etc...) and comes with a number of specific toolboxes for
+# control, signal processing, ...
+# .
+# This package contains the architecture specific binary files.
  
 Package: scilab-bin-dbg
 Architecture: any

Modified: packages/scilab/trunk/debian/patches/modelicac-not-available.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/trunk/debian/patches/modelicac-not-available.diff?rev=36094&op=diff
==============================================================================
--- packages/scilab/trunk/debian/patches/modelicac-not-available.diff (original)
+++ packages/scilab/trunk/debian/patches/modelicac-not-available.diff Mon Jan 18 22:00:59 2010
@@ -10,41 +10,6 @@
          ok = %f
        end
  
-diff -ur scilab-5.1.1.orig/modules/scicos/macros/scicos_scicos/compile_modelica.sci scilab-5.1.1/modules/scicos/macros/scicos_scicos/compile_modelica.sci
---- scilab-5.1.1.orig/modules/scicos/macros/scicos_scicos/compile_modelica.sci	2009-04-14 09:31:05.000000000 +0200
-+++ scilab-5.1.1/modules/scicos/macros/scicos_scicos/compile_modelica.sci	2009-04-30 11:28:37.000000000 +0200
-@@ -25,7 +25,7 @@
-   //++ Check that modelica compiler is available
-   //++ Otherwise, give some feedback and quit
-   if ~with_modelica_compiler() then
--    messagebox(sprintf(gettext("%s: Error: Modelica compiler (MODELICAC) is unavailable."), "compile_modelica"),"modal","error");
-+    messagebox(sprintf(gettext("%s: Error: Modelica compiler (MODELICAC) is unavailable.")+" This is probably due to the non support of ocamlopt on your architecture.", "compile_modelica"),"modal","error");
-     name = ''
-     ok = %f, nx = 0, nin = 0, nout = 0, ng = 0, nm = 0, nz = 0; return
-   end
-@@ -145,7 +145,7 @@
-                    MSG1; ..
-                    'Please read the error message in the Scilab window'; ..
-                    ' '; ..
--                   'Please install the Modelica translator (available at www.scicos.org) in ""SCI' + filesep() + 'bin"" and try again'],"modal","error");
-+                   'The modelica compiler is not available on this arch because of non-support of ocamlopt for this architecture'],"modal","error");
-         ok = %f, nx = 0, nin = 0, nout = 0, ng = 0, nm = 0, nz = 0; return
-       end // if_translator_exists
-     end // if_modelicac_fails_then_use_translator
-diff -ur scilab-5.1.1.orig/modules/scicos/macros/scicos_scicos/genmoc.sci scilab-5.1.1/modules/scicos/macros/scicos_scicos/genmoc.sci
---- scilab-5.1.1.orig/modules/scicos/macros/scicos_scicos/genmoc.sci	2009-04-14 09:31:05.000000000 +0200
-+++ scilab-5.1.1/modules/scicos/macros/scicos_scicos/genmoc.sci	2009-04-30 11:32:34.000000000 +0200
-@@ -29,7 +29,7 @@
-   //++ Check that modelica compiler is available
-   //++ Otherwise, give some feedback and quit
-   if ~with_modelica_compiler() then
--    error(sprintf(gettext("%s: Error: Modelica compiler (MODELICAC) is unavailable.\n"), "genmoc"))
-+    error(sprintf(gettext("%s: Error: Modelica compiler (MODELICAC) is unavailable.\n")+" This is probably due to the non support of ocamlopt on your architecture.", "genmoc"))
-     return
-   end
- 
-Seulement dans scilab-5.1.1/modules/scicos/macros/scicos_scicos: genmoc.sci.orig
-Seulement dans scilab-5.1.1/modules/scicos/macros/scicos_scicos: genmoc.sci.rej
 diff -ur scilab-5.1.1.orig/modules/scicos/macros/scicos_scicos/MODCOM.sci scilab-5.1.1/modules/scicos/macros/scicos_scicos/MODCOM.sci
 --- scilab-5.1.1.orig/modules/scicos/macros/scicos_scicos/MODCOM.sci	2009-04-14 09:31:05.000000000 +0200
 +++ scilab-5.1.1/modules/scicos/macros/scicos_scicos/MODCOM.sci	2009-04-30 11:28:37.000000000 +0200
@@ -57,3 +22,15 @@
          ok = %f
          break
        end
+diff -ur scilab-5.1.1.orig/modules/scicos/macros/scicos_scicos/genmoc.sci scilab-5.1.1/modules/scicos/macros/scicos_scicos/genmoc.sci
+--- scilab-5.1.1.orig/modules/scicos/macros/scicos_scicos/genmoc.sci	2009-11-09 15:53:03.000000000 +0100
++++ scilab-5.1.1/modules/scicos/macros/scicos_scicos/genmoc.sci	2009-11-09 15:53:37.000000000 +0100
+@@ -29,7 +29,7 @@
+   //++ Check that modelica compiler is available
+   //++ Otherwise, give some feedback and quit
+   if ~with_modelica_compiler() then
+-    error(sprintf(gettext("%s: Error: Modelica compiler (MODELICAC) is unavailable."), "genmoc"))
++	error(sprintf(gettext("%s: Error: Modelica compiler (MODELICAC) is unavailable.\n")+" This is probably due to the non support of ocamlopt on your architecture.", "genmoc"))
+     return
+   end
+ 

Modified: packages/scilab/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/trunk/debian/rules?rev=36094&op=diff
==============================================================================
--- packages/scilab/trunk/debian/rules (original)
+++ packages/scilab/trunk/debian/rules Mon Jan 18 22:00:59 2010
@@ -17,7 +17,6 @@
 
 LD_LIBRARY_PATH = $(JAVA_HOME)/jre/lib/$(archdir)/:/usr/lib/libfakeroot/:$(JAVA_HOME)/jre/lib/$(archdir)/server:$(JAVA_HOME)/jre/lib/$(archdir)/native_threads/:$(DEB_DESTDIR)/usr/lib/scilab/
 
-DEB_CONFIGURE_SCRIPT_ENV += PVM_ROOT=/usr/lib/pvm3/
 DEB_CONFIGURE_NORMAL_ARGS += --prefix=$(DEB_CONFIGURE_PREFIX) \
 	--with-pvm --with-fftw --enable-relocatable \
 	--with-umfpack --enable-build-localization \




More information about the debian-science-commits mailing list