r36130 - in /packages/scilab/trunk/debian: changelog control patches/buildDocPT_BR.diff patches/jgraphx-1.2.0.diff rules scilab-full-bin.install scilab-minimal-bin.install
sylvestre at users.alioth.debian.org
sylvestre at users.alioth.debian.org
Sun Feb 7 15:16:55 UTC 2010
Author: sylvestre
Date: Sun Feb 7 15:16:48 2010
New Revision: 36130
URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=36130
Log:
* Update of package descriptions
* Package scilab-doc-pt-br (Brazilian Portuguese) added
* circular dependency with scilab-minimal-bin on scilab-full-bin removed
by moving some libraries from a package to the other (Closes: #567194)
* Update of the jgraphx patch which was causing some issues with xcos
Thanks to Clement David for the fix.
* Standards-Version updated to version 3.8.4
Added:
packages/scilab/trunk/debian/patches/buildDocPT_BR.diff
Modified:
packages/scilab/trunk/debian/changelog
packages/scilab/trunk/debian/control
packages/scilab/trunk/debian/patches/jgraphx-1.2.0.diff
packages/scilab/trunk/debian/rules
packages/scilab/trunk/debian/scilab-full-bin.install
packages/scilab/trunk/debian/scilab-minimal-bin.install
Modified: packages/scilab/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/trunk/debian/changelog?rev=36130&op=diff
==============================================================================
--- packages/scilab/trunk/debian/changelog (original)
+++ packages/scilab/trunk/debian/changelog Sun Feb 7 15:16:48 2010
@@ -1,9 +1,14 @@
-scilab (5.2.0-5) UNRELEASED; urgency=low
+scilab (5.2.0-5) unstable; urgency=low
* Update of package descriptions
* Package scilab-doc-pt-br (Brazilian Portuguese) added
-
- -- Sylvestre Ledru <sylvestre at debian.org> Wed, 27 Jan 2010 16:01:42 +0100
+ * circular dependency with scilab-minimal-bin on scilab-full-bin removed
+ by moving some libraries from a package to the other (Closes: #567194)
+ * Update of the jgraphx patch which was causing some issues with xcos
+ Thanks to Clement David for the fix.
+ * Standards-Version updated to version 3.8.4
+
+ -- Sylvestre Ledru <sylvestre at debian.org> Thu, 04 Feb 2010 13:19:21 +0100
scilab (5.2.0-4) unstable; urgency=low
Modified: packages/scilab/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/trunk/debian/control?rev=36130&op=diff
==============================================================================
--- packages/scilab/trunk/debian/control (original)
+++ packages/scilab/trunk/debian/control Sun Feb 7 15:16:48 2010
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian Science Team <debian-science-maintainers at lists.alioth.debian.org>
Uploaders: Sylvestre Ledru <sylvestre at debian.org>, Aurélien GÉRÔME <ag at debian.org>
-Build-Depends: autoconf, cdbs, debhelper (>= 7), cdbs, gfortran,
+Build-Depends: autoconf, automake, cdbs, debhelper (>= 7), cdbs, gfortran,
default-jdk, chrpath, ocaml-nox,
tcl8.5-dev, tk8.5-dev, libxml2-dev, libpcre3-dev,
gettext, libreadline-dev, pkg-config,
@@ -23,7 +23,7 @@
libjlatexmath-java (>= 0.8),
# Xcos
libjgraphx-java (>= 1.2.0.7), libhdf5-serial-dev, libjhdf5-java (>= 2.6)
-Standards-Version: 3.8.3
+Standards-Version: 3.8.4
Homepage: http://www.scilab.org
Vcs-Svn: svn://svn.debian.org/svn/debian-science/packages/scilab/trunk/
Vcs-Browser: http://svn.debian.org/viewsvn/debian-science/packages/scilab/trunk/
@@ -141,7 +141,7 @@
Pre-Depends: ${dpkg:Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}, scilab-minimal-bin (>= ${source:Version})
Suggests: scilab (>= ${source:Version})
-Description: Scientific software package for numerical computations (debugging symbols)
+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,
@@ -157,7 +157,7 @@
Pre-Depends: ${dpkg:Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}, scilab-full-bin (>= ${source:Version})
Suggests: scilab (>= ${source:Version})
-Description: Scientific software package for numerical computations (debugging symbols)
+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,
@@ -233,3 +233,5 @@
.
This package contains the test files (unitary, non regression,
performance ...) for Scilab.
+ .
+ See Scilab function 'test_run' for usage.
Added: packages/scilab/trunk/debian/patches/buildDocPT_BR.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/trunk/debian/patches/buildDocPT_BR.diff?rev=36130&op=file
==============================================================================
--- packages/scilab/trunk/debian/patches/buildDocPT_BR.diff (added)
+++ packages/scilab/trunk/debian/patches/buildDocPT_BR.diff Sun Feb 7 15:16:48 2010
@@ -1,0 +1,14 @@
+Index: scilab-5.2.0/Makefile.am
+===================================================================
+--- scilab-5.2.0.orig/Makefile.am 2010-02-03 16:08:18.000000000 +0100
++++ scilab-5.2.0/Makefile.am 2010-02-03 16:09:33.000000000 +0100
+@@ -151,6 +151,9 @@
+ echo "-- Building documentation (French) --"; \
+ echo "SCI_DISABLE_TK=1 SCI_JAVA_ENABLE_HEADLESS=1 DOCBOOK_ROOT=$(DOCBOOK_ROOT) $(top_builddir)/bin/scilab-adv-cli -nb -nouserstartup -e \"xmltojar([],[],'fr_FR');exit;\""; \
+ SCI_DISABLE_TK=1 SCI_JAVA_ENABLE_HEADLESS=1 DOCBOOK_ROOT=$(DOCBOOK_ROOT) $(top_builddir)/bin/scilab-adv-cli -nb -nouserstartup -e "xmltojar([],[],'fr_FR');exit;"; \
++ echo "-- Building documentation (portugues do Brasil) --"; \
++ echo "SCI_DISABLE_TK=1 SCI_JAVA_ENABLE_HEADLESS=1 DOCBOOK_ROOT=$(DOCBOOK_ROOT) $(top_builddir)/bin/scilab-adv-cli -nb -nouserstartup -e \"xmltojar([],[],'pt_BR');exit;\""; \
++ SCI_DISABLE_TK=1 SCI_JAVA_ENABLE_HEADLESS=1 DOCBOOK_ROOT=$(DOCBOOK_ROOT) $(top_builddir)/bin/scilab-adv-cli -nb -nouserstartup -e "xmltojar([],[],'pt_BR');exit;"; \
+ else \
+ echo "Cannot find Scilab-adv-cli binary"; \
+ fi
Modified: packages/scilab/trunk/debian/patches/jgraphx-1.2.0.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/trunk/debian/patches/jgraphx-1.2.0.diff?rev=36130&op=diff
==============================================================================
--- packages/scilab/trunk/debian/patches/jgraphx-1.2.0.diff (original)
+++ packages/scilab/trunk/debian/patches/jgraphx-1.2.0.diff Sun Feb 7 15:16:48 2010
@@ -238,7 +238,7 @@
private class ModelTracker implements mxIEventListener {
public void invoke(Object source, mxEventObject evt) {
- List<mxUndoableChange> changes = (List<mxUndoableChange>) evt.getArgAt(0);
-+ List<mxUndoableChange> changes = (List<mxUndoableChange>) evt.getProperty("edit");
++ List<mxUndoableChange> changes = (List<mxUndoableChange>) evt.getProperty("changes");
List<Object> objects = new ArrayList<Object>();
getModel().beginUpdate();
for (int i = 0; i < changes.size(); ++i) {
Modified: packages/scilab/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/trunk/debian/rules?rev=36130&op=diff
==============================================================================
--- packages/scilab/trunk/debian/rules (original)
+++ packages/scilab/trunk/debian/rules Sun Feb 7 15:16:48 2010
@@ -3,8 +3,6 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/autotools.mk
include /usr/share/cdbs/1/rules/simple-patchsys.mk
-
-DEB_AUTO_UPDATE_AUTOCONF=yes
# Detect the arch (with the naming of Sun)
DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
@@ -39,9 +37,12 @@
docdir=$(DEB_DESTDIR)/usr/share/doc/
DEB_DH_MAKESHLIBS_ARGS_scilab-full-bin = -n
-DEB_DH_MAKESHLIBS_ARGS_scilab-minimal-bin = -n
+DEB_DH_MAKESHLIBS_ARGS_scilab-minimal-bin = -n
#DEB_MAKE_CHECK_TARGET = check
+
+debian/stamp-autotools-files:
+ autoreconf
install/scilab-data::
@@ -85,9 +86,14 @@
mkdir -p $(CURDIR)/debian/scilab-doc-fr/usr/share/scilab/modules/$$moduleName/help; \
mv $$dir/help/fr_FR $(CURDIR)/debian/scilab-doc-fr/usr/share/scilab/modules/$$moduleName/help/; \
fi; \
+ if test -d $$dir/help/pt_BR; then \
+ mkdir -p $(CURDIR)/debian/scilab-doc-pt-br/usr/share/scilab/modules/$$moduleName/help; \
+ mv $$dir/help/pt_BR $(CURDIR)/debian/scilab-doc-pt-br/usr/share/scilab/modules/$$moduleName/help/; \
+ fi; \
done
mkdir $(CURDIR)/debian/scilab-doc/usr/share/scilab/modules/helptools/jar/
mkdir $(CURDIR)/debian/scilab-doc-fr/usr/share/scilab/modules/helptools/jar/
+ 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/; \
Modified: packages/scilab/trunk/debian/scilab-full-bin.install
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/trunk/debian/scilab-full-bin.install?rev=36130&op=diff
==============================================================================
--- packages/scilab/trunk/debian/scilab-full-bin.install (original)
+++ packages/scilab/trunk/debian/scilab-full-bin.install Sun Feb 7 15:16:48 2010
@@ -8,4 +8,6 @@
debian/tmp/usr/lib/scilab/libscirenderer.*
debian/tmp/usr/lib/scilab/libscixcos.*
debian/tmp/usr/lib/scilab/libscixpad.*
-
+debian/tmp/usr/lib/scilab/libsciscicos_blocks.*
+debian/tmp/usr/lib/scilab/libsciscicos.*
+debian/tmp/usr/lib/scilab/libscihelptools.*
Modified: packages/scilab/trunk/debian/scilab-minimal-bin.install
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/trunk/debian/scilab-minimal-bin.install?rev=36130&op=diff
==============================================================================
--- packages/scilab/trunk/debian/scilab-minimal-bin.install (original)
+++ packages/scilab/trunk/debian/scilab-minimal-bin.install Sun Feb 7 15:16:48 2010
@@ -26,7 +26,6 @@
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/libscihelptools.*
debian/tmp/usr/lib/scilab/libscihistory_manager.*
debian/tmp/usr/lib/scilab/libsciinteger.*
debian/tmp/usr/lib/scilab/libsciinterpolation.*
@@ -45,8 +44,6 @@
debian/tmp/usr/lib/scilab/libscipvm.*
debian/tmp/usr/lib/scilab/libscirandlib.*
debian/tmp/usr/lib/scilab/libscirenderer-disable.*
-debian/tmp/usr/lib/scilab/libsciscicos_blocks.*
-debian/tmp/usr/lib/scilab/libsciscicos.*
debian/tmp/usr/lib/scilab/libscishell.*
debian/tmp/usr/lib/scilab/libscisignal_processing.*
debian/tmp/usr/lib/scilab/libscisound.*
More information about the debian-science-commits
mailing list