r44367 - in /packages/scilab/branches/5.4/debian: control patches/series rules scilab-cli.install scilab-minimal-bin.install

sylvestre at users.alioth.debian.org sylvestre at users.alioth.debian.org
Thu Jan 12 12:33:38 UTC 2012


Author: sylvestre
Date: Thu Jan 12 12:33:38 2012
New Revision: 44367

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=44367
Log:
Update for the future release

Modified:
    packages/scilab/branches/5.4/debian/control
    packages/scilab/branches/5.4/debian/patches/series
    packages/scilab/branches/5.4/debian/rules
    packages/scilab/branches/5.4/debian/scilab-cli.install
    packages/scilab/branches/5.4/debian/scilab-minimal-bin.install

Modified: packages/scilab/branches/5.4/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/branches/5.4/debian/control?rev=44367&op=diff
==============================================================================
--- packages/scilab/branches/5.4/debian/control (original)
+++ packages/scilab/branches/5.4/debian/control Thu Jan 12 12:33:38 2012
@@ -6,7 +6,7 @@
 Build-Depends: autoconf, automake, cdbs, debhelper (>= 7), gfortran, 
  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,
+ gettext, libreadline-dev, pkg-config, procps, ccache,
 # numerical libraries
  libblas-dev | librefblas3-dev | libatlas-base-dev, liblapack-dev, 
  libarpack2-dev (>= 3.0),
@@ -24,7 +24,8 @@
 # latex rendering
  libjlatexmath-java (>= 0.9.4),  libjlatexmath-fop-java (>= 0.9.4),
 # Xcos
- libjgraphx-java (>= 1.8.0.0), libhdf5-dev (>= 1.8.8), libjhdf5-java (>= 2.8.0), imagemagick
+ libjgraphx-java (>= 1.8.0.0), libhdf5-serial-dev (>= 1.8.4), libjhdf5-java (>= 2.6.0), imagemagick
+# libjgraphx-java (>= 1.8.0.0), libhdf5-dev (>= 1.8.8), libjhdf5-java (>= 2.8.0), imagemagick
 Standards-Version: 3.9.2
 Homepage: http://www.scilab.org
 Vcs-Svn: svn://svn.debian.org/svn/debian-science/packages/scilab/trunk/
@@ -149,7 +150,8 @@
  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.8.0.0), libjhdf5-java (>= 2.8.0-1),
+ javahelp2, libjgraphx-java (>= 1.8.0.0), libjhdf5-java (>= 2.6.0-1),
+# javahelp2, libjgraphx-java (>= 1.8.0.0), libjhdf5-java (>= 2.8.0-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/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/branches/5.4/debian/patches/series?rev=44367&op=diff
==============================================================================
--- packages/scilab/branches/5.4/debian/patches/series (original)
+++ packages/scilab/branches/5.4/debian/patches/series Thu Jan 12 12:33:38 2012
@@ -2,5 +2,3 @@
 javalibpath.diff
 librarypath.diff
 missingaddchapter.diff
-0001-Use-the-arpack-provided-by-the-system-and-not-the-on.patch
-Fix_a_typo_in_the_french_translation.diff

Modified: packages/scilab/branches/5.4/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/branches/5.4/debian/rules?rev=44367&op=diff
==============================================================================
--- packages/scilab/branches/5.4/debian/rules (original)
+++ packages/scilab/branches/5.4/debian/rules Thu Jan 12 12:33:38 2012
@@ -168,17 +168,6 @@
 		mv $(CURDIR)/debian/tmp/usr/bin/modelicac $(CURDIR)/debian/tmp/usr/bin/XML2Modelica $(CURDIR)/debian/tmp/usr/bin/modelicat $(CURDIR)/debian/scilab-full-bin/usr/bin/; \
 	fi
 
-install/scilab-cli::
-# Move icons
-	mkdir -p $(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/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
 	[ -s modules/maple2scilab/locales/fr_FR/maple2scilab.po ] || rm -f modules/maple2scilab/locales/fr_FR/maple2scilab.po

Modified: packages/scilab/branches/5.4/debian/scilab-cli.install
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/branches/5.4/debian/scilab-cli.install?rev=44367&op=diff
==============================================================================
--- packages/scilab/branches/5.4/debian/scilab-cli.install (original)
+++ packages/scilab/branches/5.4/debian/scilab-cli.install Thu Jan 12 12:33:38 2012
@@ -1,3 +1,4 @@
 debian/tmp/usr/bin/scilab-cli
 debian/bash_completion.d/scilab etc/bash_completion.d/
-desktop/scilab-cli.desktop		usr/share/applications
+desktop/scilab-cli.desktop		usr/share/applications
+desktop/scilab.xml usr/share/mime/packages/

Modified: packages/scilab/branches/5.4/debian/scilab-minimal-bin.install
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/branches/5.4/debian/scilab-minimal-bin.install?rev=44367&op=diff
==============================================================================
--- packages/scilab/branches/5.4/debian/scilab-minimal-bin.install (original)
+++ packages/scilab/branches/5.4/debian/scilab-minimal-bin.install Thu Jan 12 12:33:38 2012
@@ -21,7 +21,7 @@
 debian/tmp/usr/lib/scilab/libscimatio.*
 debian/tmp/usr/lib/scilab/libscioptimization.*
 debian/tmp/usr/lib/scilab/libscirandlib.*
-debian/tmp/usr/lib/scilab/libscisignal_processing.*
+#debian/tmp/usr/lib/scilab/libscisignal_processing.*
 debian/tmp/usr/lib/scilab/libscisound.*
 debian/tmp/usr/lib/scilab/libscispecial_functions.*
 debian/tmp/usr/lib/scilab/libscispreadsheet.*
@@ -37,4 +37,6 @@
 debian/tmp/usr/lib/scilab/libsciparallel.*
 debian/tmp/usr/lib/scilab/libscicommons.*
 debian/tmp/usr/lib/scilab/libscicommons-disable.*
+debian/tmp/usr/lib/scilab/libscidynamiclibrary.*
+debian/tmp/usr/lib/scilab/libscihdf5-forceload-disable.*
 debian/tmp/usr/lib/pkgconfig/




More information about the debian-science-commits mailing list