r44192 - in /packages/scilab/branches/5.4/debian: changelog control rules scilab-cli.menu scilab.menu
sylvestre at users.alioth.debian.org
sylvestre at users.alioth.debian.org
Sat Dec 17 11:08:34 UTC 2011
Author: sylvestre
Date: Sat Dec 17 11:08:33 2011
New Revision: 44192
URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=44192
Log:
scilab (5.4.0-alpha-1-1~exp1) experimental; urgency=low
* New upstream release
Modified:
packages/scilab/branches/5.4/debian/changelog
packages/scilab/branches/5.4/debian/control
packages/scilab/branches/5.4/debian/rules
packages/scilab/branches/5.4/debian/scilab-cli.menu
packages/scilab/branches/5.4/debian/scilab.menu
Modified: packages/scilab/branches/5.4/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/branches/5.4/debian/changelog?rev=44192&op=diff
==============================================================================
--- packages/scilab/branches/5.4/debian/changelog (original)
+++ packages/scilab/branches/5.4/debian/changelog Sat Dec 17 11:08:33 2011
@@ -1,4 +1,4 @@
-scilab (5.4.0-alpha-1-1) experimental; urgency=low
+scilab (5.4.0-alpha-1-1~exp1) experimental; urgency=low
* New upstream release
Modified: packages/scilab/branches/5.4/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/branches/5.4/debian/control?rev=44192&op=diff
==============================================================================
--- packages/scilab/branches/5.4/debian/control (original)
+++ packages/scilab/branches/5.4/debian/control Sat Dec 17 11:08:33 2011
@@ -10,7 +10,7 @@
# numerical libraries
libblas-dev | librefblas3-dev | libatlas-base-dev, liblapack-dev,
# Java deps
- libflexdock-java (>= 0.5.2), libjogl-java (>= 1.1.1), libgl1-mesa-dev,
+ libflexdock-java (>= 1.0), libjogl-java (>= 1.1.1), libgl1-mesa-dev,
libjrosetta-java (>= 1.0.1), ant, libjgoodies-looks-java,
libskinlf-java,
# Documentation
@@ -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-dev, libjhdf5-java (>= 2.6)
+ libjgraphx-java (>= 1.8.0.0), libhdf5-dev (>= 1.8.8), libjhdf5-java (>= 2.8-beta-1), imagemagick
Standards-Version: 3.9.2
Homepage: http://www.scilab.org
Vcs-Svn: svn://svn.debian.org/svn/debian-science/packages/scilab/trunk/
@@ -144,11 +144,11 @@
Package: scilab-full-bin
Architecture: any
Depends: ${shlibs:Depends}, scilab-minimal-bin (= ${binary:Version}),
- libflexdock-java (>= 0.5.2), libjogl-java (>= 1.1.1), libjrosetta-java (>= 1.0.1),
+ libflexdock-java (>= 1.0), 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, bwidget,
fop (>= 0.95), libsaxon-java, libavalon-framework-java, docbook-xsl,
- javahelp2, libjgraphx-java (>= 1.2.0.8), libjhdf5-java (>= 2.6),
+ javahelp2, libjgraphx-java (>= 1.8.0.0), libjhdf5-java (>= 2.8-beta-1),
libskinlf-java, ${misc:Depends}
Recommends: pvm
Replaces: scilab (<< 5.0), scilab-bin, scilab-minimal-bin (<< 5.3)
Modified: packages/scilab/branches/5.4/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/branches/5.4/debian/rules?rev=44192&op=diff
==============================================================================
--- packages/scilab/branches/5.4/debian/rules (original)
+++ packages/scilab/branches/5.4/debian/rules Sat Dec 17 11:08:33 2011
@@ -11,9 +11,6 @@
$(filter $(DEB_HOST_ARCH)=%, $(archdir_map))))
JAVA_HOME := /usr/lib/jvm/default-java
-
-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 \
@@ -62,7 +59,6 @@
if test ! -f $(DEB_DESTDIR)usr/share/scilab/modules/core/macros/lib; then \
exit 1; \
fi
-
# Remove extra license files to make lintian happier
# See debian/copyright for them
rm $(DEB_DESTDIR)usr/share/scilab/modules/*/license.txt
@@ -175,12 +171,13 @@
install/scilab-cli::
# Move icons
mkdir -p $(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/
+ convert -resize "32x32" $(CURDIR)/desktop/scilab.png $(CURDIR)/debian/scilab-cli/usr/share/scilab-cli/icons/scilab.xpm
install/scilab::
# Move icons
- mkdir -p $(CURDIR)/debian/scilab/usr/share/scilab/
+ mkdir -p $(CURDIR)/debian/scilab/usr/share/scilab/icons/
mv debian/tmp/usr/share/scilab/desktop/ $(CURDIR)/debian/scilab/usr/share/scilab/
+ convert -resize "32x32" $(CURDIR)/desktop/scilab.png $(CURDIR)/debian/scilab/usr/share/scilab/icons/scilab.xpm
clean::
# Remove empty translation files
Modified: packages/scilab/branches/5.4/debian/scilab-cli.menu
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/branches/5.4/debian/scilab-cli.menu?rev=44192&op=diff
==============================================================================
--- packages/scilab/branches/5.4/debian/scilab-cli.menu (original)
+++ packages/scilab/branches/5.4/debian/scilab-cli.menu Sat Dec 17 11:08:33 2011
@@ -1,6 +1,6 @@
?package(scilab-cli):\
needs="text"\
section="Applications/Science/Mathematics"\
- icon="/usr/share/scilab-cli/icons/scilab.png" \
+ icon="/usr/share/scilab-cli/icons/scilab.xpm" \
title="Scilab"\
command="/usr/bin/scilab-cli"
Modified: packages/scilab/branches/5.4/debian/scilab.menu
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/branches/5.4/debian/scilab.menu?rev=44192&op=diff
==============================================================================
--- packages/scilab/branches/5.4/debian/scilab.menu (original)
+++ packages/scilab/branches/5.4/debian/scilab.menu Sat Dec 17 11:08:33 2011
@@ -1,13 +1,13 @@
?package(scilab):\
needs="x11"\
section="Applications/Science/Mathematics"\
- icon="/usr/share/scilab/icons/scilab.png" \
+ icon="/usr/share/scilab/icons/scilab.xpm" \
title="Scilab"\
command="/usr/bin/scilab"
?package(scilab):\
needs="text"\
section="Applications/Science/Mathematics"\
- icon="/usr/share/scilab/icons/scilab.png" \
+ icon="/usr/share/scilab/icons/scilab.xpm" \
title="Scilab"\
command="/usr/bin/scilab-adv-cli"
More information about the debian-science-commits
mailing list