r37040 - in /packages/scilab/branches/5.3/debian: ./ patches/

sylvestre at users.alioth.debian.org sylvestre at users.alioth.debian.org
Thu Nov 25 00:29:22 UTC 2010 

Author: sylvestre
Date: Thu Nov 25 00:29:20 2010
New Revision: 37040

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=37040
Log:
merge with the current trunk

Added:
    packages/scilab/branches/5.3/debian/patches/addchapter.diff
      - copied unchanged from r37039, packages/scilab/trunk/debian/patches/addchapter.diff
    packages/scilab/branches/5.3/debian/patches/basename.diff
      - copied unchanged from r37039, packages/scilab/trunk/debian/patches/basename.diff
    packages/scilab/branches/5.3/debian/patches/ia64jvm.diff
      - copied unchanged from r37039, packages/scilab/trunk/debian/patches/ia64jvm.diff
    packages/scilab/branches/5.3/debian/patches/increaseJavaHeap.diff
      - copied unchanged from r37039, packages/scilab/trunk/debian/patches/increaseJavaHeap.diff
    packages/scilab/branches/5.3/debian/patches/jhdf2.6.diff
      - copied unchanged from r37039, packages/scilab/trunk/debian/patches/jhdf2.6.diff
    packages/scilab/branches/5.3/debian/patches/sparcstartup.diff
      - copied unchanged from r37039, packages/scilab/trunk/debian/patches/sparcstartup.diff
    packages/scilab/branches/5.3/debian/patches/writable-string.diff
      - copied unchanged from r37039, packages/scilab/trunk/debian/patches/writable-string.diff
    packages/scilab/branches/5.3/debian/patches/xarmjavadetection.diff
      - copied unchanged from r37039, packages/scilab/trunk/debian/patches/xarmjavadetection.diff
Removed:
    packages/scilab/branches/5.3/debian/patches/CVE-2010-3378.diff
Modified:
    packages/scilab/branches/5.3/debian/changelog
    packages/scilab/branches/5.3/debian/control
    packages/scilab/branches/5.3/debian/rules

Modified: packages/scilab/branches/5.3/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/branches/5.3/debian/changelog?rev=37040&op=diff
==============================================================================
--- packages/scilab/branches/5.3/debian/changelog (original)
+++ packages/scilab/branches/5.3/debian/changelog Thu Nov 25 00:29:20 2010
@@ -1,3 +1,9 @@
+scilab (5.3.0-beta-5-1) experimental; urgency=low
+
+  * New upstream release.
+
+ -- Sylvestre Ledru <sylvestre at debian.org>  Thu, 25 Nov 2010 01:26:20 +0100
+
 scilab (5.3.0-beta-4-3) experimental; urgency=low
 
   * Fix some lintian warnings
@@ -31,6 +37,15 @@
     test_run_permission.diff renesas-sh.diff applied upstream.
 
  -- Sylvestre Ledru <sylvestre at debian.org>  Sun, 12 Sep 2010 13:42:22 +0200
+
+scilab (5.2.2-9) unstable; urgency=low
+
+  * Fix a problem in the ia64 startup. (Closes: #593684)
+  * Build the help file by increasing the amount of memory available to the JVM
+    (Closes: #599149)
+  * Fails the build when some key components are not built
+
+ -- Sylvestre Ledru <sylvestre at debian.org>  Tue, 05 Oct 2010 22:32:12 +0200
 
 scilab (5.2.2-8) unstable; urgency=high
 

Modified: packages/scilab/branches/5.3/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/branches/5.3/debian/control?rev=37040&op=diff
==============================================================================
--- packages/scilab/branches/5.3/debian/control (original)
+++ packages/scilab/branches/5.3/debian/control Thu Nov 25 00:29:20 2010
@@ -107,6 +107,7 @@
  All mandatory libraries for scilab-cli are shipped in this package.
  Please install the package "scilab" to have all features.
 
+<<<<<<< .working
 Package: scilab-full-bin
 Architecture: any
 Depends: ${shlibs:Depends}, scilab-minimal-bin (= ${binary:Version}),
@@ -205,6 +206,86 @@
  This package contains the Java library (version 2) used to call Scilab's engine
  from Java.
 
+=======
+Package: scilab-full-bin
+Architecture: any
+Depends: ${shlibs:Depends}, scilab-minimal-bin (= ${binary:Version}),
+ libflexdock-java, libjogl-java (>= 1.1.1), libjrosetta-java (>= 1.0.1),
+ libjlatexmath-java, libjeuclid-core-java, libbatik-java (>= 1.7), 
+ fop (>= 0.95), libsaxon-java, libavalon-framework-java, docbook-xsl,
+ javahelp2, libjgraphx-java (>= 1.2.0.8), libjhdf5-java (>= 2.6), 
+ ${misc:Depends}
+Recommends: pvm
+Replaces: scilab (<< 5.0), scilab-bin
+Description: Scientific software package for numerical computations (all 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-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-minimal-bin-dbg
+Architecture: any
+Section: debug
+Priority: extra
+Pre-Depends: ${dpkg:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, scilab-minimal-bin (>= ${source:Version})
+Suggests: scilab (>= ${source:Version})
+Description: Scientific software package (scilab-cli debugging symbols)
+ 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 debugging symbols.
+
+Package: scilab-full-bin-dbg
+Architecture: any
+Section: debug
+Priority: extra
+Pre-Depends: ${dpkg:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, scilab-full-bin (>= ${source:Version})
+Suggests: scilab (>= ${source:Version})
+Description: Scientific software package (scilab debugging symbols)
+ 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 debugging symbols.
+
+Package: libscilab-java
+Section: java
+Architecture: any
+Depends: ${shlibs:Depends}, scilab-full-bin (>= ${source:Version}), ${misc:Depends}
+Description: Scientific software package for numerical computations (Java API)
+ 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 Java library used to call Scilab's engine 
+ from Java.
+
+>>>>>>> .merge-right.r37039
 Package: scilab-doc
 Section: doc
 Depends: ${misc:Depends}
@@ -218,6 +299,7 @@
  .
  This package contains demos, examples and help pages.
 
+<<<<<<< .working
 Package: scilab-doc-fr
 Section: doc
 Architecture: all
@@ -260,3 +342,46 @@
  .
  See Scilab function 'test_run' for usage.
 
+=======
+Package: scilab-doc-fr
+Section: doc
+Architecture: all
+Depends: scilab-doc, ${misc:Depends}
+Description: Scientific software package (french documentation)
+ 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 help pages in French.
+
+Package: scilab-doc-pt-br
+Section: doc
+Architecture: all
+Depends: scilab-doc, ${misc:Depends}
+Description: Scientific software package (Brazilian Portuguese documentation)
+ 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 help pages in Brazilian Portuguese documentation.
+
+
+Package: scilab-test
+Architecture: all
+Depends: ${misc:Depends}
+Description: Scientific software package for numerical computations (test 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 test files (unitary, non regression, 
+ performance ...) for Scilab.
+ .
+ See Scilab function 'test_run' for usage.
+>>>>>>> .merge-right.r37039

Modified: packages/scilab/branches/5.3/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/branches/5.3/debian/rules?rev=37040&op=diff
==============================================================================
--- packages/scilab/branches/5.3/debian/rules (original)
+++ packages/scilab/branches/5.3/debian/rules Thu Nov 25 00:29:20 2010
@@ -47,6 +47,10 @@
 
 
 install/scilab-data::
+# Fails the build if some basic file does not exist
+	if test ! -f $(DEB_DESTDIR)usr/share/scilab/modules/core/macros/lib; then \
+		exit 1; \
+	fi
 # Remove empty directories
 	find $(DEB_DESTDIR)/usr/share/scilab -type d -empty -delete
 # Remove extra license files to make lintian happier
@@ -92,21 +96,21 @@
 			mv $$dir/help/pt_BR $(CURDIR)/debian/scilab-doc-pt-br/usr/share/scilab/modules/$$moduleName/help/; \
 		fi; \
 	done
+
+install/scilab-doc::
 	mkdir $(CURDIR)/debian/scilab-doc/usr/share/scilab/modules/helptools/jar/
+	EN_US_DOC=$(CURDIR)/debian/tmp/usr/share/scilab/modules/helptools/jar/scilab_en_US_help.jar; \
+	mv $$EN_US_DOC $(CURDIR)/debian/scilab-doc/usr/share/scilab/modules/helptools/jar/
+
+install/scilab-doc-fr::
 	mkdir $(CURDIR)/debian/scilab-doc-fr/usr/share/scilab/modules/helptools/jar/
+	FR_FR_DOC=$(CURDIR)/debian/tmp/usr/share/scilab/modules/helptools/jar/scilab_fr_FR_help.jar; \
+	mv $$FR_FR_DOC $(CURDIR)/debian/scilab-doc-fr/usr/share/scilab/modules/helptools/jar/
+
+install/scilab-doc-pt-br::
 	mkdir $(CURDIR)/debian/scilab-doc-pt-br/usr/share/scilab/modules/helptools/jar/
-	EN_US_DOC=$(CURDIR)/debian/tmp/usr/share/scilab/modules/helptools/jar/scilab_en_US_help.jar; \
-	if test -f $$EN_US_DOC; then \
-		mv $$EN_US_DOC $(CURDIR)/debian/scilab-doc/usr/share/scilab/modules/helptools/jar/; \
-	fi
-	FR_FR_DOC=$(CURDIR)/debian/tmp/usr/share/scilab/modules/helptools/jar/scilab_fr_FR_help.jar; \
-	if test -f $$FR_FR_DOC; then \
-		mv $$FR_FR_DOC $(CURDIR)/debian/scilab-doc-fr/usr/share/scilab/modules/helptools/jar/; \
-	fi
 	PT_BR_DOC=$(CURDIR)/debian/tmp/usr/share/scilab/modules/helptools/jar/scilab_pt_BR_help.jar; \
-	if test -f $$PT_BR_DOC; then \
-		mv $$PT_BR_DOC $(CURDIR)/debian/scilab-doc-pt-br/usr/share/scilab/modules/helptools/jar/; \
-	fi
+	mv $$PT_BR_DOC $(CURDIR)/debian/scilab-doc-pt-br/usr/share/scilab/modules/helptools/jar/
 
 binary-install/libscilab-java::
 # Move the javasci lib

More information about the debian-science-commits mailing list