r46626 - in /packages/scilab/branches/5.5/debian: changelog patches/link-issue.diff

Thu Apr 10 16:18:08 UTC 2014

Author: sylvestre
Date: Thu Apr 10 16:18:08 2014
New Revision: 46626

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=46626
Log:
Fix the build under Ubuntu. Thanks to Clement David for the patch

Modified:
    packages/scilab/branches/5.5/debian/changelog
    packages/scilab/branches/5.5/debian/patches/link-issue.diff

Modified: packages/scilab/branches/5.5/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/branches/5.5/debian/changelog?rev=46626&op=diff
==============================================================================

--- packages/scilab/branches/5.5/debian/changelog	(original)
+++ packages/scilab/branches/5.5/debian/changelog	Thu Apr 10 16:18:08 2014
@@ -1,3 +1,9 @@
+scilab (5.5.0~beta-1+git~20140406-1522-3) unstable; urgency=medium
+
+  * Fix the build under Ubuntu. Thanks to Clement David for the patch
+
+ -- Sylvestre Ledru <sylvestre at debian.org>  Thu, 10 Apr 2014 18:16:33 +0200
+
 scilab (5.5.0~beta-1+git~20140406-1522-2) unstable; urgency=medium
 
   [ Matthias Klose ]

Modified: 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=46626&op=diff
==============================================================================
--- packages/scilab/branches/5.5/debian/patches/link-issue.diff	(original)
+++ packages/scilab/branches/5.5/debian/patches/link-issue.diff	Thu Apr 10 16:18:08 2014
@@ -1,13 +1,75 @@
-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 \
+diff --git scilab.org/Makefile.am scilab/Makefile.am
+index f9b0945..e75b061 100644
+--- scilab.org/Makefile.am
++++ scilab/Makefile.am
+@@ -79,6 +79,8 @@ endif
+ 
+ scilab_cli_bin_LDADD 	= \
  			$(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 \
++                        $(top_builddir)/modules/commons/libscicommons.la \
+ 			$(top_builddir)/modules/console/libsciconsole-minimal.la \
+ 			$(top_builddir)/modules/jvm/libscijvm-disable.la \
  			$(OPENMPI_LIBS) $(XML_LIBS) \
- 			$(COMMON_LIBS) $(FLIBS)
+diff --git scilab.org/Makefile.in scilab/Makefile.in
+index 83a0eb6..f7277e6 100644
+--- scilab.org/Makefile.in
++++ scilab/Makefile.in
+@@ -286,6 +286,8 @@ am_scilab_cli_bin_OBJECTS =  \
+ scilab_cli_bin_OBJECTS = $(am_scilab_cli_bin_OBJECTS)
+ scilab_cli_bin_DEPENDENCIES =  \
+ 	$(top_builddir)/modules/libscilab-cli.la \
++	$(top_builddir)/modules/console/libsciconsole.la \
++	$(top_builddir)/modules/commons/libscicommons.la \
+ 	$(top_builddir)/modules/console/libsciconsole-minimal.la \
+ 	$(top_builddir)/modules/jvm/libscijvm-disable.la \
+ 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+@@ -825,6 +827,8 @@ scilab_bin_LDADD = $(top_builddir)/modules/libscilab.la \
+ 	$(OPENMPI_LIBS) $(XML_LIBS) $(COMMON_LIBS) $(FLIBS) \
+ 	$(am__append_3) $(am__append_10)
+ scilab_cli_bin_LDADD = $(top_builddir)/modules/libscilab-cli.la \
++	$(top_builddir)/modules/console/libsciconsole.la \
++	$(top_builddir)/modules/commons/libscicommons.la \
+ 	$(top_builddir)/modules/console/libsciconsole-minimal.la \
+ 	$(top_builddir)/modules/jvm/libscijvm-disable.la \
+ 	$(OPENMPI_LIBS) $(XML_LIBS) $(COMMON_LIBS) $(FLIBS) \
+diff --git scilab.org/modules/Makefile.am scilab/modules/Makefile.am
+index b3da5f2..6a4e061 100644
+--- scilab.org/modules/Makefile.am
++++ scilab/modules/Makefile.am
+@@ -59,8 +59,8 @@ jvm \
+ action_binding \
+ graphic_objects \
+ renderer \
+-graphic_export \
+ gui \
++graphic_export \
+ graphics \
+ optimization \
+ symbolic \
+diff --git scilab.org/modules/Makefile.in scilab/modules/Makefile.in
+index 4501dd3..c4ef23b 100644
+--- scilab.org/modules/Makefile.in
++++ scilab/modules/Makefile.in
+@@ -268,8 +268,8 @@ DIST_SUBDIRS = prebuildjava fileio mexlib functions parameters boolean \
+ 	localization polynomials special_functions time windows_tools \
+ 	sparse completion history_manager output_stream string hdf5 \
+ 	fftw statistics dynamic_link console arnoldi spreadsheet \
+-	tclsci commons jvm action_binding graphic_objects renderer \
+-	graphic_export gui graphics optimization symbolic randlib \
++	tclsci commons jvm action_binding graphic_objects renderer gui \
++	graphic_export graphics optimization symbolic randlib \
+ 	interpolation sound overloading m2sci development_tools \
+ 	compatibility_functions helptools umfpack demo_tools \
+ 	genetic_algorithms simulated_annealing matio atoms graph xcos \
+@@ -585,8 +585,8 @@ SUBDIRS = prebuildjava fileio mexlib functions parameters boolean \
+ 	localization polynomials special_functions time windows_tools \
+ 	sparse completion history_manager output_stream string hdf5 \
+ 	fftw statistics dynamic_link console arnoldi spreadsheet \
+-	tclsci commons jvm action_binding graphic_objects renderer \
+-	graphic_export gui graphics optimization symbolic randlib \
++	tclsci commons jvm action_binding graphic_objects renderer gui \
++	graphic_export graphics optimization symbolic randlib \
+ 	interpolation sound overloading m2sci development_tools \
+ 	compatibility_functions helptools umfpack demo_tools \
+ 	genetic_algorithms simulated_annealing matio atoms hdf5 graph \


