r44148 - in /packages/scilab/branches/snapshot: ./ debian/ debian/patches/
sylvestre at users.alioth.debian.org
sylvestre at users.alioth.debian.org
Tue Dec 13 15:31:37 UTC 2011
Author: sylvestre
Date: Tue Dec 13 15:31:37 2011
New Revision: 44148
URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=44148
Log:
+ * Snapshot release of Scilab 08/12/2011
+ Revision c6b9121a1fd975555e0680eeaea11b02f04d9b40
Added:
packages/scilab/branches/snapshot/
packages/scilab/branches/snapshot/debian/ (props changed)
- copied from r44024, packages/scilab/trunk/debian/
packages/scilab/branches/snapshot/debian/changelog
- copied, changed from r44026, packages/scilab/trunk/debian/changelog
packages/scilab/branches/snapshot/debian/control
- copied, changed from r44026, packages/scilab/trunk/debian/control
packages/scilab/branches/snapshot/debian/rules
- copied, changed from r44025, packages/scilab/trunk/debian/rules
Modified:
packages/scilab/branches/snapshot/debian/patches/adddemo.diff
packages/scilab/branches/snapshot/debian/patches/librarypath.diff
packages/scilab/branches/snapshot/debian/patches/series
packages/scilab/branches/snapshot/debian/scilab-cli.menu
packages/scilab/branches/snapshot/debian/scilab-full-bin.install
packages/scilab/branches/snapshot/debian/scilab-minimal-bin.install
packages/scilab/branches/snapshot/debian/scilab.menu
Propchange: packages/scilab/branches/snapshot/debian/
------------------------------------------------------------------------------
MergeWithUpstream = 1
Propchange: packages/scilab/branches/snapshot/debian/
------------------------------------------------------------------------------
mergeWithUpstream = 1
Copied: packages/scilab/branches/snapshot/debian/changelog (from r44026, packages/scilab/trunk/debian/changelog)
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/branches/snapshot/debian/changelog?rev=44148&op=diff
==============================================================================
--- packages/scilab/trunk/debian/changelog (original)
+++ packages/scilab/branches/snapshot/debian/changelog Tue Dec 13 15:31:37 2011
@@ -1,3 +1,10 @@
+scilab (5.3.999~git20111208-1) experimental; urgency=low
+
+ * Snapshot release of Scilab 08/12/2011
+ Revision c6b9121a1fd975555e0680eeaea11b02f04d9b40
+
+ -- Sylvestre Ledru <sylvestre at debian.org> Thu, 08 Dec 2011 15:11:29 +0100
+
scilab (5.3.3-4) unstable; urgency=low
* Dependency fftw3-dev dropped (replaced by libfftw3-dev)
Copied: packages/scilab/branches/snapshot/debian/control (from r44026, packages/scilab/trunk/debian/control)
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/branches/snapshot/debian/control?rev=44148&op=diff
==============================================================================
--- packages/scilab/trunk/debian/control (original)
+++ packages/scilab/branches/snapshot/debian/control Tue Dec 13 15:31:37 2011
@@ -4,7 +4,7 @@
Maintainer: Debian Science Team <debian-science-maintainers at lists.alioth.debian.org>
Uploaders: Sylvestre Ledru <sylvestre at debian.org>
Build-Depends: autoconf, automake, cdbs, debhelper (>= 7), gfortran,
- default-jdk, chrpath, ocaml-nox (>= 3.11.2-3),
+ default-jdk, chrpath, ocaml-nox (>= 3.11.2-3), fakeroot,
tcl8.5-dev, tk8.5-dev, libxml2-dev, libpcre3-dev,
gettext, libreadline-dev, pkg-config, procps,
# numerical libraries
@@ -23,7 +23,7 @@
# latex rendering
libjlatexmath-java (>= 0.9.4), libjlatexmath-fop-java (>= 0.9.4),
# Xcos
- libjgraphx-java (>= 1.4.1.0), libhdf5-serial-dev, libjhdf5-java (>= 2.6)
+ libjgraphx-java (>= 1.4.1.0), libhdf5-dev, libjhdf5-java (>= 2.6)
Standards-Version: 3.9.2
Homepage: http://www.scilab.org
Vcs-Svn: svn://svn.debian.org/svn/debian-science/packages/scilab/trunk/
@@ -146,7 +146,7 @@
Depends: ${shlibs:Depends}, scilab-minimal-bin (= ${binary:Version}),
libflexdock-java (>= 0.5.2), libjogl-java (>= 1.1.1), libjrosetta-java (>= 1.0.1),
libjlatexmath-java (>= 0.9.4), libjlatexmath-fop-java (>= 0.9.4),
- libjeuclid-core-java, libbatik-java (>= 1.7), default-jre,
+ libjeuclid-core-java, libbatik-java (>= 1.7), default-jre, bwidget,
fop (>= 0.95), libsaxon-java, libavalon-framework-java, docbook-xsl,
javahelp2, libjgraphx-java (>= 1.2.0.8), libjhdf5-java (>= 2.6),
libskinlf-java, ${misc:Depends}
Modified: packages/scilab/branches/snapshot/debian/patches/adddemo.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/branches/snapshot/debian/patches/adddemo.diff?rev=44148&op=diff
==============================================================================
--- packages/scilab/branches/snapshot/debian/patches/adddemo.diff (original)
+++ packages/scilab/branches/snapshot/debian/patches/adddemo.diff Tue Dec 13 15:31:37 2011
@@ -1,23 +1,22 @@
-diff -Nur scilab-5.1.1.orig/modules/core/macros/add_demo.sci scilab-5.1.1/modules/core/macros/add_demo.sci
---- scilab-5.1.1.orig/modules/core/macros/add_demo.sci 2009-04-14 09:30:44.000000000 +0200
-+++ scilab-5.1.1/modules/core/macros/add_demo.sci 2009-04-14 17:54:41.000000000 +0200
-@@ -17,9 +17,7 @@
-
- path=pathconvert(path,%f,%t);
-
-- if ~isfile(path) then
-- error(msprintf(gettext("%s: The file %s does not exist.\n"),"add_demo",path));
+Index: scilab-5.3.999~git20111208/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 @@
+ path = pathconvert(path, %f, %t);
+
+ if ~isfile(path) then
+- error(msprintf(gettext("%s: The file %s does not exist.\n"), "add_demo", path));
- end
-+ if ~isfile(path) then
-
- if isdir(path) then
- error(msprintf(gettext("%s: Wrong input argument #%d: Path to a scilab script file expected.\n"),"add_demo",2));
-@@ -33,7 +31,7 @@
- k1=find(demolist(k,2)==path)
- if k1==[] then demolist=[demolist;demotitle+" ("+string(size(k,"*"))+")",path],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/snapshot/debian/patches/librarypath.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/branches/snapshot/debian/patches/librarypath.diff?rev=44148&op=diff
==============================================================================
--- packages/scilab/branches/snapshot/debian/patches/librarypath.diff (original)
+++ packages/scilab/branches/snapshot/debian/patches/librarypath.diff Tue Dec 13 15:31:37 2011
@@ -26,65 +26,4 @@
# If the argument -a is not provided (extraarg) and we found unknown args
# fail and provide help
-diff -ur scilab-5.3.2.orig/bin//scilab-adv-cli scilab-5.3.2/bin//scilab-adv-cli
---- scilab-5.3.2.orig/bin//scilab-adv-cli 2011-05-11 17:42:11.000000000 +0200
-+++ scilab-5.3.2/bin//scilab-adv-cli 2011-05-12 14:21:44.000000000 +0200
-@@ -667,7 +667,7 @@
- }
-
- SCILIB=$SCI/bin:$SCI/lib/scilab/:$SCI/lib64/scilab/
--LD_LIBRARY_PATH=$SCILIB${LD_LIBRARY_PATH+:$LD_LIBRARY_PATH}
-+#LD_LIBRARY_PATH=$SCILIB${LD_LIBRARY_PATH+:$LD_LIBRARY_PATH}
-
- case $OS in
- *darwin* | *Darwin*) # MacOS X
-@@ -698,6 +698,7 @@
- *)
- esac
-
-+LD_LIBRARY_PATH=/usr/lib/scilab/:/usr/lib64/scilab/:$LD_LIBRARY_PATH
-
- if test $SCIVERBOSE -ne 0; then
- echo "LD_LIBRARY_PATH : $LD_LIBRARY_PATH"
-@@ -904,6 +905,7 @@
- esac
- done
-
-+LD_LIBRARY_PATH=/usr/lib/scilab/:/usr/lib64/scilab/:$LD_LIBRARY_PATH
-
- # If the argument -a is not provided (extraarg) and we found unknown args
- # fail and provide help
-Seulement dans scilab-5.3.2/bin/: scilab-adv-cli.orig
-Seulement dans scilab-5.3.2/bin/: scilab-adv-cli.rej
-diff -ur scilab-5.3.2.orig/bin//scilab-cli scilab-5.3.2/bin//scilab-cli
---- scilab-5.3.2.orig/bin//scilab-cli 2011-05-11 17:42:11.000000000 +0200
-+++ scilab-5.3.2/bin//scilab-cli 2011-05-12 14:21:44.000000000 +0200
-@@ -667,7 +667,7 @@
- }
-
- SCILIB=$SCI/bin:$SCI/lib/scilab/:$SCI/lib64/scilab/
--LD_LIBRARY_PATH=$SCILIB${LD_LIBRARY_PATH+:$LD_LIBRARY_PATH}
-+#LD_LIBRARY_PATH=$SCILIB${LD_LIBRARY_PATH+:$LD_LIBRARY_PATH}
-
- case $OS in
- *darwin* | *Darwin*) # MacOS X
-@@ -698,6 +698,7 @@
- *)
- esac
-
-+LD_LIBRARY_PATH=/usr/lib/scilab/:/usr/lib64/scilab/:$LD_LIBRARY_PATH
-
- if test $SCIVERBOSE -ne 0; then
- echo "LD_LIBRARY_PATH : $LD_LIBRARY_PATH"
-@@ -904,6 +905,7 @@
- esac
- done
-
-+LD_LIBRARY_PATH=/usr/lib/scilab/:/usr/lib64/scilab/:$LD_LIBRARY_PATH
-
- # If the argument -a is not provided (extraarg) and we found unknown args
- # fail and provide help
-Seulement dans scilab-5.3.2/bin/: scilab-cli.orig
-Seulement dans scilab-5.3.2/bin/: scilab-cli.rej
-Seulement dans scilab-5.3.2/bin/: scilab.orig
-Seulement dans scilab-5.3.2/bin/: scilab.rej
+
Modified: packages/scilab/branches/snapshot/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/branches/snapshot/debian/patches/series?rev=44148&op=diff
==============================================================================
--- packages/scilab/branches/snapshot/debian/patches/series (original)
+++ packages/scilab/branches/snapshot/debian/patches/series Tue Dec 13 15:31:37 2011
@@ -1,9 +1,6 @@
adddemo.diff
javalibpath.diff
librarypath.diff
-mips64.diff
missingaddchapter.diff
-modelicac-not-available.diff
-0001-Typo-in-the-scilab-adv-cli-desktop-declaration.patch
-
-default-java-path.diff
+#default-java-path.diff
+0001-Call_scilab-should-be-available-as-an-external-lib.patch
Copied: packages/scilab/branches/snapshot/debian/rules (from r44025, packages/scilab/trunk/debian/rules)
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/branches/snapshot/debian/rules?rev=44148&op=diff
==============================================================================
--- packages/scilab/trunk/debian/rules (original)
+++ packages/scilab/branches/snapshot/debian/rules Tue Dec 13 15:31:37 2011
@@ -12,7 +12,8 @@
JAVA_HOME := /usr/lib/jvm/default-java
-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/
+LD_LIBRARY_PATH = /usr/lib/libfakeroot/:$(JAVA_HOME)/jre/lib/$(archdir)/:$(JAVA_HOME)/jre/lib/$(archdir)/server:$(JAVA_HOME)/jre/lib/$(archdir)/native_threads/:$(DEB_DESTDIR)/usr/lib/scilab/
+
DEB_CONFIGURE_NORMAL_ARGS += --prefix=$(DEB_CONFIGURE_PREFIX) \
--with-pvm --with-fftw --enable-relocatable \
@@ -45,10 +46,10 @@
DEB_DH_SHLIBDEPS_ARGS_libscilab2-java = -Xusr/lib/jni/libjavasci2.so
#DEB_MAKE_CHECK_TARGET = check
-DEB_INSTALL_CHANGELOGS_ALL = CHANGES_5.3.X
+DEB_INSTALL_CHANGELOGS_ALL = CHANGES_5.3.X CHANGES_5.4.X
-debian/stamp-autotools-files:
- autoreconf
+#debian/stamp-autotools-files:
+# autoreconf
common-install-arch::
# Remove empty directories
@@ -66,7 +67,6 @@
# See debian/copyright for them
rm $(DEB_DESTDIR)usr/share/scilab/modules/*/license.txt
rm $(DEB_DESTDIR)usr/share/scilab/contrib/toolbox_skeleton/license.txt
- rm $(DEB_DESTDIR)usr/share/scilab/modules/tclsci/tcl/BWidget-*/LICENSE.txt
rm $(DEB_DESTDIR)usr/share/scilab/modules/tclsci/tcl/sciGUI/license.txt
rm $(DEB_DESTDIR)usr/share/scilab/modules/umfpack/TAUCS_license.txt $(DEB_DESTDIR)usr/share/scilab/modules/umfpack/UMFPACK_license.txt
@@ -175,12 +175,12 @@
install/scilab-cli::
# Move icons
mkdir -p $(CURDIR)/debian/scilab-cli/usr/share/scilab-cli/icons/
- cp -R debian/tmp/usr/share/scilab/icons/scilab.xpm $(CURDIR)/debian/scilab-cli/usr/share/scilab-cli/icons/
+ cp -R debian/tmp/usr/share/scilab/desktop/scilab.png $(CURDIR)/debian/scilab-cli/usr/share/scilab-cli/icons/
install/scilab::
# Move icons
mkdir -p $(CURDIR)/debian/scilab/usr/share/scilab/
- mv debian/tmp/usr/share/scilab/icons/ $(CURDIR)/debian/scilab/usr/share/scilab/
+ mv debian/tmp/usr/share/scilab/desktop/ $(CURDIR)/debian/scilab/usr/share/scilab/
clean::
# Remove empty translation files
@@ -193,5 +193,3 @@
pre-build::
sh debian/watcher.sh "$$PPID" "$(CURDIR)" "$(CURDIR)/build-stamp" 'scilab' &
- sed -i -e "s|Clément DAVID|Clement DAVID|g" $(find . -iname '*.java')
-
Modified: packages/scilab/branches/snapshot/debian/scilab-cli.menu
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/branches/snapshot/debian/scilab-cli.menu?rev=44148&op=diff
==============================================================================
--- packages/scilab/branches/snapshot/debian/scilab-cli.menu (original)
+++ packages/scilab/branches/snapshot/debian/scilab-cli.menu Tue Dec 13 15:31:37 2011
@@ -1,6 +1,6 @@
?package(scilab-cli):\
needs="text"\
section="Applications/Science/Mathematics"\
- icon="/usr/share/scilab-cli/icons/scilab.xpm" \
+ icon="/usr/share/scilab-cli/icons/scilab.png" \
title="Scilab"\
command="/usr/bin/scilab-cli"
Modified: packages/scilab/branches/snapshot/debian/scilab-full-bin.install
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/branches/snapshot/debian/scilab-full-bin.install?rev=44148&op=diff
==============================================================================
--- packages/scilab/branches/snapshot/debian/scilab-full-bin.install (original)
+++ packages/scilab/branches/snapshot/debian/scilab-full-bin.install Tue Dec 13 15:31:37 2011
@@ -2,7 +2,6 @@
debian/tmp/usr/lib/scilab/libscigraphic_export.*
debian/tmp/usr/lib/scilab/libscigraphics.*
debian/tmp/usr/lib/scilab/libscigui.*
-debian/tmp/usr/lib/scilab/libscihdf5-forceload.*
debian/tmp/usr/lib/scilab/libscijvm.*
debian/tmp/usr/lib/scilab/libscilab.*
debian/tmp/usr/lib/scilab/libscirenderer.*
@@ -14,3 +13,4 @@
debian/tmp/usr/lib/scilab/libsciaction_binding.*
debian/tmp/usr/lib/scilab/libscihistory_browser.*
debian/tmp/usr/lib/scilab/libsciui_data.*
+debian/tmp/usr/lib/scilab/libscixml.*
Modified: packages/scilab/branches/snapshot/debian/scilab-minimal-bin.install
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/branches/snapshot/debian/scilab-minimal-bin.install?rev=44148&op=diff
==============================================================================
--- packages/scilab/branches/snapshot/debian/scilab-minimal-bin.install (original)
+++ packages/scilab/branches/snapshot/debian/scilab-minimal-bin.install Tue Dec 13 15:31:37 2011
@@ -1,67 +1,39 @@
-debian/tmp/usr/lib/scilab/libmat.*
-debian/tmp/usr/lib/scilab/libmex.*
-debian/tmp/usr/lib/scilab/libmx.*
+# TODO regarder fftw
debian/tmp/usr/lib/scilab/libsciaction_binding-disable.*
-debian/tmp/usr/lib/scilab/libsciapi_scilab.*
debian/tmp/usr/lib/scilab/libsciarnoldi.*
-debian/tmp/usr/lib/scilab/libsciboolean.*
-debian/tmp/usr/lib/scilab/libscicacsd.*
debian/tmp/usr/lib/scilab/libscicall_scilab.*
debian/tmp/usr/lib/scilab/libscicompletion.*
debian/tmp/usr/lib/scilab/libsciconsole-disable.*
-debian/tmp/usr/lib/scilab/libscicore.*
-debian/tmp/usr/lib/scilab/libscidata_structures.*
-debian/tmp/usr/lib/scilab/libscidifferential_equations.*
-debian/tmp/usr/lib/scilab/libscidouble.*
debian/tmp/usr/lib/scilab/libscidoublylinkedlist.*
-debian/tmp/usr/lib/scilab/libscidynamiclibrary.*
-debian/tmp/usr/lib/scilab/libscidynamic_link.*
-debian/tmp/usr/lib/scilab/libscielementary_functions.*
-debian/tmp/usr/lib/scilab/libscifftw.*
-debian/tmp/usr/lib/scilab/libscifileio.*
debian/tmp/usr/lib/scilab/libscifunctions.*
debian/tmp/usr/lib/scilab/libscigraphic_export-disable.*
debian/tmp/usr/lib/scilab/libscigraphics-disable.*
debian/tmp/usr/lib/scilab/libscigui-disable.*
debian/tmp/usr/lib/scilab/libscihashtable.*
-debian/tmp/usr/lib/scilab/libscihdf5-forceload-disable.*
debian/tmp/usr/lib/scilab/libscihdf5.*
debian/tmp/usr/lib/scilab/libscihistory_manager.*
-debian/tmp/usr/lib/scilab/libsciinteger.*
debian/tmp/usr/lib/scilab/libsciinterpolation.*
-debian/tmp/usr/lib/scilab/libsciintersci.*
-debian/tmp/usr/lib/scilab/libsciio.*
debian/tmp/usr/lib/scilab/libscijvm-disable.*
debian/tmp/usr/lib/scilab/libscilab-cli.*
debian/tmp/usr/lib/scilab/libscilibst.*
-debian/tmp/usr/lib/scilab/libscilinear_algebra.*
debian/tmp/usr/lib/scilab/libscilocalization.*
debian/tmp/usr/lib/scilab/libscimalloc.*
debian/tmp/usr/lib/scilab/libscimatio.*
debian/tmp/usr/lib/scilab/libscioptimization.*
-debian/tmp/usr/lib/scilab/libscioutput_stream.*
-debian/tmp/usr/lib/scilab/libscipolynomials.*
-debian/tmp/usr/lib/scilab/libscipvm.*
debian/tmp/usr/lib/scilab/libscirandlib.*
-debian/tmp/usr/lib/scilab/libscishell.*
debian/tmp/usr/lib/scilab/libscisignal_processing.*
debian/tmp/usr/lib/scilab/libscisound.*
-debian/tmp/usr/lib/scilab/libscisparse.*
debian/tmp/usr/lib/scilab/libscispecial_functions.*
debian/tmp/usr/lib/scilab/libscispreadsheet.*
debian/tmp/usr/lib/scilab/libscistatistics.*
-debian/tmp/usr/lib/scilab/libscistring.*
debian/tmp/usr/lib/scilab/libscisundials.*
debian/tmp/usr/lib/scilab/libscisymbolic.*
debian/tmp/usr/lib/scilab/libscitclsci.*
-debian/tmp/usr/lib/scilab/libscitime.*
debian/tmp/usr/lib/scilab/libsciumfpack.*
-debian/tmp/usr/lib/scilab/libsciwindows_tools.*
debian/tmp/usr/lib/scilab/libscixcos-disable.*
debian/tmp/usr/lib/scilab/libsciscinotes-disable.*
debian/tmp/usr/lib/scilab/libscihistory_browser-disable.*
debian/tmp/usr/lib/scilab/libsciui_data-disable.*
-debian/tmp/usr/lib/scilab/libsciparameters.*
debian/tmp/usr/lib/scilab/libsciparallel.*
debian/tmp/usr/lib/scilab/libscicommons.*
debian/tmp/usr/lib/scilab/libscicommons-disable.*
Modified: packages/scilab/branches/snapshot/debian/scilab.menu
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/branches/snapshot/debian/scilab.menu?rev=44148&op=diff
==============================================================================
--- packages/scilab/branches/snapshot/debian/scilab.menu (original)
+++ packages/scilab/branches/snapshot/debian/scilab.menu Tue Dec 13 15:31:37 2011
@@ -1,13 +1,13 @@
?package(scilab):\
needs="x11"\
section="Applications/Science/Mathematics"\
- icon="/usr/share/scilab/icons/scilab.xpm" \
+ icon="/usr/share/scilab/icons/scilab.png" \
title="Scilab"\
command="/usr/bin/scilab"
?package(scilab):\
needs="text"\
section="Applications/Science/Mathematics"\
- icon="/usr/share/scilab/icons/scilab.xpm" \
+ icon="/usr/share/scilab/icons/scilab.png" \
title="Scilab"\
command="/usr/bin/scilab-adv-cli"
More information about the debian-science-commits
mailing list