[Pkg-octave-commit] rev 547 - in trunk/packages/octave/debian: . in

[Rafael Laboissiere]

Author: rafael
Date: 2006-03-30 15:24:06 +0000 (Thu, 30 Mar 2006)
New Revision: 547

Modified:
   trunk/packages/octave/debian/changelog
   trunk/packages/octave/debian/in/PACKAGE-htmldoc.doc-base.lib
   trunk/packages/octave/debian/rules
Log:
Debian release octave2.9_2.9.5-1


Modified: trunk/packages/octave/debian/changelog
===================================================================
--- trunk/packages/octave/debian/changelog	2006-03-30 15:03:56 UTC (rev 546)
+++ trunk/packages/octave/debian/changelog	2006-03-30 15:24:06 UTC (rev 547)
@@ -1,3 +1,21 @@
+octave2.9 (2.9.5-1) experimental; urgency=low
+
+  * New upstream release, released to the experimental distribution until
+    the hdf5 transition is over
+  * Redesigned the build & install processes for the html documentation,
+    since it is now shipped in HTML directories under doc/.
+  * debian/in/octave2.9-00list: Removed from the list the following
+    patches:
+    - 50_install-liboctinterp
+    - 50_glpk-sparse
+    - 50_octave-mod-bind-m-bs-2.9
+    - 70_octave-mod-honor-auto-indent
+    which have been applied upstream, and:
+    - 50_mkoctfile.1-no-negative
+    which does not seem to be necessary.
+
+ -- Rafael Laboissiere <rafael at debian.org>  Thu, 30 Mar 2006 13:10:49 +0200
+
 octave2.1 (1:2.1.73-2) unstable; urgency=low
 
   * debian/in/control: Adjusted dependencies on libhdf5 >= 1.6.5 (both

Modified: trunk/packages/octave/debian/in/PACKAGE-htmldoc.doc-base.lib
===================================================================
--- trunk/packages/octave/debian/in/PACKAGE-htmldoc.doc-base.lib	2006-03-30 15:03:56 UTC (rev 546)
+++ trunk/packages/octave/debian/in/PACKAGE-htmldoc.doc-base.lib	2006-03-30 15:24:06 UTC (rev 547)
@@ -9,5 +9,5 @@
 Section: Apps/Math
 
 Format: HTML
-Index: 	/usr/share/doc/@PACKAGE at -htmldoc/[V_2_1:liboctave_toc:][V_2_9:lib/index:].html
+Index: 	/usr/share/doc/@PACKAGE at -htmldoc/[V_2_1:liboctave_toc:][V_2_9:liboctave/index:].html
 Files:  /usr/share/doc/@PACKAGE at -htmldoc/[V_2_1:liboctave_:][V_2_9:lib/:]*.html

Modified: trunk/packages/octave/debian/rules
===================================================================
--- trunk/packages/octave/debian/rules	2006-03-30 15:03:56 UTC (rev 546)
+++ trunk/packages/octave/debian/rules	2006-03-30 15:24:06 UTC (rev 547)
@@ -186,7 +186,9 @@
 		install.octave  scripts/gethelp  libcruft/misc/*.d	\
 		scripts/autom4te.cache config.log Makefrag.f77		\
 		src/PKG_ADD src/pic src/*.oct src/*.df doc/*/HTML	\
-		examples/octave.desktop
+		examples/octave.desktop scripts/*/PKG_ADD		\
+		doc/Makefile doc/*/Makefile doc/*/*/Makefile		\
+		test/test_sparse.m
         ##doc/interpreter/octave.{dvi,ps} doc/faq/Octave-FAQ_*.html
         ##scripts/DOCSTRINGS
 	test ! -f octave-bug.in.orig || mv octave-bug.in.orig octave-bug.in
@@ -229,15 +231,14 @@
 #	dh_clean -i -k
         #$(MAKE) prefix=`pwd`/debian/tmp install
 	dh_installdocs -n -p$(doc_package) doc/*/*.pdf
-	for dir in faq interpreter liboctave ; do		\
-		dh_installdocs -n -p$(html_package)		\
-			`find doc/$$dir -name \*.html` ;	\
-		mkdir $(debhtmldoc)/$$dir ;			\
-		find doc/$$dir -name *.html	 		\
-			-exec mv \{} $(debhtmldoc)/$$dir \; ;	\
+	dh_installdocs -i
+	for dir in faq interpreter liboctave ; do			\
+		test -d $(debhtmldoc)/$$dir				\
+			|| mkdir $(debhtmldoc)/$$dir ;			\
+		find doc/$$dir \( -name \*.html -o -name \*.png \) 	\
+			 -exec cp \{} $(debhtmldoc)/$$dir \; ;		\
 	done
 
-	dh_installdocs -i
         # install Octave Emacs files and Debian Emacsen files
 	dh_installdirs -p$(emacs_package)
 	dh_installdirs -p$(emacs_package) \