[Pkg-octave-commit] rev 387 - trunk/packages/octave-forge/debian/patches

[Rafael Laboissiere]

Author: rafael
Date: 2005-12-30 00:31:43 +0000 (Fri, 30 Dec 2005)
New Revision: 387

Added:
   trunk/packages/octave-forge/debian/patches/50_extra-pdb-sinclude.dpatch
   trunk/packages/octave-forge/debian/patches/50_make-pattern-rules.dpatch
Log:
Debian release octave-forge_2005.06.13-5

Added: trunk/packages/octave-forge/debian/patches/50_extra-pdb-sinclude.dpatch
===================================================================
--- trunk/packages/octave-forge/debian/patches/50_extra-pdb-sinclude.dpatch	2005-12-30 00:31:15 UTC (rev 386)
+++ trunk/packages/octave-forge/debian/patches/50_extra-pdb-sinclude.dpatch	2005-12-30 00:31:43 UTC (rev 387)
@@ -0,0 +1,15 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 50_extra-pdb-sinclude.dpatch by Rafael Laboissiere <rafael at debian.org>
+##
+## DP: Avoid failures for make clean
+
+ at DPATCH@
+
+--- octave-forge-2005.06.13.orig/extra/pdb/Makefile
++++ octave-forge-2005.06.13/extra/pdb/Makefile
+@@ -1,4 +1,4 @@
+-include ../../Makeconf
++sinclude ../../Makeconf
+ 
+ all: creadpdb.oct plotpdb.m
+ 


Property changes on: trunk/packages/octave-forge/debian/patches/50_extra-pdb-sinclude.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Added: trunk/packages/octave-forge/debian/patches/50_make-pattern-rules.dpatch
===================================================================
--- trunk/packages/octave-forge/debian/patches/50_make-pattern-rules.dpatch	2005-12-30 00:31:15 UTC (rev 386)
+++ trunk/packages/octave-forge/debian/patches/50_make-pattern-rules.dpatch	2005-12-30 00:31:43 UTC (rev 387)
@@ -0,0 +1,60 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 50_make-pattern-rules.dpatch by Rafael LAboissiere <rafael at debian.org>
+##
+## DP: Avoid override of multiple definition of pattern rules by make
+
+ at DPATCH@
+
+--- octave-forge-2005.06.13.orig/Makeconf.base
++++ octave-forge-2005.06.13/Makeconf.base
+@@ -84,5 +84,5 @@
+ 
+ %.o: %.c ; $(MKOCTFILE) -c $<
+ %.o: %.f ; $(MKOCTFILE) -c $<
+-%.o: %.cc ; $(MKOCTFILE) -c $<
++# %.o: %.cc ; $(MKOCTFILE) -c $<
+ %.oct: %.cc ; $(MKOCTFILE) $<
+--- octave-forge-2005.06.13.orig/extra/Makefile
++++ octave-forge-2005.06.13/extra/Makefile
+@@ -12,6 +12,8 @@
+ ifdef OCTAVE_FORGE
+ all: $(BUILDDIRS)
+ 
++%.o: %.cc ; $(MKOCTFILE) -c $<
++
+ install: $(BUILDDIRS)
+ 	@test -z "$(NOINSTALLDIRS)" || echo skipping $(NOINSTALLDIRS)
+ ifeq ($(INSTALLDIRS),)
+--- octave-forge-2005.06.13.orig/extra/linear-algebra/Makefile
++++ octave-forge-2005.06.13/extra/linear-algebra/Makefile
+@@ -4,6 +4,8 @@
+ 
+ all: chol.oct
+ 
++%.o: %.cc ; $(MKOCTFILE) -c $<
++
+ chol.oct: $(OBJ)
+ 	$(MKOCTFILE) -o $@ $(OBJ)
+ 
+--- octave-forge-2005.06.13.orig/main/splines/Makefile
++++ octave-forge-2005.06.13/main/splines/Makefile
+@@ -5,6 +5,8 @@
+ 
+ all: trisolve.oct pchip_deriv.oct
+ 
++%.o: %.cc ; $(MKOCTFILE) -c $<
++
+ trisolve.oct: $(TRISOLVE_OBJ)
+ 	$(MKOCTFILE) -v -o $@ $(TRISOLVE_OBJ)
+ 
+--- octave-forge-2005.06.13.orig/Makeconf.in
++++ octave-forge-2005.06.13/Makeconf.in
+@@ -84,7 +84,7 @@
+ 
+ %.o: %.c ; $(MKOCTFILE) -c $<
+ %.o: %.f ; $(MKOCTFILE) -c $<
+-%.o: %.cc ; $(MKOCTFILE) -c $<
++# %.o: %.cc ; $(MKOCTFILE) -c $<
+ %.oct: %.cc ; $(MKOCTFILE) $<
+ 
+ HAVE_IEEE754_COMPLIANCE = @HAVE_IEEE754_COMPLIANCE@


Property changes on: trunk/packages/octave-forge/debian/patches/50_make-pattern-rules.dpatch
___________________________________________________________________
Name: svn:executable
   + *