[Pkg-octave-commit] r1217 - octave/trunk/debian

[Rafael Laboissiere]

tags 441721 pending
thanks

Author: rafael
Date: 2008-02-22 14:12:03 +0000 (Fri, 22 Feb 2008)
New Revision: 1217

Modified:
   octave/trunk/debian/changelog
   octave/trunk/debian/rules
Log:
Remove the *.html at clean target, such that the package will have the
same contents when built twice in a row

Modified: octave/trunk/debian/changelog
===================================================================
--- octave/trunk/debian/changelog	2008-02-22 13:07:21 UTC (rev 1216)
+++ octave/trunk/debian/changelog	2008-02-22 14:12:03 UTC (rev 1217)
@@ -11,8 +11,11 @@
     version 2 or later of the GPL (closes: #435205)
   * debian/patches/50_compile-with-g++-4.3.dpatch: Fixes for compiling the
     octave2.1 with the GCC 4.3 suite (closes: #417486)
+  * debian/rules: Remove the *.html at clean target. This will result in
+    the package having the same contents when built twice in a row
+    (closes: #441721)
 
- -- Rafael Laboissiere <rafael at debian.org>  Fri, 22 Feb 2008 10:30:25 +0100
+ -- Rafael Laboissiere <rafael at debian.org>  Fri, 22 Feb 2008 14:15:22 +0100
 
 octave3.0 (1:3.0.0-4) unstable; urgency=low
 

Modified: octave/trunk/debian/rules
===================================================================
--- octave/trunk/debian/rules	2008-02-22 13:07:21 UTC (rev 1216)
+++ octave/trunk/debian/rules	2008-02-22 14:12:03 UTC (rev 1217)
@@ -224,6 +224,11 @@
 		|| $(MAKE) -C doc/interpreter/images distclean
 	[ ! -f doc/Makefile ] || $(MAKE) -C doc maintainer-clean
 	find doc -name \*.info\* | xargs rm -f
+	# Remove all *.html shipped with the upstream tarball, such that
+	# when the package is build twice in a row it will have the same
+	# contents.  This bug happens because makeinfo yields different
+	# names for the HTML files than those in the tarball.
+	find doc -name \*.html | xargs rm -f
 
 	-test -f octMakefile-orig && mv octMakefile-orig octMakefile
 	[ ! -f Makefile ] || $(MAKE) -i distclean \