[Pkg-octave-commit] rev 881 - octave/trunk/debian

[Rafael Laboissiere]

Author: rafael
Date: 2007-03-30 11:11:52 +0000 (Fri, 30 Mar 2007)
New Revision: 881

Modified:
   octave/trunk/debian/changelog
   octave/trunk/debian/rules
Log:
* debian/rules: Create new rule save-files, on which configure depends
  and is run before patch-stamp.  This was necessary due to a problem in
  patching Octave-FAQ.texi and manipulating its @setfilename
  declaration.


Modified: octave/trunk/debian/changelog
===================================================================
--- octave/trunk/debian/changelog	2007-03-30 10:28:25 UTC (rev 880)
+++ octave/trunk/debian/changelog	2007-03-30 11:11:52 UTC (rev 881)
@@ -16,6 +16,11 @@
   * debian/in/PACKAGE.lintian: Added override for Lintian warning regarding
     m/miscellaneous/license.m being an extra-license-file
 
+  * debian/rules: Create new rule save-files, on which configure depends
+    and is run before patch-stamp.  This was necessary due to a problem in
+    patching Octave-FAQ.texi and manipulating its @setfilename
+    declaration.
+
  --
 
 octave2.9 (2.9.10-1) experimental; urgency=low

Modified: octave/trunk/debian/rules
===================================================================
--- octave/trunk/debian/rules	2007-03-30 10:28:25 UTC (rev 880)
+++ octave/trunk/debian/rules	2007-03-30 11:11:52 UTC (rev 881)
@@ -109,14 +109,16 @@
 		configure make-% check
 	touch $@
 
-configure: maintainer-scripts patch-stamp configure-stamp
+.PHONY: save-files
+save-files:
+	for f in $(savefiles) $(texifiles) ; do	\
+		cp $$f $$f-save ;		\
+	done
+
+configure: maintainer-scripts save-files patch-stamp configure-stamp
 configure-stamp:
 	dh_testdir
 
-	for f in $(savefiles) ; do	\
-		cp $$f $$f-save ;				\
-	done
-
 	[ -f autogen.sh ] &&  ./autogen.sh && chmod 0755 configure
 
 	DEFAULT_PAGER=pager				\
@@ -144,7 +146,6 @@
 	pod2man debian/octave-depends > octave-depends-$(version).1
 
 	for f in $(texifiles) ; do					\
-		cp $$f $$f-save ; 					\
 		perl -pi -e 's/^(\@setfilename .+ctave)/$${1}$(major)/'	\
 			$$f ; 						\
 	done
@@ -201,16 +202,12 @@
 	rm -f build-*-stamp configure-stamp make-*-stamp check-stamp	\
 		install-*-stamp Makefile.tmp octMakefile-*
 
-	-for f in $(savefiles) ; do	\
-		test -f $$f-save && mv $$f-save $$f ;			\
-	done
-
 	rm -f `ls debian/in/PACKAGE* | sed 's/PACKAGE/$(PACKAGE)/;s:/in::'`
 	rm -f octave-depends-$(version).1
 	( cd debian ; rm -f watch octave-depends defs.make )
 
-	-for f in $(texifiles) ; do					\
-		test -f $$f-save && mv $$f-save $$f ;			\
+	-for f in $(savefiles) $(texifiles) ; do	\
+		test -f $$f-save && mv $$f-save $$f ;	\
 	done
 
 	# The following must be dropped when the upstream Makefile.in