r46620 - in /packages/scilab/branches/5.5/debian: changelog patches/add-lib-dependencies.diff patches/disable-no-as-needed.diff patches/fix-binary-linking.diff patches/fix-lib-linking.diff patches/jh.diff patches/link-issue.diff patches/series rules

[sylvestre at users.alioth.debian.org]

Author: sylvestre
Date: Mon Apr  7 17:56:21 2014
New Revision: 46620

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=46620
Log:
* New snapshot release
* jh.diff: Fix an issue in the construction of the doc
* link-issue.diff: Fix a start up segfault (LP: #1299686)

Added:
    packages/scilab/branches/5.5/debian/patches/jh.diff
    packages/scilab/branches/5.5/debian/patches/link-issue.diff
Removed:
    packages/scilab/branches/5.5/debian/patches/add-lib-dependencies.diff
    packages/scilab/branches/5.5/debian/patches/disable-no-as-needed.diff
    packages/scilab/branches/5.5/debian/patches/fix-binary-linking.diff
    packages/scilab/branches/5.5/debian/patches/fix-lib-linking.diff
Modified:
    packages/scilab/branches/5.5/debian/changelog
    packages/scilab/branches/5.5/debian/patches/series
    packages/scilab/branches/5.5/debian/rules

Modified: packages/scilab/branches/5.5/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/branches/5.5/debian/changelog?rev=46620&op=diff
==============================================================================
--- packages/scilab/branches/5.5/debian/changelog	(original)
+++ packages/scilab/branches/5.5/debian/changelog	Mon Apr  7 17:56:21 2014
@@ -1,3 +1,11 @@
+scilab (5.5.0~beta-1+git~20140406-1522-1) unstable; urgency=medium
+
+  * New snapshot release
+  * jh.diff: Fix an issue in the construction of the doc
+  * link-issue.diff: Fix a start up segfault (LP: #1299686)
+
+ -- Sylvestre Ledru <sylvestre at debian.org>  Sun, 06 Apr 2014 15:26:17 +0200
+
 scilab (5.5.0~beta-1+git~20140327-1135-1) unstable; urgency=medium
 
   * New snapshot release

Added: packages/scilab/branches/5.5/debian/patches/jh.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/branches/5.5/debian/patches/jh.diff?rev=46620&op=file
==============================================================================
--- packages/scilab/branches/5.5/debian/patches/jh.diff	(added)
+++ packages/scilab/branches/5.5/debian/patches/jh.diff	Mon Apr  7 17:56:21 2014
@@ -0,0 +1,13 @@
+Index: scilab-5.5.0~beta-1+git~20140426-1522/modules/helptools/src/java/org/scilab/modules/helptools/JarOnlyConverter.java
+===================================================================
+--- scilab-5.5.0~beta-1+git~20140426-1522.orig/modules/helptools/src/java/org/scilab/modules/helptools/JarOnlyConverter.java	2014-04-06 15:21:55.000000000 +0200
++++ scilab-5.5.0~beta-1+git~20140426-1522/modules/helptools/src/java/org/scilab/modules/helptools/JarOnlyConverter.java	2014-04-07 12:06:26.074817658 +0200
+@@ -74,7 +74,7 @@
+             directory.mkdirs();
+             String jhs = new File(outputJavaHelp).getAbsolutePath();
+ 
+-            String[] args = new String[] {"-db", jhs, "-nostopwords", "."};
++            String[] args = new String[] {"-nostopwords", "."};
+ 
+             indexer.compile(args);
+         } catch (Exception e) {

Added: packages/scilab/branches/5.5/debian/patches/link-issue.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/branches/5.5/debian/patches/link-issue.diff?rev=46620&op=file
==============================================================================
--- packages/scilab/branches/5.5/debian/patches/link-issue.diff	(added)
+++ packages/scilab/branches/5.5/debian/patches/link-issue.diff	Mon Apr  7 17:56:21 2014
@@ -0,0 +1,13 @@
+Index: scilab-5.5.0~beta-1+git~20140406-1522/Makefile.am
+===================================================================
+--- scilab-5.5.0~beta-1+git~20140406-1522.orig/Makefile.am	2014-04-06 15:21:55.000000000 +0200
++++ scilab-5.5.0~beta-1+git~20140406-1522/Makefile.am	2014-04-07 15:53:14.348300281 +0200
+@@ -68,7 +68,8 @@
+ scilab_bin_LDADD 	= \
+ 			$(top_builddir)/modules/libscilab.la \
+ 			$(top_builddir)/modules/libscilab-cli.la \
+-			$(top_builddir)/modules/console/libsciconsole-minimal.la \
++                        $(top_builddir)/modules/console/libsciconsole.la \
++                        $(top_builddir)/modules/console/libsciconsole-minimal.la \
+ 			$(OPENMPI_LIBS) $(XML_LIBS) \
+ 			$(COMMON_LIBS) $(FLIBS)

Modified: packages/scilab/branches/5.5/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/branches/5.5/debian/patches/series?rev=46620&op=diff
==============================================================================
--- packages/scilab/branches/5.5/debian/patches/series	(original)
+++ packages/scilab/branches/5.5/debian/patches/series	Mon Apr  7 17:56:21 2014
@@ -2,10 +2,5 @@
 librarypath.diff
 missingaddchapter.diff
 disable-xcos-dep-check.diff
-fix-binary-linking.diff
-fix-lib-linking.diff
-
-# these following two patches don't work yet ...
-# build order needs sorting out
-add-lib-dependencies.diff
-#disable-no-as-needed.diff
+jh.diff
+link-issue.diff

Modified: packages/scilab/branches/5.5/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/branches/5.5/debian/rules?rev=46620&op=diff
==============================================================================
--- packages/scilab/branches/5.5/debian/rules	(original)
+++ packages/scilab/branches/5.5/debian/rules	Mon Apr  7 17:56:21 2014
@@ -15,7 +15,7 @@
 JAVA_HOME            := /usr/lib/jvm/default-java
 
 DEB_CONFIGURE_NORMAL_ARGS += --prefix=$(DEB_CONFIGURE_PREFIX) \
-	--with-fftw --enable-relocatable \
+	--with-fftw \
 	--with-umfpack --enable-build-localization \
 	--with-install-help-xml --enable-build-help \
 	--with-tcl-library=/usr/lib/$(DEB_HOST_MULTIARCH) \