[Pkg-octave-commit] rev 389 - in
trunk/packages/octave-forge/debian: . patches
Rafael Laboissiere
rafael at costa.debian.org
Fri Dec 30 23:00:06 UTC 2005
Author: rafael
Date: 2005-12-30 23:00:06 +0000 (Fri, 30 Dec 2005)
New Revision: 389
Modified:
trunk/packages/octave-forge/debian/changelog
trunk/packages/octave-forge/debian/patches/00list
trunk/packages/octave-forge/debian/patches/50_make-pattern-rules.dpatch
trunk/packages/octave-forge/debian/rules
Log:
Debian release octave-forge_2005.06.13-6
Modified: trunk/packages/octave-forge/debian/changelog
===================================================================
--- trunk/packages/octave-forge/debian/changelog 2005-12-30 00:32:35 UTC (rev 388)
+++ trunk/packages/octave-forge/debian/changelog 2005-12-30 23:00:06 UTC (rev 389)
@@ -1,3 +1,28 @@
+octave-forge (2005.06.13-6) unstable; urgency=low
+
+ +++ Changes by Rafael Laboissiere
+
+ * debian/patches/50_make-pattern-rules.dpatch: Improved patch. The
+ problem with version 3.81 of make is that it treats pattern rules that
+ are defined as:
+
+ %.o : %.cc ; command $< $@
+
+ and:
+
+ %.o : %.cc
+ command $< $@
+
+ as different rules. Since the former appear in Makeconf, the later
+ definition (which appears in some Makefiles) will not override the
+ former. The patch transforms the later into the former.
+
+ * debian/rules: Added code for diagnosing the problem that some
+ autobuilders (ia64, powerpc, and s390) are having to find the
+ octave-config command.
+
+ -- Debian Octave Group <pkg-octave-devel at lists.alioth.debian.org> Fri, 30 Dec 2005 23:06:29 +0100
+
octave-forge (2005.06.13-5) unstable; urgency=low
+++ Changes by Rafael Laboissiere
Modified: trunk/packages/octave-forge/debian/patches/00list
===================================================================
--- trunk/packages/octave-forge/debian/patches/00list 2005-12-30 00:32:35 UTC (rev 388)
+++ trunk/packages/octave-forge/debian/patches/00list 2005-12-30 23:00:06 UTC (rev 389)
@@ -1,2 +1,2 @@
+50_extra-pdb-sinclude
50_make-pattern-rules
-50_extra-pdb-sinclude
Modified: 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:32:35 UTC (rev 388)
+++ trunk/packages/octave-forge/debian/patches/50_make-pattern-rules.dpatch 2005-12-30 23:00:06 UTC (rev 389)
@@ -1,60 +1,43 @@
#! /bin/sh /usr/share/dpatch/dpatch-run
-## 50_make-pattern-rules.dpatch by Rafael LAboissiere <rafael at debian.org>
+## 50_make-pattern-rules.dpatch by <root at laboiss2.intra.mpipf-muenchen.mpg.de>
##
-## DP: Avoid override of multiple definition of pattern rules by make
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: New patch generated from octave-forge 2005.06.13-6 diff.gz
@DPATCH@
---- octave-forge-2005.06.13.orig/Makeconf.base
-+++ octave-forge-2005.06.13/Makeconf.base
-@@ -84,5 +84,5 @@
+--- octave-forge-2005.06.13.orig/main/comm/Makefile
++++ octave-forge-2005.06.13/main/comm/Makefile
+@@ -67,7 +67,7 @@
+ @echo "Depending $<"; \
+ $(MKOCTFILE) $(MOFLAGS) $(DEFINES) -M $<
- %.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
++%.o:%.cc ; \
+ @echo "Compiling $@"; \
+ $(MKOCTFILE) $(MOFLAGS) $(DEFINES) -c $<
-+%.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 @@
+--- octave-forge-2005.06.13.orig/main/fixed/Makefile
++++ octave-forge-2005.06.13/main/fixed/Makefile
+@@ -162,9 +162,7 @@
+ @echo "Depending $<"; \
+ $(MKOCTFILE) $(MOFLAGS) $(DEFINES) -M $<
- all: chol.oct
+-%.o:%.cc
+-%.o:%.cc %.d
+- @echo "Compiling $@"; \
++%.o:%.cc ; @echo "Compiling $@"; \
+ $(MKOCTFILE) $(MOFLAGS) $(DEFINES) -c $<
-+%.o: %.cc ; $(MKOCTFILE) -c $<
-+
- chol.oct: $(OBJ)
- $(MKOCTFILE) -o $@ $(OBJ)
+ clean: $(SUBDIRS)
+--- octave-forge-2005.06.13.orig/main/fixed/examples/Makefile
++++ octave-forge-2005.06.13/main/fixed/examples/Makefile
+@@ -45,7 +45,7 @@
+ @echo "Depending $<"; \
+ $(MKOCTFILE) $(MOFLAGS) $(DEFINES) -M $<
---- octave-forge-2005.06.13.orig/main/splines/Makefile
-+++ octave-forge-2005.06.13/main/splines/Makefile
-@@ -5,6 +5,8 @@
+-%.o: %.cc
++%.o: %.cc ; \
+ @echo "Compiling $@"; \
+ $(MKOCTFILE) $(MOFLAGS) $(DEFINES) -c $<
- 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@
Modified: trunk/packages/octave-forge/debian/rules
===================================================================
--- trunk/packages/octave-forge/debian/rules 2005-12-30 00:32:35 UTC (rev 388)
+++ trunk/packages/octave-forge/debian/rules 2005-12-30 23:00:06 UTC (rev 389)
@@ -150,6 +150,12 @@
dh_installdeb
# dh_perl
# call with three explicit files to cover our bases
+
+ # The following commands are just for diagnosing a FTBFS
+ # problem on some architectures
+ update-alternatives --display octave-config
+ ls -l /usr/bin/octave-config*
+
octave-depends
dh_shlibdeps $(debtmp)$(octdir)/$(PACKAGE)/convhulln.oct \
$(debtmp)$(octdir)/$(PACKAGE)/jpgwrite.oct \
More information about the Pkg-octave-commit
mailing list