r36916 - in /packages/scilab/trunk/debian: changelog rules

[sylvestre at users.alioth.debian.org]

Author: sylvestre
Date: Tue Oct  5 08:50:40 2010
New Revision: 36916

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=36916
Log:
+  * Build the help file (Closes: #599149)
+  * Fails the build when some key components are not built

Modified:
    packages/scilab/trunk/debian/changelog
    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=36916&op=diff
==============================================================================
--- packages/scilab/trunk/debian/changelog (original)
+++ packages/scilab/trunk/debian/changelog Tue Oct  5 08:50:40 2010
@@ -1,3 +1,10 @@
+scilab (5.2.2-9) unstable; urgency=low
+
+  * Build the help file (Closes: #599149)
+  * Fails the build when some key components are not built
+
+ -- Sylvestre Ledru <sylvestre at debian.org>  Tue, 05 Oct 2010 10:31:47 +0200
+
 scilab (5.2.2-8) unstable; urgency=high
 
   * SECURITY UPDATE: 

Modified: packages/scilab/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/trunk/debian/rules?rev=36916&op=diff
==============================================================================
--- packages/scilab/trunk/debian/rules (original)
+++ packages/scilab/trunk/debian/rules Tue Oct  5 08:50:40 2010
@@ -46,6 +46,10 @@
 
 
 install/scilab-data::
+# Fails the build if some basic file does not exist
+	if test ! -f $(DEB_DESTDIR)usr/share/scilab/modules/core/macros/lib; then \
+		exit 1; \
+	fi
 # Remove empty directories
 	find $(DEB_DESTDIR)/usr/share/scilab -type d -empty -delete
 # Remove extra license files to make lintian happier
@@ -91,21 +95,21 @@
 			mv $$dir/help/pt_BR $(CURDIR)/debian/scilab-doc-pt-br/usr/share/scilab/modules/$$moduleName/help/; \
 		fi; \
 	done
+
+install/scilab-doc::
 	mkdir $(CURDIR)/debian/scilab-doc/usr/share/scilab/modules/helptools/jar/
+	EN_US_DOC=$(CURDIR)/debian/tmp/usr/share/scilab/modules/helptools/jar/scilab_en_US_help.jar; \
+	mv $$EN_US_DOC $(CURDIR)/debian/scilab-doc/usr/share/scilab/modules/helptools/jar/
+
+install/scilab-doc-fr::
 	mkdir $(CURDIR)/debian/scilab-doc-fr/usr/share/scilab/modules/helptools/jar/
+	FR_FR_DOC=$(CURDIR)/debian/tmp/usr/share/scilab/modules/helptools/jar/scilab_fr_FR_help.jar; \
+	mv $$FR_FR_DOC $(CURDIR)/debian/scilab-doc-fr/usr/share/scilab/modules/helptools/jar/
+
+install/scilab-doc-pt-br::
 	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/; \
-	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 \
-		mv $$FR_FR_DOC $(CURDIR)/debian/scilab-doc-fr/usr/share/scilab/modules/helptools/jar/; \
-	fi
 	PT_BR_DOC=$(CURDIR)/debian/tmp/usr/share/scilab/modules/helptools/jar/scilab_pt_BR_help.jar; \
-	if test -f $$PT_BR_DOC; then \
-		mv $$PT_BR_DOC $(CURDIR)/debian/scilab-doc-pt-br/usr/share/scilab/modules/helptools/jar/; \
-	fi
+	mv $$PT_BR_DOC $(CURDIR)/debian/scilab-doc-pt-br/usr/share/scilab/modules/helptools/jar/
 
 binary-install/libscilab-java::
 # Move the javasci lib