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

[Rafael Laboissiere]

Author: rafael
Date: 2006-04-03 12:28:58 +0000 (Mon, 03 Apr 2006)
New Revision: 551

Added:
   trunk/packages/octave/debian/patches/50_g++4.1-fixes.dpatch
Modified:
   trunk/packages/octave/debian/changelog
   trunk/packages/octave/debian/rules
Log:
Debian release octave2.1_1:2.1.73-3


Modified: trunk/packages/octave/debian/changelog
===================================================================
--- trunk/packages/octave/debian/changelog	2006-04-01 13:09:13 UTC (rev 550)
+++ trunk/packages/octave/debian/changelog	2006-04-03 12:28:58 UTC (rev 551)
@@ -1,3 +1,14 @@
+octave2.1 (1:2.1.73-3) experimental; urgency=low
+
+  * Uploading to experimental until the hdf5 transition is finished
+  * debian/patches/50_g++4.1-fixes.dpatch: Allow compilation with g++ 4.1
+  * debian/rules:
+    - Cruft removal
+    - Mode robust treatment of changed files in doc/ such that there is no
+      problem at creation of the diff.gz file
+
+ -- Rafael Laboissiere <rafael at debian.org>  Mon,  3 Apr 2006 09:11:21 +0200
+
 octave2.9 (2.9.5-2) experimental; urgency=low
 
   * debian/in/control: Build-Depends on slice (closes: #360219)

Added: trunk/packages/octave/debian/patches/50_g++4.1-fixes.dpatch
===================================================================
--- trunk/packages/octave/debian/patches/50_g++4.1-fixes.dpatch	2006-04-01 13:09:13 UTC (rev 550)
+++ trunk/packages/octave/debian/patches/50_g++4.1-fixes.dpatch	2006-04-03 12:28:58 UTC (rev 551)
@@ -0,0 +1,29 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 50_g++4.1-fixes.dpatch by Rafael Laboissiere <rafael at debian.org>
+##
+## DP: Aloow compilation against g++ 4.1
+
+ at DPATCH@
+
+--- octave2.1-2.1.73.orig/liboctave/ArrayN.h
++++ octave2.1-2.1.73/liboctave/ArrayN.h
+@@ -63,7 +63,7 @@
+   ArrayN (const dim_vector& dv) : Array<T> (dv) { }
+ 
+   ArrayN (const dim_vector& dv, const T& val)
+-    : Array<T> (dv) { fill (val); }
++    : Array<T> (dv) { Array<T>::fill (val); }
+ 
+   template <class U>
+   explicit ArrayN (const Array2<U>& a) : Array<T> (a, a.dims ()) { }
+--- octave2.1-2.1.73.orig/liboctave/DiagArray2.h
++++ octave2.1-2.1.73/liboctave/DiagArray2.h
+@@ -125,7 +125,7 @@
+     {
+       this->dimensions = dim_vector (r, c);
+ 
+-      fill (val);
++      Array<T>::fill (val);
+     }
+ 
+   DiagArray2 (const Array<T>& a) : Array<T> (a)


Property changes on: trunk/packages/octave/debian/patches/50_g++4.1-fixes.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Modified: trunk/packages/octave/debian/rules
===================================================================
--- trunk/packages/octave/debian/rules	2006-04-01 13:09:13 UTC (rev 550)
+++ trunk/packages/octave/debian/rules	2006-04-03 12:28:58 UTC (rev 551)
@@ -41,6 +41,9 @@
 			doc/liboctave/liboctave.texi	\
 			doc/faq/Octave-FAQ.texi
 
+origdoc		:= interpreter/octave.pdf faq/Octave-FAQ.pdf \
+			liboctave/liboctave.pdf
+
 ## edd  3 Feb 2003  gcc 3.2, also imposed uniformly via Build-Depends
 ## edd 27 Jun 2003  now that gcc 3.3 is in unstable and testing, relax this
 #c_compiler	= /usr/bin/gcc-3.3
@@ -114,8 +117,6 @@
 configure-stamp:
 	dh_testdir
 
-        #cat debian/2.1.54_arrayindex.patch | patch -p0 --verbose
-
         # use Debian's tempfile(1) for enhanced security
 	cp octave-bug.in octave-bug.in.orig
 	perl -p -i -e 's|/tmp/octave-bug.\$$\$$|`tempfile`|' octave-bug.in
@@ -146,7 +147,6 @@
 
 	pod2man debian/octave-depends > octave-depends-$(version).1
 
-	if test ! -d doc-orig ; then cp -a doc doc-orig ; fi
 	for f in $(texifiles) ; do					\
 		cp $$f $$f-save ; 					\
 		perl -pi -e 's/^(\@setfilename .+ctave)/$${1}$(major)/'	\
@@ -158,6 +158,14 @@
 make: configure-stamp make-stamp
 make-stamp:
 
+
+	if test ! -d doc-orig; then				\
+		for f in $(origdoc); do				\
+			mkdir -p doc-orig/`dirname $$f`;	\
+			cp doc/$$f doc-orig/$$f ;		\
+		done;						\
+	fi
+
 	$(MAKE)		CFLAGS="$(compilerflags)"		\
 			CXXFLAGS="$(compilerflags)"		\
 			FFLAGS="$(compilerflags)"		\
@@ -177,9 +185,17 @@
 	dh_testdir
 	dh_testroot
 
-	if test ! -d doc-orig ; then cp -a doc doc-orig ; fi
+	find doc -name Makefile | xargs rm -f
 
 	-$(MAKE) -i distclean || $(MAKE) -f Makefile.in distclean
+
+	if test -d doc-orig; then			\
+		for f in $(origdoc) ; do		\
+			mv doc-orig/$$f doc/$$f ;	\
+		done;					\
+		rm -rf doc-orig ;			\
+	fi
+
 	rm -f build-stamp configure-stamp make-stamp check-stamp \
 		install-stamp Makefile.tmp
 	-rm -vrf libcruft/libcruft.so libcruft/*/Makefile		\
@@ -187,19 +203,16 @@
 		scripts/autom4te.cache config.log Makefrag.f77		\
 		src/PKG_ADD src/pic src/*.oct src/*.df doc/*/HTML	\
 		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/test_sparse.m doc/interpreter/munge-texi
+	find doc -name \*.html -exec rm -f \{} \;
+	find doc -name HTML -exec rm -rf \{} \;
+
 	test ! -f octave-bug.in.orig || mv octave-bug.in.orig octave-bug.in
 
 	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 )
 
-	rm -rf doc
-	mv doc-orig doc
-
 	dh_clean
 
 # install files