r44824 - in /packages/scilab/trunk/debian: changelog control patches/fixEncodingIssues.diff patches/model.diff patches/series rules scilab-doc.lintian-overrides
sylvestre at users.alioth.debian.org
sylvestre at users.alioth.debian.org
Fri May 18 16:27:17 UTC 2012
Author: sylvestre
Date: Fri May 18 16:27:16 2012
New Revision: 44824
URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=44824
Log:
* Fix a build issue with openjdk7 (Closes: #672618)
* Get ride of the watcher. The doc build process is way faster now
(Closes: #673292)
* Fix a bug with 32 bit userland and 64 bit kernel (Closes: #631813)
* Standards-Version updated to version 3.9.3
* Ignore "scilab-doc: doc-package-depends-on-main-package depends"
Added:
packages/scilab/trunk/debian/patches/fixEncodingIssues.diff
packages/scilab/trunk/debian/patches/model.diff
Modified:
packages/scilab/trunk/debian/changelog
packages/scilab/trunk/debian/control
packages/scilab/trunk/debian/patches/series
packages/scilab/trunk/debian/rules
packages/scilab/trunk/debian/scilab-doc.lintian-overrides
Modified: packages/scilab/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/trunk/debian/changelog?rev=44824&op=diff
==============================================================================
--- packages/scilab/trunk/debian/changelog (original)
+++ packages/scilab/trunk/debian/changelog Fri May 18 16:27:16 2012
@@ -1,3 +1,14 @@
+scilab (5.3.3-9) unstable; urgency=low
+
+ * Fix a build issue with openjdk7 (Closes: #672618)
+ * Get ride of the watcher. The doc build process is way faster now
+ (Closes: #673292)
+ * Fix a bug with 32 bit userland and 64 bit kernel (Closes: #631813)
+ * Standards-Version updated to version 3.9.3
+ * Ignore "scilab-doc: doc-package-depends-on-main-package depends"
+
+ -- Sylvestre Ledru <sylvestre at debian.org> Fri, 18 May 2012 17:39:55 +0200
+
scilab (5.3.3-8) unstable; urgency=low
* Fix a bug on the startup of Xcos because the new version of hdf5
Modified: packages/scilab/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/trunk/debian/control?rev=44824&op=diff
==============================================================================
--- packages/scilab/trunk/debian/control (original)
+++ packages/scilab/trunk/debian/control Fri May 18 16:27:16 2012
@@ -24,7 +24,7 @@
libjlatexmath-java (>= 0.9.4), libjlatexmath-fop-java (>= 0.9.4),
# Xcos
libjgraphx-java (>= 1.4.1.0), libhdf5-dev (>= 1.8.8), libjhdf5-java (>= 2.8)
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
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/
Added: packages/scilab/trunk/debian/patches/fixEncodingIssues.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/trunk/debian/patches/fixEncodingIssues.diff?rev=44824&op=file
==============================================================================
--- packages/scilab/trunk/debian/patches/fixEncodingIssues.diff (added)
+++ packages/scilab/trunk/debian/patches/fixEncodingIssues.diff Fri May 18 16:27:16 2012
@@ -1,0 +1,22 @@
+Index: scilab-5.3.3/build.incl.xml
+===================================================================
+--- scilab-5.3.3.orig/build.incl.xml 2011-07-20 10:15:42.000000000 +0200
++++ scilab-5.3.3/build.incl.xml 2012-05-18 17:38:26.480377244 +0200
+@@ -160,7 +160,7 @@
+ </target>
+ <!-- Compile sources -->
+ <target name="compile" description="Build sources" depends="init">
+- <javac srcdir="${src.dir}" destdir="${classes.dir}" classpathref="compile.classpath" deprecation="on" debug="${build.debug}" verbose="off" listfiles="on" includeAntRuntime="no" source="5"/>
++ <javac encoding="ISO-8859-1" srcdir="${src.dir}" destdir="${classes.dir}" classpathref="compile.classpath" deprecation="on" debug="${build.debug}" verbose="off" listfiles="on" includeAntRuntime="no" source="5"/>
+ </target>
+ <target name="existing-tests">
+ <available property="test-present" file="${src.test.dir}"/>
+@@ -168,7 +168,7 @@
+ <!-- Compile test sources -->
+ <target name="compile-test" description="Build tests" depends="existing-tests, clean-test, jar" if="test-present">
+ <!-- clean the test to make sure it will build properly -->
+- <javac srcdir="${src.test.dir}" destdir="${classes.test.dir}" deprecation="on" debug="${build.debug}" verbose="off" listfiles="on" includeAntRuntime="no" source="5">
++ <javac encoding="ISO-8859-1" srcdir="${src.test.dir}" destdir="${classes.test.dir}" deprecation="on" debug="${build.debug}" verbose="off" listfiles="on" includeAntRuntime="no" source="5">
+ <classpath>
+ <path refid="unittest.classpath"/>
+ <path refid="compile.classpath"/>
Added: packages/scilab/trunk/debian/patches/model.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/trunk/debian/patches/model.diff?rev=44824&op=file
==============================================================================
--- packages/scilab/trunk/debian/patches/model.diff (added)
+++ packages/scilab/trunk/debian/patches/model.diff Fri May 18 16:27:16 2012
@@ -1,0 +1,87 @@
+Index: scilab-5.3.3/bin/scilab
+===================================================================
+--- scilab-5.3.3.orig/bin/scilab 2012-05-18 17:33:59.000000000 +0200
++++ scilab-5.3.3/bin/scilab 2012-05-18 17:54:51.396364815 +0200
+@@ -451,7 +451,6 @@
+ proc="amd64"
+ ;;
+ i?86)
+-
+ if test -d ${JRE_HOME}/lib/$(uname -m) ; then
+ proc=$(uname -m)
+ else
+@@ -540,7 +539,16 @@
+ if test ! -f $LIBJAVA; then
+ if test $SCIVERBOSE -ne 0; then
+ echo "Cannot find $LIBJAVA"
++ echo "Check if we are running Scilab with a 32 bits userland and 64 bits kernel"
+ fi
++ proc="i686"
++ LIBJAVA="$JRE_HOME/lib/$proc/$JAVA_SHLIB"
++ if test ! -f $LIBJAVA; then
++ echo "Cannot find $LIBJAVA again"
++ echo "Scilab will probably crash. Try scilab-cli to have Scilab without Java"
++ fi
++
++
+ else
+ CLASSPATH="${CLASSPATH:+:$CLASSPATH}$SCI/modules/core/jar/org.scilab.modules.core.jar"
+ # @TODO This is the default path of the official sun JVM.
+Index: scilab-5.3.3/bin/scilab-adv-cli
+===================================================================
+--- scilab-5.3.3.orig/bin/scilab-adv-cli 2012-05-18 17:33:59.000000000 +0200
++++ scilab-5.3.3/bin/scilab-adv-cli 2012-05-18 17:54:51.396364815 +0200
+@@ -451,7 +451,6 @@
+ proc="amd64"
+ ;;
+ i?86)
+-
+ if test -d ${JRE_HOME}/lib/$(uname -m) ; then
+ proc=$(uname -m)
+ else
+@@ -540,7 +539,16 @@
+ if test ! -f $LIBJAVA; then
+ if test $SCIVERBOSE -ne 0; then
+ echo "Cannot find $LIBJAVA"
++ echo "Check if we are running Scilab with a 32 bits userland and 64 bits kernel"
+ fi
++ proc="i686"
++ LIBJAVA="$JRE_HOME/lib/$proc/$JAVA_SHLIB"
++ if test ! -f $LIBJAVA; then
++ echo "Cannot find $LIBJAVA again"
++ echo "Scilab will probably crash. Try scilab-cli to have Scilab without Java"
++ fi
++
++
+ else
+ CLASSPATH="${CLASSPATH:+:$CLASSPATH}$SCI/modules/core/jar/org.scilab.modules.core.jar"
+ # @TODO This is the default path of the official sun JVM.
+Index: scilab-5.3.3/bin/scilab-cli
+===================================================================
+--- scilab-5.3.3.orig/bin/scilab-cli 2012-05-18 17:33:59.000000000 +0200
++++ scilab-5.3.3/bin/scilab-cli 2012-05-18 17:54:51.396364815 +0200
+@@ -451,7 +451,6 @@
+ proc="amd64"
+ ;;
+ i?86)
+-
+ if test -d ${JRE_HOME}/lib/$(uname -m) ; then
+ proc=$(uname -m)
+ else
+@@ -540,7 +539,16 @@
+ if test ! -f $LIBJAVA; then
+ if test $SCIVERBOSE -ne 0; then
+ echo "Cannot find $LIBJAVA"
++ echo "Check if we are running Scilab with a 32 bits userland and 64 bits kernel"
+ fi
++ proc="i686"
++ LIBJAVA="$JRE_HOME/lib/$proc/$JAVA_SHLIB"
++ if test ! -f $LIBJAVA; then
++ echo "Cannot find $LIBJAVA again"
++ echo "Scilab will probably crash. Try scilab-cli to have Scilab without Java"
++ fi
++
++
+ else
+ CLASSPATH="${CLASSPATH:+:$CLASSPATH}$SCI/modules/core/jar/org.scilab.modules.core.jar"
+ # @TODO This is the default path of the official sun JVM.
Modified: packages/scilab/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/trunk/debian/patches/series?rev=44824&op=diff
==============================================================================
--- packages/scilab/trunk/debian/patches/series (original)
+++ packages/scilab/trunk/debian/patches/series Fri May 18 16:27:16 2012
@@ -5,7 +5,9 @@
missingaddchapter.diff
modelicac-not-available.diff
0001-Typo-in-the-scilab-adv-cli-desktop-declaration.patch
-
default-java-path.diff
jrosetta-jar.diff
jhdf5-version.diff
+fixEncodingIssues.diff
+model.diff
+
Modified: packages/scilab/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/trunk/debian/rules?rev=44824&op=diff
==============================================================================
--- packages/scilab/trunk/debian/rules (original)
+++ packages/scilab/trunk/debian/rules Fri May 18 16:27:16 2012
@@ -189,7 +189,3 @@
[ -s modules/arnoldi/locales/fr_FR/arnoldi.po ] || rm -f modules/arnoldi/locales/fr_FR/arnoldi.po
[ -s modules/scipad/locales/fr_FR/scipad.po ] || rm -f modules/scipad/locales/fr_FR/scipad.po
-pre-build::
- sh debian/watcher.sh "$$PPID" "$(CURDIR)" "$(CURDIR)/build-stamp" 'scilab' &
- sed -i -e "s|Clément DAVID|Clement DAVID|g" $$(find $(CURDIR) -iname '*.java')
-
Modified: packages/scilab/trunk/debian/scilab-doc.lintian-overrides
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/trunk/debian/scilab-doc.lintian-overrides?rev=44824&op=diff
==============================================================================
--- packages/scilab/trunk/debian/scilab-doc.lintian-overrides (original)
+++ packages/scilab/trunk/debian/scilab-doc.lintian-overrides Fri May 18 16:27:16 2012
@@ -1,3 +1,5 @@
# Actual documentation files
scilab-doc: extra-license-file usr/share/scilab/modules/umfpack/help/en_US/umf_license.xml
scilab-doc: extra-license-file usr/share/scilab/modules/umfpack/help/en_US/taucs_license.xml
+# Not really usable without Scilab
+scilab-doc: doc-package-depends-on-main-package depends
More information about the debian-science-commits
mailing list