r35859 - in /packages/scilab/trunk/debian: changelog control rules

[sylvestre-guest at users.alioth.debian.org]

Author: sylvestre-guest
Date: Sun Sep 20 16:19:21 2009
New Revision: 35859

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=35859
Log:
  * Do not build the help on arch != amd64/i386. Waiting for upstream to 
    improve the build time
  * Force the dependency on openjdk-6-jre | sun-java6-jre on scilab-bin to 
    make sure that libjava is available (Closes: #538359)

Modified:
    packages/scilab/trunk/debian/changelog
    packages/scilab/trunk/debian/control
    packages/scilab/trunk/debian/rules

Modified: packages/scilab/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/trunk/debian/changelog?rev=35859&op=diff
==============================================================================
--- packages/scilab/trunk/debian/changelog (original)
+++ packages/scilab/trunk/debian/changelog Sun Sep 20 16:19:21 2009
@@ -1,3 +1,12 @@
+scilab (5.1.1-10) unstable; urgency=low
+
+  * Do not build the help on arch != amd64/i386. Waiting for upstream to 
+    improve the build time
+  * Force the dependency on openjdk-6-jre | sun-java6-jre on scilab-bin to 
+    make sure that libjava is available (Closes: #538359)
+
+ -- Sylvestre Ledru <sylvestre at debian.org>  Sat, 19 Sep 2009 14:13:52 +0200
+
 scilab (5.1.1-9) unstable; urgency=low
 
   * mipsel and armel management added (z_mipsel_arm_mgmt.diff patch added)

Modified: packages/scilab/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/trunk/debian/control?rev=35859&op=diff
==============================================================================
--- packages/scilab/trunk/debian/control (original)
+++ packages/scilab/trunk/debian/control Sun Sep 20 16:19:21 2009
@@ -72,7 +72,7 @@
 Package: scilab-bin
 Architecture: any
 Depends: ${shlibs:Depends}, scilab-data (= ${source:Version}),
- openjdk-6-jre | java2-runtime,
+ openjdk-6-jre | sun-java6-jre,
  libflexdock-java, libjogl-java (>= 1.1.1), libjrosetta-java (>= 1.0.1), 
  javahelp2, ${misc:Depends}
 Recommends: pvm
@@ -128,7 +128,7 @@
  etc...) and comes with a number of specific toolboxes for 
  control, signal processing, ...
  .
- This package contains demos, examples and man pages.
+ This package contains demos, examples and help pages.
 
 Package: scilab-doc-fr
 Section: doc
@@ -141,7 +141,7 @@
  etc...) and comes with a number of specific toolboxes for 
  control, signal processing, ...
  .
- This package contains demos, examples and man pages in French.
+ This package contains help pages in French.
 
 
 Package: scilab-test

Modified: packages/scilab/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/trunk/debian/rules?rev=35859&op=diff
==============================================================================
--- packages/scilab/trunk/debian/rules (original)
+++ packages/scilab/trunk/debian/rules Sun Sep 20 16:19:21 2009
@@ -23,7 +23,14 @@
 	--with-umfpack --enable-build-localization \
 	--with-install-help-xml --enable-build-help
 
+
+ENABLE_BUILD_HELP_ARCHS := amd64 i386
+ifneq (,$(findstring $(DEB_HOST_ARCH),$(ENABLE_BUILD_HELP_ARCHS)))
+# Enable the build on these arch. it timeouts for the other archs
 DEB_MAKE_BUILD_TARGET := all doc 
+else
+DEB_MAKE_BUILD_TARGET := all
+endif
 
 DEB_MAKE_INSTALL_TARGET := install install-data install-html \
 					prefix=$(DEB_DESTDIR)/usr \
@@ -81,8 +88,14 @@
 	done
 	mkdir $(CURDIR)/debian/scilab-doc/usr/share/scilab/modules/helptools/jar/
 	mkdir $(CURDIR)/debian/scilab-doc-fr/usr/share/scilab/modules/helptools/jar/
-	mv $(CURDIR)/debian/tmp/usr/share/scilab/modules/helptools/jar/scilab_en_US_help.jar $(CURDIR)/debian/scilab-doc/usr/share/scilab/modules/helptools/jar/
-	mv $(CURDIR)/debian/tmp/usr/share/scilab/modules/helptools/jar/scilab_fr_FR_help.jar $(CURDIR)/debian/scilab-doc-fr/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 \
+		cp $$EN_US_DOC $(CURDIR)/debian/scilab-doc/usr/share/scilab/modules/helptools/jar/; \
+	fi
+	FR_FR_DOC=$(CURDIR)/debian/tmp/usr/share/scilab/modules/helptools/jar/scilab_fr_FR_help.jar; \
+	if test -f $$FR_FR_DOC; then \
+		cp $$FR_FR_DOC $(CURDIR)/debian/scilab-doc-fr/usr/share/scilab/modules/helptools/jar/; \
+	fi
 
 binary-install/libscilab-java::
 # Move the javasci lib