[Pkg-octave-commit] rev 317 - trunk/packages/octave/debian

[Rafael Laboissiere]

Author: rafael
Date: 2005-11-13 22:19:18 +0000 (Sun, 13 Nov 2005)
New Revision: 317

Modified:
   trunk/packages/octave/debian/changelog
   trunk/packages/octave/debian/rules
Log:
Preparation for Debian release 2.1.72-1


Modified: trunk/packages/octave/debian/changelog
===================================================================
--- trunk/packages/octave/debian/changelog	2005-11-13 15:55:08 UTC (rev 316)
+++ trunk/packages/octave/debian/changelog	2005-11-13 22:19:18 UTC (rev 317)
@@ -2,7 +2,7 @@
 
    NOT YET RELEASED!
 
-   +++ Changes by Rafael Laboissiere
+  +++ Changes by Rafael Laboissiere
 
   * New upstream release
   * debian/in/octave2.1-00list: Removed patch

Modified: trunk/packages/octave/debian/rules
===================================================================
--- trunk/packages/octave/debian/rules	2005-11-13 15:55:08 UTC (rev 316)
+++ trunk/packages/octave/debian/rules	2005-11-13 22:19:18 UTC (rev 317)
@@ -146,9 +146,11 @@
 
 	for f in $(texifiles) ; do					\
 		cp $$f $$f-save ; 					\
-		perl -pi -e 's/^(\@setfilename .ctave)/${1}$(major)/'	\
+		perl -pi -e 's/^(\@setfilename .+ctave)/$${1}$(major)/'	\
 			$$f ; 						\
 	done
+	# The following will prevent the build of pre-formatted docs
+	touch doc/*/*.{dvi,ps,pdf,html}
 
 
 	$(MAKE)		CFLAGS="$(compilerflags)"		\
@@ -174,7 +176,7 @@
 	-rm -vrf libcruft/libcruft.so libcruft/*/Makefile		\
 		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
+		src/PKG_ADD src/pic src/*.oct src/*.df
         ##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
@@ -183,8 +185,9 @@
 	rm -f octave-depends-$(version).1
 
 	for f in $(texifiles) ; do			\
-		test ! -f $ff-save || mv $ff-save $ff ;	\
+		test ! -f $$f-save || mv $$f-save $$f ;	\
 	done
+	rm -f doc/*/*ctave$(major)*.info*
 
 	dh_clean