r45086 - in /packages/scilab-toolboxes/scimax/trunk/debian: changelog control rules scilab-scimax-doc.lintian-overrides

[sylvestre at users.alioth.debian.org]

Author: sylvestre
Date: Thu Jun 21 16:43:08 2012
New Revision: 45086

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=45086
Log:
* Use the embedded documentation instead of rebuilding (Closes: #662934)
* Standards-Version updated to version 3.9.3
* doc-package-depends-on-main-package fixed

Added:
    packages/scilab-toolboxes/scimax/trunk/debian/scilab-scimax-doc.lintian-overrides
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=45086&op=diff
==============================================================================
--- packages/scilab-toolboxes/scimax/trunk/debian/changelog (original)
+++ packages/scilab-toolboxes/scimax/trunk/debian/changelog Thu Jun 21 16:43:08 2012
@@ -1,3 +1,11 @@
+scilab-scimax (2.1.4-2) unstable; urgency=low
+
+  * Use the embedded documentation instead of rebuilding (Closes: #662934)
+  * Standards-Version updated to version 3.9.3
+  * doc-package-depends-on-main-package fixed
+
+ -- Sylvestre Ledru <sylvestre at debian.org>  Thu, 21 Jun 2012 18:25:37 +0200
+
 scilab-scimax (2.1.4-1) unstable; urgency=low
 
   * New upstream release (LP: #755985)

Modified: packages/scilab-toolboxes/scimax/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab-toolboxes/scimax/trunk/debian/control?rev=45086&op=diff
==============================================================================
--- packages/scilab-toolboxes/scimax/trunk/debian/control (original)
+++ packages/scilab-toolboxes/scimax/trunk/debian/control Thu Jun 21 16:43:08 2012
@@ -5,7 +5,7 @@
 Uploaders: Sylvestre Ledru <sylvestre at debian.org>
 Build-Depends: debhelper (>= 7), cdbs, scilab (>= 5.1.1),
  scilab-doc (>= 5.1.1), maxima, scilab-overload (>= 1.3.3), bison, flex, maxima-share
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
 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://forge.scilab.org/index.php/p/scimax/
@@ -13,8 +13,7 @@
 Package: scilab-scimax-doc
 Section: doc
 Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, scilab (>= 5.1.1),
- scilab-scimax
+Depends: ${shlibs:Depends}, ${misc:Depends}, scilab (>= 5.1.1)
 Description: Symbolic computations for Scilab based on Maxima - Documentation
  This toolbox is providing symbolic capabilities with the Scilab languages.
  .

Modified: packages/scilab-toolboxes/scimax/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab-toolboxes/scimax/trunk/debian/rules?rev=45086&op=diff
==============================================================================
--- packages/scilab-toolboxes/scimax/trunk/debian/rules (original)
+++ packages/scilab-toolboxes/scimax/trunk/debian/rules Thu Jun 21 16:43:08 2012
@@ -30,9 +30,10 @@
 		ln -s ../../../lib/scilab-scimax/ scimax
 
 install/scilab-scimax-doc::
-	cd src/maxhelp && make && ./genMaxDoc.sh fr_FR && ./genMaxDoc.sh en_US
+# Commented because of http://forge.scilab.org/index.php/p/scimax/issues/682/
+#	cd src/maxhelp && make && ./genMaxDoc.sh fr_FR && ./genMaxDoc.sh en_US
 	# Rebuild the macros since they depend on the documentation
-	SCI_DISABLE_TK=1 SCI_JAVA_ENABLE_HEADLESS=1 /usr/bin/scilab -nw -f builder.sce      
+#	SCI_DISABLE_TK=1 SCI_JAVA_ENABLE_HEADLESS=1 /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/
 

Added: packages/scilab-toolboxes/scimax/trunk/debian/scilab-scimax-doc.lintian-overrides
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab-toolboxes/scimax/trunk/debian/scilab-scimax-doc.lintian-overrides?rev=45086&op=file
==============================================================================
--- packages/scilab-toolboxes/scimax/trunk/debian/scilab-scimax-doc.lintian-overrides (added)
+++ packages/scilab-toolboxes/scimax/trunk/debian/scilab-scimax-doc.lintian-overrides Thu Jun 21 16:43:08 2012
@@ -1,0 +1,2 @@
+scilab-scimax-doc: jar-not-in-usr-share usr/lib/scilab-scimax/jar/scilab_en_US_help.jar
+scilab-scimax-doc: jar-not-in-usr-share usr/lib/scilab-scimax/jar/scilab_fr_FR_help.jar