r35946 - in /packages/scilab-toolboxes/scimax/trunk/debian: changelog control patches/actualDemoPath.diff patches/compilerErrorOnDollar.diff rules

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

Author: sylvestre-guest
Date: Sun Nov  1 13:23:38 2009
New Revision: 35946

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=35946
Log:
scilab-scimax (2.1-2) unstable; urgency=low

  * build/scilab-scimax-doc => install/scilab-scimax-doc. Should fix the
    too long build issue (Closes: #548470)

 -- Sylvestre Ledru <sylvestre at debian.org>  Tue, 06 Oct 2009 00:58:26 +0200

scilab-scimax (2.1-1) unstable; urgency=low

  * New upstream release
  * actualDemoPath.diff compilerErrorOnDollar.diff removed (applied upstream)
  * Args of ./genMaxDoc.sh changed
  * cleanup of debian/rules

 -- Sylvestre Ledru <sylvestre at debian.org>  Sat, 03 Oct 2009 19:18:56 +0200

Removed:
    packages/scilab-toolboxes/scimax/trunk/debian/patches/actualDemoPath.diff
    packages/scilab-toolboxes/scimax/trunk/debian/patches/compilerErrorOnDollar.diff
Modified:
    packages/scilab-toolboxes/scimax/trunk/debian/changelog
    packages/scilab-toolboxes/scimax/trunk/debian/control
    packages/scilab-toolboxes/scimax/trunk/debian/rules

Modified: packages/scilab-toolboxes/scimax/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab-toolboxes/scimax/trunk/debian/changelog?rev=35946&op=diff
==============================================================================
--- packages/scilab-toolboxes/scimax/trunk/debian/changelog (original)
+++ packages/scilab-toolboxes/scimax/trunk/debian/changelog Sun Nov  1 13:23:38 2009
@@ -1,3 +1,19 @@
+scilab-scimax (2.1-2) unstable; urgency=low
+
+  * build/scilab-scimax-doc => install/scilab-scimax-doc. Should fix the
+    too long build issue (Closes: #548470)
+
+ -- Sylvestre Ledru <sylvestre at debian.org>  Tue, 06 Oct 2009 00:58:26 +0200
+
+scilab-scimax (2.1-1) unstable; urgency=low
+
+  * New upstream release
+  * actualDemoPath.diff compilerErrorOnDollar.diff removed (applied upstream)
+  * Args of ./genMaxDoc.sh changed
+  * cleanup of debian/rules
+
+ -- Sylvestre Ledru <sylvestre at debian.org>  Sat, 03 Oct 2009 19:18:56 +0200
+
 scilab-scimax (2.0.1-4) unstable; urgency=low
 
   * Simplification of debian/rules

Modified: packages/scilab-toolboxes/scimax/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab-toolboxes/scimax/trunk/debian/control?rev=35946&op=diff
==============================================================================
--- packages/scilab-toolboxes/scimax/trunk/debian/control (original)
+++ packages/scilab-toolboxes/scimax/trunk/debian/control Sun Nov  1 13:23:38 2009
@@ -9,19 +9,6 @@
 Vcs-Svn: svn://svn.debian.org/svn/debian-science/packages/scilab-toolboxes/scimax/trunk
 Vcs-Browser: http://svn.debian.org/viewsvn/debian-science/packages/scilab-toolboxes/scimax/trunk
 Homepage: http://scilabtbxset.sourceforge.net/
-
-Package: scilab-scimax
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, scilab (>= 5.1.1),
- scilab-overload, maxima, maxima-share
-Recommends: scilab-scimax-doc
-Description: Symbolic computations for Scilab based on Maxima
- This toolbox is providing symbolic capabilities with the Scilab languages.
- .
- It is based on Maxima which is a fully symbolic computation program.  
- It is full featured doing symbolic manipulation of polynomials, matrices, 
- rational functions, integration, Todd-coxeter methods for finite group
- analysis, graphing, multiple precision floating point computation.
 
 Package: scilab-scimax-doc
 Section: doc
@@ -37,3 +24,16 @@
  analysis, graphing, multiple precision floating point computation.
  .
  This package contains scimax's documentation.
+
+Package: scilab-scimax
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, scilab (>= 5.1.1),
+ scilab-overload, maxima, maxima-share
+Recommends: scilab-scimax-doc
+Description: Symbolic computations for Scilab based on Maxima
+ This toolbox is providing symbolic capabilities with the Scilab languages.
+ .
+ It is based on Maxima which is a fully symbolic computation program.  
+ It is full featured doing symbolic manipulation of polynomials, matrices, 
+ rational functions, integration, Todd-coxeter methods for finite group
+ analysis, graphing, multiple precision floating point computation.

Modified: packages/scilab-toolboxes/scimax/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab-toolboxes/scimax/trunk/debian/rules?rev=35946&op=diff
==============================================================================
--- packages/scilab-toolboxes/scimax/trunk/debian/rules (original)
+++ packages/scilab-toolboxes/scimax/trunk/debian/rules Sun Nov  1 13:23:38 2009
@@ -6,26 +6,14 @@
 
 DEB_DH_MAKESHLIBS_ARGS_scilab-scimax = -n
 
+build/scilab-scimax::
+		/usr/bin/scilab -nw -f builder.sce	
 
-build: build-stamp
+clean::
+		rm -fr help/*/scilab_*_help/ help/*/.list_* 
+		rm -f macros/*.bin
 
-build-stamp:
-		/usr/bin/scilab -nw -f builder.sce	
-		touch $@
-
-clean:: clean-work #unpatch
-clean-work:
-		dh_testdir
-		dh_testroot
-		rm -rf build check 
-#jar 
-		rm -fr build-stamp help/*/scilab_*_help/ help/*/.list_*
-		rm -f install-stamp
-
-		# some additional cleanups
-		dh_clean 
-
-install/scilab-scimax:: build
+install/scilab-scimax::
 
 		mkdir -p $(CURDIR)/debian/scilab-scimax/usr/lib/scilab-scimax/lib/
 		mkdir -p $(CURDIR)/debian/scilab-scimax/usr/lib/scilab-scimax/src/lisp/
@@ -43,12 +31,11 @@
 		ln -s ../../../lib/scilab-scimax/ scimax
 
 install/scilab-scimax-doc::
-	#build of the help
-	cd src/maxhelp && make && ./genMaxDoc.sh fr_FR 5.17.1 && ./genMaxDoc.sh en_US 5.17.1
+	cd src/maxhelp && make && ./genMaxDoc.sh fr_FR && ./genMaxDoc.sh en_US
+	# Rebuild the macros since they depend on the documentation
+	/usr/bin/scilab -nw -f builder.sce      
 	mkdir -p $(CURDIR)/debian/scilab-scimax-doc/usr/lib/scilab-scimax/
 	cp -R jar/ $(CURDIR)/debian/scilab-scimax-doc/usr/lib/scilab-scimax/
-
-.PHONY: binary binary-arch clean install build
 
 get-orig-source:
 	-uscan --upstream-version 0