[Pkg-octave-commit] [octave-control] 03/04: Refresh patch.

[Sébastien Villemot]

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

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

commit 9778ae9ce05dc170cff12aae854e633a9b0d428e
Author: Sébastien Villemot <sebastien at debian.org>
Date:   Sun Dec 22 15:32:02 2013 +0100

    Refresh patch.
    
    Git-Dch: Ignore
---
 debian/patches/use-external-slicot.patch | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/debian/patches/use-external-slicot.patch b/debian/patches/use-external-slicot.patch
index 0e459a7..c5d4f3b 100644
--- a/debian/patches/use-external-slicot.patch
+++ b/debian/patches/use-external-slicot.patch
@@ -6,7 +6,7 @@ Last-Update: 2012-09-16
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 --- a/src/Makefile
 +++ b/src/Makefile
-@@ -20,24 +20,13 @@
+@@ -20,25 +20,14 @@
  
  # TODO: Private oct-files for control package.
  
@@ -17,25 +17,27 @@ 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
--	mv slicot/src/*.f .
--	mv slicot/src_aux/*.f .
-+TG04BX.f: TG04BX.fortran
- 	cp TG04BX.fortran TG04BX.f
--	$(MKOCTFILE) -c *.f
--	ar -rc slicotlibrary.a *.o
--	rm -rf *.o *.f slicot
++sltmp/TG04BX.f: TG04BX.fortran
+ 	mkdir sltmp
+-	mv slicot/src/*.f ./sltmp
+-	mv slicot/src_aux/*.f ./sltmp
+-	cp TG04BX.fortran ./sltmp/TG04BX.f
+-	cd sltmp; $(MKOCTFILE) -c *.f
+-	ar -rc slicotlibrary.a ./sltmp/*.o
+-	rm -rf sltmp slicot
++	cp TG04BX.fortran sltmp/TG04BX.f
  
  # slicot functions
 -__control_slicot_functions__.oct: __control_slicot_functions__.cc slicotlibrary.a
-+__control_slicot_functions__.oct: __control_slicot_functions__.cc TG04BX.f
++__control_slicot_functions__.oct: __control_slicot_functions__.cc sltmp/TG04BX.f
  	LFLAGS="$(LFLAGS)" \
 -    $(MKOCTFILE) __control_slicot_functions__.cc common.cc slicotlibrary.a
-+    $(MKOCTFILE) __control_slicot_functions__.cc common.cc TG04BX.f -lslicot
++    $(MKOCTFILE) __control_slicot_functions__.cc common.cc sltmp/TG04BX.f -lslicot
  
  # helpers
  is_real_scalar.oct: is_real_scalar.cc
-@@ -59,4 +48,4 @@
- 	rm -rf *.o core octave-core *.oct *~ *.f slicot
+@@ -60,4 +49,4 @@
+ 	rm -rf *.o core octave-core *.oct *~ *.f slicot sltmp
  
  realclean: clean
 -	rm -rf *.a

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