[Pkg-octave-commit] [octave-control] 03/03: d/p/use-external-slicot.patch: Refresh for new upstream version

Rafael Laboissière rlaboiss-guest at moszumanska.debian.org
Sun Apr 5 07:35:46 UTC 2015


This is an automated email from the git hooks/post-receive script.

rlaboiss-guest pushed a commit to branch master
in repository octave-control.

commit 0cbbfa4e455f1a18b883ad9a914c0c451572a491
Author: Rafael Laboissiere <rafael at laboissiere.net>
Date:   Sun Apr 5 04:34:53 2015 -0300

    d/p/use-external-slicot.patch: Refresh for new upstream version
---
 debian/patches/use-external-slicot.patch | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/debian/patches/use-external-slicot.patch b/debian/patches/use-external-slicot.patch
index c5d4f3b..1022d05 100644
--- a/debian/patches/use-external-slicot.patch
+++ b/debian/patches/use-external-slicot.patch
@@ -1,12 +1,12 @@
 Description: Use external SLICOT instead of embedded copy
 Author: Sébastien Villemot <sebastien.villemot at ens.fr>
 Forwarded: not-needed
-Last-Update: 2012-09-16
+Last-Update: 2015-04-04
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 --- a/src/Makefile
 +++ b/src/Makefile
-@@ -20,25 +20,14 @@
+@@ -23,26 +23,18 @@
  
  # TODO: Private oct-files for control package.
  
@@ -17,29 +17,28 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 -# the developer makefile makefile_control.m
 -slicotlibrary.a: slicot.tar.gz
 -	tar -xzf slicot.tar.gz
-+sltmp/TG04BX.f: TG04BX.fortran
- 	mkdir sltmp
+-	mkdir sltmp
 -	mv slicot/src/*.f ./sltmp
 -	mv slicot/src_aux/*.f ./sltmp
 -	cp TG04BX.fortran ./sltmp/TG04BX.f
+-	cp TB01ZD.fortran ./sltmp/TB01ZD.f
 -	cd sltmp; $(MKOCTFILE) -c *.f
--	ar -rc slicotlibrary.a ./sltmp/*.o
+-	$(AR) -rc slicotlibrary.a ./sltmp/*.o
 -	rm -rf sltmp slicot
++sltmp/TG04BX.f: TG04BX.fortran
++	mkdir -p sltmp
 +	cp TG04BX.fortran sltmp/TG04BX.f
++
++sltmp/TB01ZD.f: TB01ZD.fortran
++	mkdir -p sltmp
++	cp TB01ZD.fortran sltmp/TB01ZD.f
  
  # slicot functions
 -__control_slicot_functions__.oct: __control_slicot_functions__.cc slicotlibrary.a
-+__control_slicot_functions__.oct: __control_slicot_functions__.cc sltmp/TG04BX.f
++__control_slicot_functions__.oct: __control_slicot_functions__.cc sltmp/TG04BX.f sltmp/TB01ZD.f
  	LFLAGS="$(LFLAGS)" \
 -    $(MKOCTFILE) __control_slicot_functions__.cc common.cc slicotlibrary.a
-+    $(MKOCTFILE) __control_slicot_functions__.cc common.cc sltmp/TG04BX.f -lslicot
++    $(MKOCTFILE) __control_slicot_functions__.cc common.cc sltmp/TG04BX.f sltmp/TB01ZD.f -lslicot
  
  # helpers
  is_real_scalar.oct: is_real_scalar.cc
-@@ -60,4 +49,4 @@
- 	rm -rf *.o core octave-core *.oct *~ *.f slicot sltmp
- 
- realclean: clean
--	rm -rf *.a
-\ No newline at end of file
-+	rm -rf *.a

-- 
Alioth's /home/groups/pkg-octave/bin/git-commit-notice on /srv/git.debian.org/git/pkg-octave/octave-control.git



More information about the Pkg-octave-commit mailing list